Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/drawers/AddDiscuss.vue
#	src/views/projectcenter/ProjectAdd.vue

src/App.vue

@@ -43,7 +43,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.08------------");
+    console.log("版本0.10------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/api/config.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-30 15:03:21
+ * @LastEditTime: 2022-12-01 09:02:04
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

src/api/indexVote.js

@@ -60,15 +60,10 @@ export const createVote = (obj) => http.post('/vote/createVote', obj)
 export const deleteVoteMessage = (obj) => http.post('/vote/deleteVoteMessage', { params: obj })
 
 //删除题干信息接口
-export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', obj, {
+export const deleteVoteStem = (voteStemId) => http.post(`/vote/deleteVoteStem?voteStemId=${voteStemId}`)
-  headers: {
-    'token': '123',
-    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-  }
-})
 
 //删除题选项息接口
-export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOption', { params: obj })
+export const deleteVoteStemOption = (optionId) => http.post(`/vote/deleteVoteStemOption?optionId=${optionId}`)
 
 //修改投票信息接口
 export const editVote = (obj) => http.post('/vote/editVote', obj)

src/components/NavTop.vue

@@ -104,9 +104,10 @@ export default {
           console.log("获取登录信息成功", res);
           if (res.data.code === 200) {
             state.username = res.data.data.realName;
-            state.avatar = res.data.data.avatar
+            // state.avatar = res.data.data.avatar
-              ? res.data.data.avatar
+            //   ? res.data.data.avatar
-              : require("../assets/images/avatar.png");
+            //   : require("../assets/images/avatar.png");
+            state.avatar = require("../assets/images/avatar.png");
           }
         })
         .catch((err) => {

src/components/drawers/AddActive.vue

@@ -319,7 +319,7 @@ export default {
       state.textV1 = "";
       state.textV2 = "";
       state.time = "";
-      message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+     
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };

src/components/drawers/AddDiscuss.vue

@@ -57,8 +57,7 @@
             </div>
             <div class="btnbox">
               <a-checkbox v-model:checked="checkedC1" @change="checkRadio"
-              >允许评论
+              >允许评论</a-checkbox
-              </a-checkbox
               >
             </div>
           </div>
@@ -72,13 +71,12 @@
   </a-drawer>
 </template>
 <script>
-import {reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexDiscuss";
 import * as apiTask from "../../api/indexTaskadd";
-import {RouterEditTask} from "@/api/indexTask";
+import { RouterEditTask } from "@/api/indexTask";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
-import {addTempTask} from "../../api/indexTaskadd";
+import { addTempTask } from "../../api/indexTaskadd";
-
 export default {
   name: "AddDiscuss",
   props: {
@@ -172,7 +170,7 @@ export default {
       if (props.edit) {
         //编辑讨
         api
-            .getDiscussDetail({discussId: props.EditDiscussId})
+            .getDiscussDetail({ discussId: props.EditDiscussId })
             .then((res) => {
               //更新讨论信息
               state.inputV1 = res.data.data.discussName;
@@ -180,8 +178,7 @@ export default {
               state.checkedC1 =
                   res.data.data.discussSettings == "true" ? true : false;
             })
-            .catch(() => {
+            .catch(() => {});
-            });
       }
     };
     const afterVisibleChange = (bool) => {
@@ -189,9 +186,9 @@ export default {
         queryDiscuss();
       }
     };
-    const updateTask = async (res) => {
+    const updateTask = (res) => {
       if (props.isLevel == 1) {
-        await RouterEditTask({
+        RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.discussId,
           name: res.data.data.discussName,
@@ -206,7 +203,7 @@ export default {
               //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
             });
       } else if (props.isLevel == 2) {
-        await apiTask
+        apiTask
             .addTask({
               courseId: res.data.data.discussId,
               name: res.data.data.discussName,
@@ -223,7 +220,7 @@ export default {
             });
       } else if (props.isLevel == 3) {
         console.log("");
-        await addTempTask({
+        addTempTask({
           courseId: res.data.data.discussId,
           name: res.data.data.discussName,
           projectTemplateId: props.projectTemplateId,
@@ -254,7 +251,7 @@ export default {
       if (props.edit) {
         api
             .updateDiscuss(obj)
-            .then(async (res) => {
+            .then(async(res) => {
               await updateTask(res);
               closeDrawer();
               ctx.emit("changeData", false);
@@ -268,7 +265,7 @@ export default {
       } else {
         api
             .createDiscuss(obj)
-            .then(async (res) => {
+            .then(async(res) => {
               await updateTask(res);
               closeDrawer();
               ctx.emit("changeData", false);
@@ -296,7 +293,6 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
-
 .addrefDrawer {
   .drawerMain {
     .header {
@@ -306,7 +302,6 @@ export default {
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
-
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -315,43 +310,35 @@ export default {
         margin-left: 24px;
       }
     }
-
     .contentMain {
       display: flex;
       justify-content: space-between;
-
       .main_left {
         margin-top: 32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
-
         .main_item {
           display: flex;
           align-items: center;
           margin-top: 32px;
           margin-bottom: 32px;
-
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
-
             .sign {
               margin-right: 5px;
             }
           }
-
           .btnbox {
             display: flex;
             flex: 1;
             align-items: center;
-
             .ant-input {
               height: 100%;
             }
-
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -364,40 +351,32 @@ export default {
             }
           }
         }
-
         .main_item2 {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
-
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
-
             .sign {
               margin-right: 5px;
             }
           }
-
           .textarea {
             width: 423px;
-
             .ant-input {
               width: 100%;
             }
-
             .ant-input-textarea-show-count {
               position: relative;
             }
-
             .ant-input-textarea-show-count::after {
               position: absolute;
               right: 10px;
               bottom: 0px;
             }
-
             .ant-input {
               border-radius: 8px;
             }
@@ -405,7 +384,6 @@ export default {
         }
       }
     }
-
     .main_btns {
       height: 72px;
       width: 100%;
@@ -415,7 +393,6 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-
       .btn1 {
         width: 100px;
         height: 40px;
@@ -425,7 +402,6 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
-
       .btn2 {
         cursor: pointer;
         width: 100px;

src/components/drawers/AddFaceteach.vue

@@ -551,6 +551,7 @@ export default {
           chapterId: props.isactive,
           courseId: res.data.data.offcoursePlanId,
           name: res.data.data.name,
+          duration: res.data.data.duration,
           routerId: props.routerId,
           routerTaskId: props.routerTaskId || 0,
           type: 2,

src/components/drawers/AddHomework.vue

@@ -304,9 +304,9 @@ export default {
       };
       if (props.EditWorkId > 0) {
         updateWorkTaskUsing(obj)
-          .then((res) => {
+          .then(async(res) => {
             // console.log("添加成功", res);
-            updateTask(res);
+           await updateTask(res);
             ctx.emit("changeData", false);
             closeDrawer();
           })
@@ -316,9 +316,9 @@ export default {
           });
       } else {
         createWorkTask(obj)
-          .then((res) => {
+          .then(async(res) => {
             console.log("添加成功", res);
-            updateTask(res);
+           await updateTask(res);
             ctx.emit("changeData", false);
             closeDrawer();
           })

src/components/drawers/AddLive.vue

@@ -275,9 +275,7 @@
                     style="
                       width: 88px;
                       height: 32px;
-                      border-radius: 8px;
+                      border-radius: 8px;overflow: hidden; "
-                      overflow: hidden;
-                    "
                     v-model:value="inputV8"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px"
@@ -306,8 +304,8 @@
             </div>
             <div class="btnbox">
               <a-checkbox
-                v-model:checked="checkedC2"
+                v-model:checked="switchC2"
-                @onclick="checkedC2 = !checkedC2"
+                @onclick="(switchC2 = !switchC2)"
                 >学员请假后记为任务完成</a-checkbox
               >
             </div>
@@ -424,20 +422,19 @@ export default {
       switchC1: "",
       checkedC1: false,
       checkedC2: false,
-      playback: false,
       assessmentId: null,
       obj: {}, //要传的obj数据
       assessment: [], //评估信息
       assessmentvalue: null,
       needEval: false,
-      otherSettings: false,
+      switchC2: false,
       assessmentVisible: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
       ctx.emit("update:edit", false);
       state.radioV1 = "";
-      state.playback = false;
+      state.switchC1 = false;
       state.inputV6 = "";
       state.inputV7 = "";
       state.inputV2 = "";
@@ -451,7 +448,7 @@ export default {
       state.switchC1 = "";
       state.imageUrl = "";
       state.needEval = false;
-      state.otherSettings;
+      state.switchC2=false;
       ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
@@ -497,10 +494,11 @@ export default {
           state.inputV7 = res.data.data.afterSignIn;
           state.inputV8 = res.data.data.signOutTime;
           state.textV1 = res.data.data.liveExplain;
-          state.radioV1 = res.data.data.standardSettings;
+          state.radioV1 = Number(res.data.data.standardSettings);
           //state.= res.data.data
           state.assessmentId = res.data.data.assessmentId;
           state.imageUrl = res.data.data.liveCover;
+          state.switchC2 = res.data.data.otherSettings==1?true:false;
         })
         .catch(() => {
           //message.error(`查询失败`);
@@ -536,7 +534,7 @@ export default {
         RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.liveId,
-          duration: res.data.data.duration,
+          duration: res.data.data.liveDuration,
           name: res.data.data.liveName,
           routerId: props.routerId,
           routerTaskId: props.routerTaskId || 0,
@@ -553,7 +551,7 @@ export default {
         apiTask
           .addTask({
             courseId: res.data.data.liveId,
-            duration: res.data.data.duration,
+            duration: res.data.data.liveDuration,
             name: res.data.data.liveName,
             projectId: props.projectId,
             projectTaskId: props.projectTaskId || 0,
@@ -571,7 +569,7 @@ export default {
         console.log("props.projectTemplateId", props.projectTemplateId);
         addTempTask({
           courseId: res.data.data.liveId,
-          duration: res.data.data.duration,
+          duration: res.data.data.liveDuration,
           name: res.data.data.liveName,
           projectTemplateId: props.projectTemplateId,
           projectTaskId: props.projectTaskId || 0,
@@ -631,31 +629,31 @@ export default {
         liveId: props.edit ? props.EditLiveId : 0,
         liveLink: state.inputV4,
         liveName: state.inputV1,
-        livePlayback: state.playback ? "true" : "false",
+        livePlayback: state.switchC1? "1" : "0",
-        livePlaybackLink: state.playback ? state.inputV5 : "",
+        livePlaybackLink: state.switchC1 ? state.inputV5 : "",
         liveTeacherId: state.inputV3,
-        otherSettings: state.otherSettings, //1或0
+        otherSettings: state.switchC2?"1":"0", //1或0
         signOutTime: state.inputV8,
         standardSettings: state.radioV1, //1或2
-        isEvaluate: state.eedEval ? "1" : "0",
+        isEvaluate: state.needEval ? "1" : "0",
       };
       if (props.edit) {
         api
           .updateLiveBroadcastMessage(state.obj)
-          .then((res) => {
+          .then(async(res) => {
             message.destroy();
             message.success("提交成功");
-            updateTask(res);
+           await updateTask(res);
             closeDrawer();
           })
           .catch(() => {});
       } else {
         api
           .createLiveBroadcast(state.obj)
-          .then((res) => {
+          .then(async(res) => {
             message.destroy();
             message.success("提交成功");
-            updateTask(res);
+           await updateTask(res);
             closeDrawer();
           })
           .catch(() => {});

src/components/drawers/AddProject.vue

@@ -477,6 +477,7 @@ export default {
         })
             .then(() => {
               message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+              ctx.emit("changeData", false);
               closeDrawer();
             })
             .catch(() => {

src/components/drawers/AddTest.vue

@@ -727,8 +727,8 @@ export default {
       if (props.edit) {
         // 编辑任务
         updateExamination(obj)
-          .then((res) => {
+          .then(async(res) => {
-            updateTask(res);
+            await updateTask(res);
             closeDrawer();
           })
           .catch(() => {
@@ -737,8 +737,8 @@ export default {
       } else {
         // 创建任务
         createExamination(obj)
-          .then((res) => {
+          .then(async(res) => {
-            updateTask(res);
+            await updateTask(res);
             closeDrawer();
           })
           .catch(() => {
@@ -754,6 +754,7 @@ export default {
         if (props.isLevel == 1) {
           let editObj1 = {
             chapterId: props.isactive,
+            duration: res.data.data.examinationDuration,
             courseId: res.data.data.examinationId,
             name: res.data.data.examinationName,
             routerId: props.routerId,
@@ -773,7 +774,7 @@ export default {
         } else if (props.isLevel == 2) {
           let editObj = {
             courseId: res.data.data.examinationId,
-            duration: 0,
+            duration: res.data.data.examinationDuration,
             name: res.data.data.examinationName,
             projectId: props.projectId,
             projectTaskId: props.projectTaskId || 0,

src/components/drawers/PowerList.vue

@@ -289,8 +289,8 @@ export default {
             let array = [];
             arr.map((value) => {
               let obj = {
-                key: value.id,
+                key: value.authRefId,
-                id: value.memberNo,
+                id: value.authRefId,
 
                 name: value.memberName ? value.memberName : "-",
 

src/components/drawers/ProjCheckPower.vue

@@ -792,12 +792,15 @@ export default {
     // 开始 快速选人------------------------------------------------------------------
     //选中部门
     const departmentSelect = (e, k) => {
+      if (!k.node.treeChildList) {
         console.log("选中的部门", e, k);
         state.currentPage = 1;
         state.selectedKeys = [k.node.key];
         state.selectOrgId = k.selectedNodes[0].id; //选中的组织id
         state.selectOrgName = k.selectedNodes[0].name; //选中的组织名称
+        console.log("treeChildList", k.node.treeChildList);
         getMember(k.selectedNodes[0].id);
+      }
     };
     //获取学员
     const getMember = async (org) => {
@@ -831,12 +834,14 @@ export default {
     //分页获取学员
     const changePagination = (page) => {
       state.currentPage = page;
+      console.log("1111111");
       getMember(state.selectOrgId);
     };
     //搜索学员
     const handleSearchStu = () => {
       deleteDepSelect();
       state.currentPage2 = 1;
+      console.log("22222");
       getMember();
     };
     //重置
@@ -996,7 +1001,7 @@ export default {
       // if (state.isSearchOrg) {
       //   searchOrg(e[0]);
       // }
-      if (!k.node.children) {
+      if (!k.node.treeChildList) {
         state.selectedKeys1 = e.reverse();
         if (k.selected) {
           state.chooseorganization.unshift(k.node);

src/components/drawers/ProjPowerList.vue

@@ -192,7 +192,7 @@ export default {
       console.log("item", item);
       state.cancelModal = true;
       let obj = {
-        id: item.number,
+        id: item.id,
         name: item.name,
       };
       state.cancelAuthInfo = obj;
@@ -311,15 +311,15 @@ export default {
             let array = [];
             arr.map((value) => {
               let obj = {
-                key: value.id,
+                key: value.memberId,
-                id: value.id,
+                id: value.memberId,
 
                 name: value.memberName ? value.memberName : "-",
 
                 com: value.orgName ? value.orgName : "-",
                 gang: "-",
                 number: value.memberNo ? value.memberNo : "-",
-                state: "-",
+                state: value.tagName ? value.tagName : "-",
               };
               array.push(obj);
             });

src/components/drawers/ProjectOwn.vue

@@ -688,8 +688,11 @@ export default {
       if (k.node.treeChildList === null) {
         state.selectedKeys = [k.node.key];
         state.selectDepartment = k.node.name;
+
+        if (!k.node.treeChildList) {
           getPeoples();
         }
+      }
       // console.log("kkkkkk", k);
       // state.selectedKeys = [k.node.key];
       // state.selectDepartment = k.node.name;

src/components/vote/AddVote.vue

@@ -353,9 +353,9 @@ export default {
       if (props.edit) {
         api
           .editVote(obj)
-          .then((res) => {
+          .then(async(res) => {
             console.log("updte======");
-            updateToTask(res);
+           await updateToTask(res);
             closeDrawer();
             message.destroy();
             message.success("修改投票信息成功")
@@ -367,8 +367,8 @@ export default {
       } else {
         api
           .createVote(obj)
-          .then((res) => {
+          .then(async(res) => {
-            updateToTask(res);
+            await updateToTask(res);
             closeDrawer();
             message.destroy();
             message.success("创建投票信息成功")

src/components/vote/CreateVote.vue

@@ -34,8 +34,10 @@
         </div>
         <!-- 创建投票侧弹窗 -->
       </div>
+
       <div v-for="(item, index) in allFormsData" :key="index">
-        <VoteQuestion :item="item" :optionId="optionId" @del="handleDel" />
+        <VoteQuestion v-model:info="information" :item="item" :optionId="optionId" @delOption="delOption"
+          @del="handleDel" @edits="edits" @addOption="addOption" />
       </div>
 
       <div class="footer">
@@ -105,6 +107,7 @@ export default {
       ballotId: "",
       ballotName: "",
       allFormsData: [],
+      allFormsData1: [],
 
     });
     // const router = useRouter();
@@ -139,6 +142,7 @@ export default {
         // let renderArr = [...res];
         // sortBy(renderArr, "orderNumber"); //序号
         state.allFormsData = parseData(res); //类型
+        state.allFormsData1 = parseData(res); //类型
 
         console.log(state.allFormsData);
       }
@@ -271,27 +275,93 @@ export default {
         ],
       };
       state.allFormsData.push(obj);
+      state.allFormsData1.push(obj);
     };
 
     const handleDel = ({ id }) => {
+      console.log('1234523432434234234', id, state.allFormsData)
+
       state.allFormsData.forEach((item, index) => {
         if (item.id === id) {
+          console.log('oooooo', item)
           state.allFormsData.splice(index, 1);
         }
       });
-      state.allFormsData.map((item, index) => {
+
-        item.id = index + 1;
+      // state.allFormsData.map((item, index) => {
-        return item;
+      //   item.id = index + 1;
-      });
+      //   return item;
+      // });
 
       // orderNumber: curItem.orderNumber,
     };
 
+    const delOption = (data) => {
+      console.log('datadatadatadatadata', data, state.allFormsData)
+      state.allFormsData.forEach((item, index) => {
+        if (item.voteStemId === data.value.voteStemId) {
+          state.allFormsData[index].singleList.forEach((ii, nn) => {
+            if (ii.id == data.value.id) {
+              console.log(1212121212, state.allFormsData[index].singleList[nn], nn)
+              state.allFormsData[index].singleList.splice(nn, 1)
+              console.log('12', state.allFormsData)
+            }
+          })
+
+        }
+      });
+
+      state.allFormsData1.forEach((item, index) => {
+        if (item.voteStemId === data.value.voteStemId) {
+          state.allFormsData1[index].singleList.forEach((ii, nn) => {
+            if (ii.id == data.value.id) {
+              console.log(1212121212, state.allFormsData1[index].singleList[nn], nn)
+              state.allFormsData1[index].singleList.splice(nn, 1)
+              console.log('33', state.allFormsData1)
+            }
+          })
+
+        }
+      });
+
+
+    }
+
+    const edits = (data) => {
+      console.log('我传递过来了吗---111', data, data.value.id, state.allFormsData1)
+
+      state.allFormsData1.forEach((item, index) => {
+        if (item.voteStemId === data.value.voteStemId) {
+          item.singleList.forEach((ii, nn) => {
+            if (ii.id === data.value.id) {
+              // ii.optionName = data.value.inputVal
+              state.allFormsData1[index].singleList[nn].inputVal = data.value.inputVal
+            }
+          })
+        }
+      });
+
+      console.log('123-456-789', state.allFormsData1)
+    }
+
+    // 增加选项
+    const addOption = (data) => {
+      console.log(data)
+      state.allFormsData1.forEach((item, index) => {
+        if (item.voteStemId === data.value.voteStemId) {
+          state.allFormsData1[index].singleList = data.value.singleList
+        }
+      });
+    }
+
     const handleSave = () => {
 
+
       let resultPost = {};
 
-      let filterData = parseItem(restData(state.allFormsData, "type"));
+      let filterData = parseItem(restData(state.allFormsData1, "type"));
+
+      console.log("filterData==111", filterData)
 
       if (!state.ballotName) {
         return message.warning("请输入投票名称");
@@ -305,7 +375,7 @@ export default {
       // checkVal(filterData);
       console.log(12121212);
       console.log(filterData);
-
+      console.log('111111222223333----0000', state.ballotId)
       if (state.ballotId) {
         resultPost = {
           ballotId: state.ballotId,
@@ -386,6 +456,9 @@ export default {
       handleDel,
       afterVisibleChange,
       closeDrawer,
+      edits,
+      delOption,
+      addOption
     };
   },
 };

src/components/vote/VoteQuestion.vue

@@ -10,38 +10,20 @@
     </div>
     <div class="name">
       <div class="namebox">
-        <img
+        <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-          class="nameimg"
+        <div class="inname">题干{{ item.id }}</div>
-          src="../../assets/images/basicinfo/asterisk.png"
-        />
-        <div class="inname">题干{{item.id}}</div>
       </div>
       <div class="in">
-        <a-input
+        <a-input v-model:value="curItem.valueSingle" placeholder="请输入题干名称" show-count :maxlength="20"
-          v-model:value="curItem.valueSingle"
+          style="border-radius: 8px" />
-          placeholder="请输入题干名称"
-          show-count
-          :maxlength="20"
-          style="border-radius: 8px"
-        />
       </div>
     </div>
-    <VoteQuestionItem
+    <VoteQuestionItem v-model:info="info" v-for="(item, index) in curItem.singleList" :key="index" :item="item"
-      v-for="(item, index) in curItem.singleList"
+      @input="input" @src="imgSrc" @delImg="delImg" @del="del" @edit="edit" />
-      :key="index"
-      :item="item"
-      @input="input"
-      @src="imgSrc"
-      @delImg="delImg"
-      @del="del"
-    />
     <div class="name">
       <div class="in" style="margin-left: 85px; margin-bottom: 20px">
-        <a-button
+        <a-button type="primary" style="width: 100px;height: 40px;border-radius: 8px;background-color: #409eff;"
-          type="primary"
+          @click="handleSingleAdd">
-          style="width: 100px;height: 40px;border-radius: 8px;background-color: #409eff;"
-          @click="handleSingleAdd"
-        >
           添加选项
         </a-button>
       </div>
@@ -58,7 +40,7 @@ export default {
     VoteQuestionItem,
   },
   props: {
-    num:{
+    num: {
       type: Number,
       default: null,
     },
@@ -70,18 +52,18 @@ export default {
     },
 
   },
-  setup(props,{ emit }) {
+  setup(props, { emit }) {
 
 
 
     const curItem = ref(props.item);
     const handleTypesDel = () => {
-      emit("del", { id: curItem.value.id, curItem: curItem.value });
+
-      console.log("删除题干======",{ id: curItem.value.id, curItem: curItem.value });
+      console.log("删除题干======", { id: curItem.value.id, curItem: curItem.value });
-      api.deleteVoteStem({voteStemId:3})
+      api.deleteVoteStem(curItem.value.voteStemId)
         .then(() => {
           //  message.success('删除题干信息成功')
-          
+          emit("del", { id: curItem.value.id, curItem: curItem.value });
         })
 
     };
@@ -92,8 +74,10 @@ export default {
         inputVal: "",
         imgVal: "",
       });
+      emit("addOption", curItem);
     };
     const input = ({ id, val }) => {
+      console.log(id, val)
       curItem.value.singleList.forEach((item) => {
         if (item.id === id) {
           item.inputVal = val;
@@ -114,7 +98,13 @@ export default {
         }
       });
     };
-    const del = ({ id }) => {
+    const del = ({ id, data }) => {
+      console.log(data)
+      api.deleteVoteStemOption(data.value.optionId)
+        .then(() => {
+          //  message.success('删除题干信息成功')
+          emit("delOption", data);
+        })
       curItem.value.singleList.forEach((item, index) => {
         if (item.id === id) {
           curItem.value.singleList.splice(index, 1);
@@ -125,6 +115,11 @@ export default {
 
     };
 
+    const edit = (data) => {
+      // console.log('111111-223', data.value)
+      emit("edits", data)
+    }
+
     return {
       curItem,
       handleTypesDel,
@@ -133,6 +128,7 @@ export default {
       imgSrc,
       delImg,
       del,
+      edit
     };
   },
 };
@@ -142,10 +138,12 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
+
   .header {
     width: 100%;
     display: flex;
     justify-content: space-between;
+
     .title {
       color: #000000;
       font-size: 18px;
@@ -154,10 +152,12 @@ export default {
       padding-left: 37px;
       //font-weight: 500;
     }
+
     .goback {
       padding-right: 70px;
       //padding-top: 37px;
       position: relative;
+
       .return {
         display: inline-block;
         width: 42px;
@@ -166,6 +166,7 @@ export default {
         margin-right: 10px;
         background-image: url("../../assets/images/projectadd/return.png");
       }
+
       .returntext {
         display: inline-block;
         position: absolute;
@@ -175,16 +176,19 @@ export default {
       }
     }
   }
+
   .addtype {
     display: flex;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     margin-right: 20px;
     align-items: center;
     margin-left: 41px;
+
     .addtypen {
       color: #6f6f6f;
       font-size: 14px;
     }
+
     .types {
       cursor: pointer;
       width: 80px;
@@ -197,11 +201,13 @@ export default {
       align-items: center;
       margin: 20px 10px;
     }
+
     .typesCur {
       color: #fff;
       background: #409eff;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -210,9 +216,11 @@ export default {
     min-width: 690px;
     margin-left: 38px;
     margin-top: 20px;
+
     .tagbox {
       display: flex;
       justify-content: right;
+
       .tagname {
         width: 90px;
         height: 32px;
@@ -226,6 +234,7 @@ export default {
         color: rgba(64, 158, 255, 1);
         font-size: 16px;
       }
+
       .deleteop {
         display: flex;
         justify-content: center;
@@ -237,6 +246,7 @@ export default {
         border: 1px solid #409eff;
         border-radius: 8px;
         cursor: pointer;
+
         .del_text {
           color: #409eff;
           font-size: 14px;
@@ -244,21 +254,25 @@ export default {
         }
       }
     }
+
     .scorebox {
       display: flex;
       align-items: center;
       margin-top: 20px;
       margin-left: 70px;
+
       .scoretext {
         font-size: 14px;
         color: #56a3f9;
       }
+
       .number {
         display: flex;
         border: 1px solid #d7e5fd;
         border-radius: 5px;
         margin: 0 10px;
         padding: 5px;
+
         .btn {
           width: 40px;
           height: 40px;
@@ -274,30 +288,36 @@ export default {
           line-height: 24px;
           cursor: pointer;
         }
+
         .curBtn {
           background: #56a3f9;
           color: #fff;
         }
       }
     }
+
     .picture {
       width: 100px;
       display: flex;
       flex-direction: column;
       margin-top: 20px;
       margin-left: 133px;
+
       .pictureimg {
         width: 100px;
         height: 100px;
       }
+
       .picturename {
         color: #6f6f6f;
         font-size: 14px;
       }
     }
+
     .options {
       display: flex;
     }
+
     .delete {
       cursor: pointer;
       margin-top: 32px;
@@ -306,15 +326,18 @@ export default {
       color: #4ea6ff;
       font-size: 14px;
     }
+
     .name2 {
       display: flex;
       align-items: flex-start;
     }
+
     .name {
       width: 60%;
       // background-color: lightcoral;
       display: flex;
       margin-top: 20px;
+
       //align-items: center;
       //height: 40px;
       // border: 1px solid black;
@@ -324,25 +347,30 @@ export default {
         align-items: center;
         justify-content: flex-end;
         flex-shrink: 0;
+
         .nameimg {
           width: 10px;
           height: 10px;
         }
       }
+
       .inname {
         color: #6f6f6f;
         font-size: 14px;
         margin-left: 7px;
         font-weight: 700;
       }
+
       .in {
         margin-left: 14px;
         flex: 1;
+
         .assess {
           display: flex;
           width: 226px;
           height: 40px;
           border: 1px solid #56a3f9;
+
           //margin-bottom: 20px;
           .assesstype {
             width: 50%;
@@ -352,6 +380,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .assesswhole {
             width: 50%;
             background: rgba(86, 163, 249, 0.1);
@@ -361,6 +390,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .ratio {
             position: absolute;
             right: 10px;
@@ -369,24 +399,28 @@ export default {
             font-size: 14px;
           }
         }
+
         .addimg {
           cursor: pointer;
           color: rgba(78, 166, 255, 1);
           font-size: 14px;
         }
+
         .text {
           color: rgba(109, 117, 132, 1);
           font-size: 14px;
           //line-height: 24px;
         }
-        .ant-radio-wrapper {
+
-        }
+        .ant-radio-wrapper {}
+
         .ant-input {
           border-radius: 5px;
           // height: 120%;
           width: 100%;
           height: 35px;
         }
+
         .ant-select-selector {
           border-radius: 5px;
           // height: 120%;
@@ -394,26 +428,32 @@ export default {
           height: 40px;
         }
       }
+
       .numberInp {
         width: 200px;
+
         .ant-input-number {
           width: 200px;
           height: 40px;
           border-radius: 8px;
         }
+
         // .ant-input-number-input-wrap {
         //   width: 200px;
         // }
       }
     }
   }
+
   .name2 {
     display: flex;
     align-items: flex-start;
   }
+
   .opinion {
     display: flex;
     margin-top: 30px;
+
     .namebox {
       width: 120px;
       display: flex;
@@ -421,27 +461,33 @@ export default {
       justify-content: flex-end;
       flex-shrink: 0;
     }
+
     .in {
       margin-left: 14px;
       width: 500px;
+
       .ant-input-textarea-show-count {
         position: relative;
         height: 110px;
       }
+
       .ant-input-textarea-show-count::after {
         position: absolute;
         right: 10px;
         bottom: 0px;
       }
+
       .ant-input {
         border-radius: 8px;
       }
     }
   }
+
   .footer {
     width: 100%;
     margin-top: 31px;
     margin-bottom: 14px;
+
     .btn {
       display: flex;
       margin-bottom: 20px;
@@ -452,6 +498,7 @@ export default {
 
   .uploadContent {
     display: block !important;
+
     .uploadBtn {
       margin-left: 120px !important;
     }

src/components/vote/VoteQuestionItem.vue

@@ -7,41 +7,27 @@
           <div class="inname">选项{{ item.id }}</div>
         </div>
         <div class="in">
-          <a-input
+          <a-input v-model:value="curItem.inputVal" show-count :maxlength="30" style="border-radius: 8px"
-            v-model:value="curItem.inputVal"
+            @change="handleInput" />
-            show-count
-            :maxlength="30"
-            style="border-radius: 8px"
-            @change="handleInput"
-          />
         </div>
       </div>
       <div class="delete" @click="handleDel">删除</div>
     </div>
     <div class="name uploadContent">
-      <a-upload
+      <a-upload v-show="!item.imgVal" class="in uploadBtn" :show-upload-list="false" :before-upload="beforeUpload">
-        v-show="!item.imgVal"
-        class="in uploadBtn"
-        :show-upload-list="false"
-        :before-upload="beforeUpload"
-      >
         <div class="addimg">+添加图片</div>
       </a-upload>
       <div v-show="item.imgVal" class="picture" style="position: relative">
         <img class="pictureimg" :src="item.imgVal" />
         <div class="picturename" v-show="hasImgName">{{ hasImgName }}</div>
-        <img
+        <img style="
-          style="
             cursor: pointer;
             width: 20px;
             height: 20px;
             position: absolute;
             right: 0;
             top: 0;
-          "
+          " src="../../assets/images/basicinfo/close.png" @click="handleCancel" />
-          src="../../assets/images/basicinfo/close.png"
-          @click="handleCancel"
-        />
       </div>
     </div>
   </div>
@@ -67,12 +53,14 @@ export default {
       hasImgName: "",
     });
 
-    const handleInput = () => {
+    const handleInput = (value) => {
-      emit("input", { id: curItem.value.id, val: curItem.value.inputVal });
+      console.log(value.target.value)
+      emit("edit", curItem)
+      emit("input", { id: curItem.value.id, val: value.target.value });
     };
     const handleDel = () => {
       handleCancel();
-      emit("del", { id: curItem.value.id, optionId: curItem.value.optionId });
+      emit("del", { id: curItem.value.id, optionId: curItem.value.optionId, data: curItem });
     };
     const handleCancel = () => {
       state.hasImgName = "";
@@ -124,10 +112,12 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
+
   .header {
     width: 100%;
     display: flex;
     justify-content: space-between;
+
     .title {
       color: #000000;
       font-size: 18px;
@@ -136,10 +126,12 @@ export default {
       padding-left: 37px;
       //font-weight: 500;
     }
+
     .goback {
       padding-right: 70px;
       //padding-top: 37px;
       position: relative;
+
       .return {
         display: inline-block;
         width: 42px;
@@ -148,6 +140,7 @@ export default {
         margin-right: 10px;
         background-image: url("../../assets/images/projectadd/return.png");
       }
+
       .returntext {
         display: inline-block;
         position: absolute;
@@ -157,16 +150,19 @@ export default {
       }
     }
   }
+
   .addtype {
     display: flex;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     margin-right: 20px;
     align-items: center;
     margin-left: 41px;
+
     .addtypen {
       color: #6f6f6f;
       font-size: 14px;
     }
+
     .types {
       cursor: pointer;
       width: 80px;
@@ -179,11 +175,13 @@ export default {
       align-items: center;
       margin: 20px 10px;
     }
+
     .typesCur {
       color: #fff;
       background: #409eff;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -192,9 +190,11 @@ export default {
     min-width: 690px;
     margin-left: 38px;
     margin-top: 20px;
+
     .tagbox {
       display: flex;
       justify-content: space-between;
+
       .tagname {
         width: 90px;
         height: 32px;
@@ -208,6 +208,7 @@ export default {
         color: rgba(64, 158, 255, 1);
         font-size: 16px;
       }
+
       .deleteop {
         display: flex;
         justify-content: center;
@@ -219,6 +220,7 @@ export default {
         border: 1px solid #409eff;
         border-radius: 8px;
         cursor: pointer;
+
         .del_text {
           color: #409eff;
           font-size: 14px;
@@ -226,21 +228,25 @@ export default {
         }
       }
     }
+
     .scorebox {
       display: flex;
       align-items: center;
       margin-top: 20px;
       margin-left: 70px;
+
       .scoretext {
         font-size: 14px;
         color: #56a3f9;
       }
+
       .number {
         display: flex;
         border: 1px solid #d7e5fd;
         border-radius: 5px;
         margin: 0 10px;
         padding: 5px;
+
         .btn {
           width: 40px;
           height: 40px;
@@ -258,24 +264,29 @@ export default {
         }
       }
     }
+
     .picture {
       width: 100px;
       display: flex;
       flex-direction: column;
       margin-top: 20px;
       margin-left: 133px;
+
       .pictureimg {
         width: 100px;
         height: 100px;
       }
+
       .picturename {
         color: #6f6f6f;
         font-size: 14px;
       }
     }
+
     .options {
       display: flex;
     }
+
     .delete {
       cursor: pointer;
       margin-top: 32px;
@@ -284,15 +295,18 @@ export default {
       color: #4ea6ff;
       font-size: 14px;
     }
+
     .name2 {
       display: flex;
       align-items: flex-start;
     }
+
     .name {
       width: 60%;
       // background-color: lightcoral;
       display: flex;
       margin-top: 20px;
+
       //align-items: center;
       //height: 40px;
       // border: 1px solid black;
@@ -302,25 +316,30 @@ export default {
         align-items: center;
         justify-content: flex-end;
         flex-shrink: 0;
+
         .nameimg {
           width: 10px;
           height: 10px;
         }
       }
+
       .inname {
         color: #6f6f6f;
         font-size: 14px;
         margin-left: 7px;
         font-weight: 700;
       }
+
       .in {
         margin-left: 14px;
         flex: 1;
+
         .assess {
           display: flex;
           width: 226px;
           height: 40px;
           border: 1px solid #56a3f9;
+
           //margin-bottom: 20px;
           .assesstype {
             width: 50%;
@@ -330,6 +349,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .assesswhole {
             width: 50%;
             background: rgba(86, 163, 249, 0.1);
@@ -339,6 +359,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .ratio {
             position: absolute;
             right: 10px;
@@ -347,24 +368,28 @@ export default {
             font-size: 14px;
           }
         }
+
         .addimg {
           cursor: pointer;
           color: rgba(78, 166, 255, 1);
           font-size: 14px;
         }
+
         .text {
           color: rgba(109, 117, 132, 1);
           font-size: 14px;
           //line-height: 24px;
         }
-        .ant-radio-wrapper {
+
-        }
+        .ant-radio-wrapper {}
+
         .ant-input {
           border-radius: 5px;
           // height: 120%;
           width: 100%;
           height: 35px;
         }
+
         .ant-select-selector {
           border-radius: 5px;
           // height: 120%;
@@ -372,26 +397,32 @@ export default {
           height: 40px;
         }
       }
+
       .numberInp {
         width: 200px;
+
         .ant-input-number {
           width: 200px;
           height: 40px;
           border-radius: 8px;
         }
+
         // .ant-input-number-input-wrap {
         //   width: 200px;
         // }
       }
     }
   }
+
   .name2 {
     display: flex;
     align-items: flex-start;
   }
+
   .opinion {
     display: flex;
     margin-top: 30px;
+
     .namebox {
       width: 120px;
       display: flex;
@@ -399,27 +430,33 @@ export default {
       justify-content: flex-end;
       flex-shrink: 0;
     }
+
     .in {
       margin-left: 14px;
       width: 500px;
+
       .ant-input-textarea-show-count {
         position: relative;
         height: 110px;
       }
+
       .ant-input-textarea-show-count::after {
         position: absolute;
         right: 10px;
         bottom: 0px;
       }
+
       .ant-input {
         border-radius: 8px;
       }
     }
   }
+
   .footer {
     width: 100%;
     margin-top: 31px;
     margin-bottom: 14px;
+
     .btn {
       display: flex;
       margin-bottom: 20px;
@@ -430,6 +467,7 @@ export default {
 
   .uploadContent {
     display: block !important;
+
     .uploadBtn {
       margin-left: 120px !important;
     }

src/views/courselibrary/CoursewareManage.vue

@@ -2468,7 +2468,7 @@
           </div>
           <div class="body">
             <div :style="{ display: del_hs ? 'block' : 'none' }">
-              <span>您确定要删除此课程吗</span>
+              <span>您确定要删除此学员吗</span>
             </div>
             <div :style="{ display: copy_hs ? 'block' : 'none' }">
               <span>您确定要复制此课程吗</span>
@@ -4793,6 +4793,7 @@ export default defineComponent({
           pageNo: 20,
           pageSize: 1,
           studentList: res[0],
+          keyWord: "",
         };
         console.log("obj", obj);
         api1

src/views/learningpath/LearningPath.vue

@@ -1693,6 +1693,7 @@ export default {
           pageNo: 20,
           pageSize: 1,
           studentList: res[0],
+          keyWord: "",
         };
         console.log("obj", obj);
         api

src/views/learningpath/LevelAddDetail.vue

@@ -59,7 +59,7 @@
                   <div class="items2">
                     <a-popover
                       placement="topLeft"
-                      v-if="element.name.length > 10"
+                      v-if="element.name?.length > 10"
                     >
                       <template #content>
                         <div style="width: 130px">
@@ -70,7 +70,7 @@
                         {{ element.name }}
                       </div>
                     </a-popover>
-                    <div class="nname" v-if="element.name.length <= 10">
+                    <div class="nname" v-if="element.name?.length <= 10">
                       {{ element.name }}
                     </div>
                   </div>

src/views/projectcenter/ProjectManage.vue

@@ -3521,6 +3521,7 @@ export default {
           pageNo: 20,
           pageSize: 1,
           studentList: res[0],
+          keyWord: "",
         };
         console.log("obj", obj);
         api1

src/views/projectcenter/temTask.vue

@@ -68,7 +68,7 @@
                   <div class="items2">
                     <a-popover
                       placement="topLeft"
-                      v-if="element.tit.length > 10"
+                      v-if="element.tit?.length > 10"
                     >
                       <template #content>
                         <div style="width: 130px">
@@ -82,7 +82,7 @@
                         {{ element.tit }}
                       </div>
                     </a-popover>
-                    <div class="nname" v-if="element.tit.length <= 10">
+                    <div class="nname" v-if="element.tit?.length <= 10">
                       {{ element.tit }}
                     </div>
                   </div>