Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/api/indexTaskadd.js

@@ -5,4 +5,11 @@ export const getTask = (obj) => http.get('/admin/project/detail', { params: obj
   headers: {
     'token': '123'
   }
+})
+
+//项目里的新建或编辑阶段任务
+export const addTask = (obj) => http.post('/admin/project/editTask', obj, {
+  headers: {
+    'token': '123'
+  }
 })

src/components/drawers/AddEval.vue

@@ -90,6 +90,7 @@
                   <div class="ant-upload-text">Upload</div>
                 </div>
               </a-upload>
+              <span style="padding-bottom:20px;color:#878b92">图片格式为</span>
             </div>
           </div>
         </div>
@@ -217,7 +218,14 @@ export default {
 
     //创建测评信息
     const createEvalText = () => {
-      if (!state.inputV1) return message.info("请输入测评名称");
+      if (!state.inputV1) {
+        message.destroy();
+        return message.info("请输入测评名称");
+      }
+      if (!state.inputV2) {
+        message.destroy();
+        return message.info("请选择测评");
+      }
       if ( state.time != undefined) {
         state.endTimes = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D")
         state.startTimes = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D")
@@ -244,7 +252,9 @@ export default {
           setTimeout(() => {
             console.log("创建成功", res);
             message.success("创建成功");
+            message.destroy();
             // state.createLoading = false;
+            // state.currentPage = 1;
             router.push("/leveladd");
             // getLearnPath();
           }, 1000);

src/components/drawers/AddLive.vue

@@ -279,7 +279,7 @@
       </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createLiveBroadcast">确定</button>
+        <button class="btn2" @click="done">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -288,6 +288,7 @@
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexLiveBroadcast";
+import * as apiTask from "../../api/indexTaskadd";
 import { toDate } from "@/api/method";
 
 function getBase64(img, callback) {
@@ -477,6 +478,7 @@ export default {
       checkedC1: "",
       checkedC2: true,
       playback: false,
+      obj: {}, //要传的obj数据
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
@@ -545,15 +547,25 @@ export default {
 
     //创建直播
     const createLiveBroadcast = () => {
-      if (!state.inputV1) return message.warning("请输入直播名称");
+      if (!state.inputV1) {
-      if (!state.time) return message.warning("请输入直播时间");
+        message.destroy();
-      if (!state.inputV2) return message.warning("请输入直播时长");
+        return message.warning("请输入直播名称");
+      }
+      if (!state.time) {
+        message.destroy();
+        return message.warning("请输入直播时间");
+      }
+      if (!state.inputV2) {
+        message.destroy();
+        return message.warning("请输入直播时长");
+      }
       const regular = /^[+]{0,1}(\d+)$/;
       if (!regular.test(state.inputV2)) {
+        message.destroy();
         return message.warning("直播时长需大于0");
       }
 
-      // if (!state.inputV3) return message.info("请输入授课老师");
+      if (!state.inputV3) return message.warning("请输入授课老师");
       let check = state.checkedC2 * 1;
       // let startTime = state.time[0].$d;
       // let endTime = state.time[1].$d;
@@ -567,7 +579,7 @@ export default {
         new Date(state.time[1].$d).getTime() / 1000,
         "Y-M-D"
       );
-      let obj = {
+      state.obj = {
         afterSignIn: state.inputV6,
         beforeSignIn: state.inputV7,
         createTime: "",
@@ -592,10 +604,10 @@ export default {
         updateUser: 0,
       };
       api
-        .createLiveBroadcast(obj)
+        .createLiveBroadcast(state.obj)
         .then((res) => {
-          console.log(res.data.data, 1111);
+          console.log("调用添加直播接口后", res.data.data);
-          console.log(state, 2222);
+          // console.log(state, 2222);
           message.success("提交成功");
           closeDrawer();
 
@@ -604,6 +616,33 @@ export default {
         .catch((err) => {
           console.log(err, 2222);
         });
+
+      apiTask
+        .addTask({
+          courseId: 0,
+          duration: 0,
+          flag: true,
+          name: "",
+          projectId: 22,
+          projectTaskId: 0,
+          stageId: 0,
+          type: 0,
+        })
+        .then((res) => {
+          console.log("调用项目添加接口后", res.data);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+
+    //添加任务到数据库
+    const addTask = () => {};
+
+    const done = () => {
+      createLiveBroadcast();
+      addTask();
+      // api.getLiveBroadcastInfor({});
     };
 
     return {
@@ -618,6 +657,7 @@ export default {
       createLiveBroadcast,
       handleChange,
       beforeUpload,
+      done,
     };
   },
 };

src/components/drawers/AddVote.vue

@@ -98,7 +98,7 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn2" @click="createVoteText()">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -106,6 +106,11 @@
     <script>
 import { reactive, toRefs, ref } from "vue";
 import CreVote from "../../components/drawers/CreVote.vue";
+import { useRouter } from "vue-router";
+import * as api from "../../api/indexVote";
+import { message } from "ant-design-vue";
+import { toDate } from "../../api/method";
+const router = useRouter();
 const options1 = ref([
   {
     value: "value1",
@@ -144,6 +149,10 @@ export default {
       inputV1: "",
       textV1: "",
       crevotevisible: false,
+      time: undefined,
+      basevote:'',
+      endTimes: "",
+      startTimes: "",
     });
     const closeDrawer = () => {
       ctx.emit("update:addvoteVisible", false);
@@ -153,6 +162,60 @@ export default {
     };
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
+    };
+        //创建投票信息
+        const createVoteText = () => {
+          if (!state.inputV1) {
+            message.destroy();
+            return message.info("请输入投票名称");
+          }
+
+          if (state.basevote == '') {
+            state.basevote = 1;
+          }
+
+          if (state.time != undefined) {
+            state.endTimes = toDate(
+              new Date(state.time[0].$d).getTime() / 1000,
+              "Y-M-D"
+            );
+            state.startTimes = toDate(
+              new Date(state.time[1].$d).getTime() / 1000,
+              "Y-M-D"
+            );
+          }
+
+      let obj = {
+        baseVote: state.basevote,
+        createTime: "",
+        createUser: 0,
+        stem: "",
+        stemId: 0,
+        updateTime: "",
+        updateUser: 0,
+        voteEndTime: state.endTimes,
+        voteExplain: state.textV1,
+        voteFlag: "",
+        voteId: 0,
+        voteName: state.inputV1,
+        voteStartTime: state.startTimes,
+        voteTag: "",
+      };
+      api
+        .createVote(obj)
+        .then((res) => {
+          setTimeout(() => {
+            console.log("创建成功", res);
+            message.success("创建成功");
+            // state.createLoading = false;
+            router.push("/leveladd");
+            // getLearnPath();
+          }, 1000);
+        })
+        .catch((err) => {
+          console.log("创建失败", err);
+          // state.createLoading = false;
+        });
     };
     return {
       ...toRefs(state),
@@ -161,6 +224,7 @@ export default {
       closeDrawer,
       rowSelection,
       options1,
+      createVoteText,
     };
   },
 };

src/views/projectcenter/TaskAdd.vue

@@ -991,6 +991,8 @@ export default {
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
                       showDelete();
+                      deleteInvistText();
+                      deleteEvalText();
                     }}
                   >
                     删除
@@ -1055,7 +1057,7 @@ export default {
           console.log(err);
         });
     };
-
+    //删除讨论
     const deleteDiscuss = () => {
       let obj = {
         discussId: state.deleteDiscussID,
@@ -1152,6 +1154,7 @@ export default {
     const deleteEvalText = () => {
       let obj = {
         evaluationId: state.deleteEvalID,
+        token:"",
       };
       apieval
         .deleteEvaluationById(obj)
@@ -1265,7 +1268,8 @@ export default {
     //删除评估测试
     const deleteInvistText = () => {
       let obj = {
-        evaluationId: state.deleteInvistID,
+        评估信息Id:"",
+        token:"",
       };
       apiinvist
         .deleteAppraise(obj)