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

# Conflicts:
#	src/components/vote/AddVote.vue

package-lock.json

@@ -13,6 +13,7 @@
 				"ant-design-vue": "^3.2.12",
 				"axios": "^1.1.3",
 				"core-js": "^3.8.3",
+				"dayjs": "^1.11.6",
 				"element-plus": "^2.2.17",
 				"element-resize-detector": "^1.2.4",
 				"html2canvas": "^1.4.1",
@@ -4949,9 +4950,9 @@
 			}
 		},
 		"node_modules/dayjs": {
-			"version": "1.11.5",
+			"version": "1.11.6",
-			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz",
+			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
-			"integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
+			"integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
 		},
 		"node_modules/debug": {
 			"version": "4.3.4",
@@ -15686,9 +15687,9 @@
 			}
 		},
 		"dayjs": {
-			"version": "1.11.5",
+			"version": "1.11.6",
-			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz",
+			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
-			"integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
+			"integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
 		},
 		"debug": {
 			"version": "4.3.4",

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.18------------");
+    console.log("版本0.9.1------------");
     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-12-05 21:56:56
+ * @LastEditTime: 2022-12-06 09:02:40
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -55,10 +55,10 @@ http.interceptors.response.use(
     if (code === 0 || code === 200) {
       return response;
     } else {
-      // if (code === 1000) {
+      if (code === 1000) {
-      //   window.open("https://u-pre.boe.com/web/", '_self');
+        window.open("https://u-pre.boe.com/web/", '_self');
-      //   // window.open("http://111.231.196.214:12013/manage/login", '_self');
+        // window.open("http://111.231.196.214:12013/manage/login", '_self');
-      // }
+      }
       console.log("api %o", msg);
     }
     return response;

src/components/drawers/ AssessmentList.vue

@@ -93,6 +93,10 @@ export default {
     titleTag: {
       type: Boolean,
       default: false,
+    },
+    assessmentName:{
+      type:String,
+      default: null,
     }
   },
   setup(props, ctx) {
@@ -105,7 +109,8 @@ export default {
       tableDataTotal: 0,
       tableData: [],
       selectedRowKeys: [],
-      assessmentId:null
+      assessmentId:null,
+      assessmentName:null,
     });
     const closeDrawer = () => {
       state.selectedRowKeys = [];
@@ -157,13 +162,17 @@ export default {
     const rowSelection = {
       type: "radio",
       onSelect: (selectedRows) => {
+       
         state.assessment =selectedRows;
-        state.assessmentId = selectedRows.assessmentId;
+       
+        /* state.assessmentId = selectedRows.assessmentId;
         ctx.emit("checkedAss", state.assessment);
         ctx.emit("update:assessmentId", state.assessmentId);
+        ctx.emit("update:assessmentName", state.assessment.name);
+        console.log("state.assessment",state.assessment);
         state.selectedRowKeys = [];
-        closeDrawer();
+        closeDrawer();*/
-      },
+      },  
     };
     // const onSelectChange = (selectedRowKeys) => {
     //   if(selectedRowKeys.length>2){return}
@@ -179,6 +188,8 @@ export default {
       state.assessmentId = selectRow[0].assessmentId;
       ctx.emit("checkedAss", state.assessment);
       ctx.emit("update:assessmentId", state.assessmentId);
+      ctx.emit("update:assessmentName", state.assessment.name);
+  
       state.selectedRowKeys = [];
       closeDrawer();
     };

src/components/drawers/AddEval.vue

@@ -33,11 +33,15 @@
               <button class="checkEval" @click="showEvalDrawer">
                 选择测评
               </button>
-              <span style="margin-left: 10px">
+              <div v-if="(evaluationTypeName !== '')" style="margin-left:20px">
-                <a-tag class="tag-style" v-if="evaluationTypeName !== ''" :closable="true" @close="delTag">{{
+                <a-tag closable @close="delTag" color="processing">
-                    evaluationTypeName
+                  <span style="font-size: 14px; line-height: 33px"
-                }}</a-tag>
+                  >{{evaluationTypeName}}</span
-              </span>
+                  >
+                </a-tag>
+              </div>
+
+            
             </div>
           </div>
           <div class="main_item">
@@ -259,11 +263,11 @@ export default {
     const editInvistText = () => {
       if (!state.inputV1) {
         message.destroy();
-        return message.info("请输入测评名称");
+        return message.warning("请输入测评名称");
       }
       if (!state.evaluationTypeId) {
         message.destroy();
-        return message.info("请选择测评");
+        return message.warning("请选择测评");
       }
       let objei = {
         evaluationName: state.inputV1,
@@ -295,11 +299,11 @@ export default {
     const createEvalText = () => {
       if (!state.inputV1) {
         message.destroy();
-        return message.info("请输入测评名称");
+        return message.warning("请输入测评名称");
       }
       if (!state.evaluationTypeId) {
         message.destroy();
-        return message.info("请选择测评");
+        return message.warning("请选择测评");
       }
       let obj = {
         evaluationName: state.inputV1,

src/components/drawers/AddFaceteach.vue

@@ -193,7 +193,7 @@
               <button class="xkbtn" @click="showAssessment">选择评估</button>
               <div v-if="assessmentId > 0">
                 <a-tag closable color="processing" @close="logA">
-                  <span style="font-size:14px;line-height: 33px;">删除评估</span>
+                  <span style="font-size:14px;line-height: 33px;">{{assessmentName}}</span>
                 </a-tag>
               </div>
               <AssessmentList v-model:assessmentVisible="assessmentVisible" v-model:titleTag="titleTag"
@@ -378,6 +378,7 @@ export default {
       type: String,
       default: null,
     },
+    
   },
   setup(props, ctx) {
     const options = ref([]);
@@ -416,6 +417,7 @@ export default {
       completeLeave: false,
       innerPersion: false,
       outPersion: false,
+      assessmentName:null,
 
     });
     const clear = () => {

src/components/drawers/AddLive.vue

@@ -207,7 +207,7 @@
               <div v-if="(assessmentId > 0)">
                 <a-tag closable @close="removePG" color="processing">
                   <span style="font-size: 14px; line-height: 33px"
-                  >删除评估</span
+                  >{{assessmentName}}</span
                   >
                 </a-tag>
               </div>
@@ -215,6 +215,7 @@
                   v-model:assessmentVisible="assessmentVisible"
                   v-model:titleTag="titleTag"
                   v-model:assessmentId="assessmentId"
+                  v-model:assessmentName="assessmentName"
               />
             </div>
           </div>
@@ -401,6 +402,7 @@ export default {
       type: Number,
       default: null,
     },
+    
   },
   setup(props, ctx) {
     // const router = useRouter();
@@ -439,6 +441,7 @@ export default {
       needEval: false,
       switchC2: false,
       assessmentVisible: false,
+      assessmentName:"",
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);

src/components/drawers/AddOnline.vue

@@ -460,7 +460,7 @@ export default {
                 }
               }
               message.destroy();
-              message.info("在线课（" + tipStr + "）重复添加");
+              message.warning("在线课（" + tipStr + "）重复添加");
               return;
             } else {
               state.addOnlineList.map((value) => {
@@ -521,7 +521,7 @@ export default {
                 }
               }
               message.destroy();
-              message.info("在线课（" + tipStr + "）重复添加");
+              message.warning("在线课（" + tipStr + "）重复添加");
               return;
             } else {
               state.addOnlineList.map((value) => {

src/components/drawers/AddProject.vue

@@ -466,7 +466,7 @@ export default {
           closeSameModal();
           closeDrawer();
           message.destroy();
-          message.info("添加成功");
+          message.warning("添加成功");
           return;
         }
         if (origin.length == 0) {

src/components/drawers/AddTest.vue

@@ -48,6 +48,13 @@
           <div class="main_left">
             <div class="main_item">
               <div class="btnbox">
+                <div class="sign" style="margin-bottom:24px">
+                <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                />
+              </div>
+             
                 <a-form-item
                     has-feedback
                     label="考试名称"
@@ -64,6 +71,7 @@
               </div>
             </div>
             <div class="main_item2">
+            
               <a-form-item
                   has-feedback
                   label="考试说明"
@@ -83,6 +91,12 @@
             </div>
             <div class="main_item">
               <div class="btnbox">
+                <div class="sign" style="margin-bottom:24px">
+                <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                />
+              </div>
                 <a-form-item has-feedback label="选择考试" name="choosedTest">
                   <a-button
                       type="primary"
@@ -93,33 +107,11 @@
                   >
                     选择考试
                   </a-button>
-                  <!-- <a-dropdown>
+          
-                    <a-button
+ 
-                      type="primary"
-                      style="width: 100px; margin-left: 35px"
-                      class="outer"
-                      @click.prevent
-                      @click="selectTest()"
-                    >
-                      选择试卷
-                      <DownOutlined />
-                    </a-button>
-                    <template #overlay>
-                      <a-menu>
-                        <a-menu-item
-                          v-for="item in formState.choosedTest"
-                          :key="item.key"
-                        >
-                          <a @click="chooseTest(item.key - 1)">{{
-                            item.value
-                          }}</a>
-                        </a-menu-item>
-                      </a-menu>
-                    </template>
-                  </a-dropdown> -->
 
                   <a-tag v-if="paperName != ''" closable color="processing" @close="delTag">
-                    <span style="font-size:14px;line-height: 33px;">删除考试</span>
+                    <span style="font-size:14px;line-height: 33px;">{{paperName}}</span>
                   </a-tag>
 
 
@@ -130,6 +122,12 @@
 
             <div class="main_item">
               <div class="btnbox">
+                <div class="sign" style="margin-bottom:24px">
+                <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                />
+              </div>
                 <a-form-item has-feedback label="考试时间" name="choosedTime">
                   <a-range-picker
                       v-model:value="formState.choosedTime"
@@ -142,6 +140,12 @@
             </div>
             <div class="main_item">
               <div class="btnbox">
+                <div class="sign" style="margin-bottom:24px">
+                <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                />
+              </div>
                 <a-form-item
                     has-feedback
                     label="考试时长"
@@ -475,6 +479,8 @@ export default {
     const formState = reactive({
       examinationName: "",
       examinationDuration: 0,
+      choosedTime: "",
+      paperName: "",
       examinationLimit: "",
       passLine: null,
       examinationEndTime: "",
@@ -483,22 +489,7 @@ export default {
       scoringModel: 2,
       showAnalysis: 2,
       showAnswers: 2,
-      choosedTime: "",
+      choosedTest: "",
-      paperName: "",
-      choosedTest: [
-        {
-          key: 1,
-          value: "提高核心竞争力",
-        },
-        {
-          key: 2,
-          value: "增强创新意识感",
-        },
-        {
-          key: 3,
-          value: "巩固基础求发展",
-        },
-      ],
     });
     const state = reactive({
       addLoading: false,
@@ -509,6 +500,12 @@ export default {
       id: "",
       testName: "",
       TestName:"",
+      testObj:{
+        name:"",
+        paperId:"",
+        choosedTime:"",
+        duration:""  
+      },
       choosedTestList: [
         {
           value: "提高核心竞争力",
@@ -517,119 +514,7 @@ export default {
       ],
     });
     const formRef = ref();
-    let checkExaminationName = async (_rule, value) => {
-      if (!value) {
-        return Promise.reject("请输入考试名称");
-      }
-    };
 
-    /*
-    let checkChoosedTest = async (_rule, value) => {
-      if (!value) {
-        return Promise.reject("请选择考试");
-      }
-    };*/
-    let checkChoosedTime = async (_rule, value) => {
-      if (!value.length) {
-        return Promise.reject("请选择时间");
-      }
-    };
-
-    let checkExaminationDuration = async (_rule, value) => {
-      if (!value) {
-        return Promise.reject("请输入考试时长");
-      }
-    };
-    let checkLimit = async (_rule, value) => {
-      if (!value) {
-        return Promise.reject("请输入考试限制");
-      }
-    };
-    let checkShowAnswers = async (_rule, value) => {
-      if (!value) {
-        return Promise.reject("请输入作业名称");
-      }
-    };
-    let checkShowAnalysis = async (_rule, value) => {
-      if (!value) {
-        return Promise.reject("请输入作业名称");
-      }
-    };
-    let checkScoringModel = async (_rule, value) => {
-      if (!value) {
-        return Promise.reject("请输入作业名称");
-      }
-    };
-
-    let checkQuestionArrangement = async (_rule, value) => {
-      if (!value) {
-        return Promise.reject("请输入作业名称");
-      }
-    };
-    const rules = {
-      examinationName: [
-        {
-          required: true,
-          validator: checkExaminationName,
-          trigger: "change",
-        },
-      ],
-
-      /*
-      choosedTest: [
-        {
-          required: true,
-          validator: checkChoosedTest,
-          trigger: "change",
-        },
-      ],*/
-      choosedTime: [
-        {
-          required: true,
-          validator: checkChoosedTime,
-          trigger: "change",
-        },
-      ],
-      examinationDuration: [
-        {
-          required: true,
-          validator: checkExaminationDuration,
-          trigger: "change",
-        },
-      ],
-      limit: [
-        {
-          required: true,
-          validator: checkLimit,
-          trigger: "change",
-        },
-      ],
-      showAnswers: [
-        {
-          validator: checkShowAnswers,
-          trigger: "change",
-        },
-      ],
-      showAnalysis: [
-        {
-          validator: checkShowAnalysis,
-          trigger: "change",
-        },
-      ],
-      scoringModel: [
-        {
-          validator: checkScoringModel,
-          trigger: "change",
-        },
-      ],
-
-      questionArrangement: [
-        {
-          validator: checkQuestionArrangement,
-          trigger: "change",
-        },
-      ],
-    };
     const options1 = ref([
       {
         label: "math",
@@ -644,7 +529,7 @@ export default {
       updateTest();
     };
     const handleFinishFailed = () => {
-      message.error("handleFinishFailed");
+     // message.error("handleFinishFailed");
     };
     const resetForm = () => {
       formRef.value.resetFields();
@@ -747,10 +632,24 @@ export default {
         examinationTestId: state.paperId,
         examinationTestName: state.paperName,
       };
-      if (!(state.paperId > 0)) {
+     
+      if (!formState.examinationName) {
         message.destroy();
-        return message.error("请选择考试");
+        return message.warning("请输入考试名称");
       }
+      if (!state.paperId) {
+        message.destroy();
+        return message.warning("请输入选择考试");
+      }
+      if (!formState.choosedTime) {
+        message.destroy();
+        return message.warning("请输入开始结束时间");
+      }
+      if (!formState.examinationDuration) {
+        message.destroy();
+        return message.warning("请输入考试时长");
+      }
+    
       if (props.edit) {
         // 编辑任务
         updateExamination(obj)
@@ -862,12 +761,8 @@ export default {
     const changeOuter = (value) => {
       state.isOuter = value;
     };
-    const chooseTest = (index) => {
+    const chooseTest = () => {
-      for (let i in state.choosedTestList) {
+     
-        if (state.choosedTestList[i].key == formState.choosedTest[index].key)
-          return;
-      }
-      state.choosedTestList.push(formState.choosedTest[index]);
     };
     const closeTag = (removedTag) => {
       const tags = state.choosedTestList.filter(
@@ -900,7 +795,7 @@ export default {
       formRef,
       delTag,
       // layout,
-      rules,
+  
       updateTest,
       queryTest,
       changeOuter,

src/components/drawers/AddVotebak.vue

@@ -305,7 +305,7 @@ export default {
     const updateVoteInfo = () => {
       if (!state.inputV1) {
         message.destroy();
-        return message.info("请输入投票名称");
+        return message.warning("请输入投票名称");
       }
 
       if (state.basevote == "") {

src/components/drawers/CreVote.vue

@@ -215,19 +215,19 @@ export default {
     const createQueTit = () => {
       if (!state.inputV1) {
         message.destroy();
-        return message.info("请输入投票名称");
+        return message.warning("请输入投票名称");
       }
       for (let i = 0; i < state.questions.length; i++) {
         if (!state.questions[i].inputV) {
           message.destroy();
-          return message.info("请输入题干");
+          return message.warning("请输入题干");
         }
       }
       for (let i = 0; i < state.questions.length; i++) {
         for (let k = 0; k < state.questions[i].options.length; k++) {
           if (!state.questions[i].options[k].opvalue) {
             message.destroy();
-            return message.info("请输入选项");
+            return message.warning("请输入选项");
           }
         }
       }

src/components/drawers/NoticeHis.vue

@@ -117,7 +117,7 @@ export default {
     width: 74%;
     display: flex;
     justify-content: space-between;
-    margin-bottom: 20px;
+    margin-bottom: 66px;
     .itemcontent {
       width: 500px;
       word-break: break-all;

src/components/drawers/SelectTest.vue

@@ -65,7 +65,7 @@
             :row-selection="{
               selectedRowKeys: selectedRowKeys,
               onChange: onSelectChange,
-              hideSelectAll: true,
+              type: 'radio',
             }"
             :scroll="{ x: 900 }"
             :pagination="false"
@@ -215,9 +215,6 @@ export default {
     };
 
     const onSelectChange = (selectedRowKeys, selectedRows) => {
-      if (selectedRowKeys.length > 1) {
-        return;
-      }
       state.selectedRowKeys = selectedRowKeys;
       state.SelectTestData = selectedRows[0];
     };

src/components/vote/AddVote.vue

@@ -1,20 +1,20 @@
 <template>
   <a-drawer
-      :visible="addvoteVisible"
+    :visible="addvoteVisible"
-      class="drawerStyle addvoteDrawer"
+    class="drawerStyle addvoteDrawer"
-      width="80%"
+    width="80%"
-      title="添加投票"
+    title="添加投票"
-      placement="right"
+    placement="right"
-      @after-visible-change="afterVisibleChange"
+    @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
         <div v-if="edit" class="headerTitle">编辑投票任务</div>
         <div v-else class="headerTitle">添加投票任务</div>
         <img
-            style="width: 29px; height: 29px; cursor: pointer"
+          style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
+          src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
+          @click="closeDrawer"
         />
       </div>
       <div class="contentMain">
@@ -23,18 +23,18 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
+                  src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">任务名称：</span>
             </div>
             <div class="btnbox">
               <a-input
-                  v-model:value="inputV1"
+                v-model:value="inputV1"
-                  style="width: 424px; height: 32px"
+                style="width: 424px; height: 32px"
-                  placeholder="请输入投票名称"
+                placeholder="请输入投票名称"
-                  maxlength="20"
+                maxlength="20"
               />
             </div>
           </div>
@@ -42,8 +42,8 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
+                  src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  alt=""
                 />
               </div>
               <span>创建投票：</span>
@@ -61,16 +61,16 @@
               </div>
               <div>
                 <CreateVote
-                    v-model:createVoteVisible="createVoteVisible"
+                  v-model:createVoteVisible="createVoteVisible"
-                    v-model:ballotId="ballotId"
+                  v-model:ballotId="ballotId"
-                    v-model:editChild="editChild"
+                  v-model:editChild="editChild"
-                    v-model:ballot_name="ballot_name"
+                  v-model:ballot_name="ballot_name"
                 />
               </div>
               <button
-                  class="xkbtn"
+                class="xkbtn"
-                  :style="{ display: creVote ? 'block' : 'none' }"
+                :style="{ display: creVote ? 'block' : 'none' }"
-                  @click="showDrawerCreVote"
+                @click="showDrawerCreVote"
               >
                 编辑投票
               </button>
@@ -85,9 +85,9 @@
             <!-- 创建投票侧弹窗 -->
             <div>
               <create-vote
-                  v-model:crevoteVisible="crevotevisible"
+                v-model:crevoteVisible="crevotevisible"
-                  @getData="getStemId"
+                @getData="getStemId"
-                  v-model:ballotId="ballotId"
+                v-model:ballotId="ballotId"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -96,17 +96,17 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
+                  src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">起止时间：</span>
             </div>
             <div class="btnbox">
               <a-range-picker
-                  style="width: 424px"
+                style="width: 424px"
-                  v-model:value="time"
+                v-model:value="time"
-                  :placeholder="['      开始时间', '        结束时间']"
+                :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
           </div>
@@ -114,8 +114,8 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
+                  src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">基础投票数：</span>
@@ -129,13 +129,22 @@
                 action="/manageApi/vote/baseVoteupload"
                 v-model:file-list="fileList"
               > -->
-              <a-upload
+              <a-upload :before-upload="beforeUpload" :max-count="1">
-                  :before-upload="beforeUpload"
-                  :multiple="false"
-                  :max-count="1"
-                  v-model:file-list="fileList"
-              >
                 <button class="xkbtn">点击上传</button>
+                <template #itemRender="{ file, actions }">
+                  <a-space v-if="file.type.indexOf('sheet') > -1">
+                    <span :style="file.status === 'error' ? 'color: red' : ''">
+                      {{ file.name }}
+                    </span>
+                    <a href="javascript:;" @click="actions.remove">
+                      <img
+                        src="../../assets/del.png"
+                        alt="del"
+                        style="width: 12px; height: 12px"
+                      />
+                    </a>
+                  </a-space>
+                </template>
               </a-upload>
               <div v-if="voteCount > 0">
                 <a-tag color="processing">
@@ -160,11 +169,11 @@
             </div>
             <div class="textarea">
               <a-textarea
-                  v-model:value="textV1"
+                v-model:value="textV1"
-                  placeholder="请输入投票说明"
+                placeholder="请输入投票说明"
-                  allow-clear
+                allow-clear
-                  :rows="6"
+                :rows="6"
-                  maxlength="150"
+                maxlength="150"
               />
             </div>
           </div>
@@ -178,15 +187,15 @@
   </a-drawer>
 </template>
 <script>
-import {reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import CreateVote from "./CreateVote.vue";
 import * as api from "../../api/indexVote";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
-import {RouterEditTask} from "@/api/indexTask";
+import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import * as apiTask from "../../api/indexTaskadd";
-import {addTempTask} from "../../api/indexTaskadd";
+import { addTempTask } from "../../api/indexTaskadd";
-import {baseVoteupload} from "../../api/indexEval";
+import { baseVoteupload } from "../../api/indexEval";
 
 export default {
   name: "AddVote",
@@ -266,11 +275,11 @@ export default {
     });
     const closeDrawer = () => {
       (state.inputV1 = ""),
-          (state.textV1 = ""),
+        (state.textV1 = ""),
-          (state.time = undefined),
+        (state.time = undefined),
-          (state.basevote = ""),
+        (state.basevote = ""),
-          (state.ballotId = ""),
+        (state.ballotId = ""),
-          ctx.emit("update:addvoteVisible", false);
+        ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
@@ -288,41 +297,27 @@ export default {
 
     // 限制文件格式上传
     const beforeUpload = (file) => {
-      console.log(file);
       if (file.type.indexOf("sheet") == -1) {
         message.destroy();
         message.error("请上传正确的文件格式");
 
-        console.log(state.fileList);
-
         state.fileList = [];
-        return;
+        return false;
       }
 
-      // let resFileList = [...info.fileList];
-
-      // resFileList.map((file) => {
-      //   if (file.response) {
-      //     // Component will show file.url as link
-      //     file.url = file.response.url;
-      //     console.log("file========", file);
-      //     console.log("file========", file.response);
-      //     state.voteCount = file.response.data;
-      //   }
-      // });
-
       const formData = new FormData();
       formData.append("uploadFile", file);
       baseVoteupload(formData).then((res) => {
         if (res.data.code === 200) {
-          console.log(res);
+          state.basevote = res.data.data;
         }
       });
+      return false;
     };
 
     //删除题干信息接口
     const dleVoteStem = () => {
-      api.deleteVoteStem({voteStemId: state.ballotId}).then(() => {
+      api.deleteVoteStem({ voteStemId: state.ballotId }).then(() => {
         message.success("删除题干信息成功");
       });
     };
@@ -330,22 +325,22 @@ export default {
     //根据投票id获取投票信息
     const queryVoteInfo = () => {
       api
-          .queryVoteDetailById(props.EditVoteId)
+        .queryVoteDetailById(props.EditVoteId)
-          .then((res) => {
+        .then((res) => {
-            console.log("获取投票信息成功", res);
+          console.log("获取投票信息成功", res);
-            state.inputV1 = res.data.data.voteName;
+          state.inputV1 = res.data.data.voteName;
-            state.textV1 = res.data.data.voteExplain;
+          state.textV1 = res.data.data.voteExplain;
-            state.baseVote = res.data.data.baseVote;
+          state.baseVote = res.data.data.baseVote;
-            state.ascriptionId = res.data.data.ascriptionId;
+          state.ascriptionId = res.data.data.ascriptionId;
-            state.ballotId = res.data.data.ballotId;
+          state.ballotId = res.data.data.ballotId;
-            state.time = [
+          state.time = [
-              dayjs(res.data.data.voteStartTime, "YYYY-MM-DD"),
+            dayjs(res.data.data.voteStartTime, "YYYY-MM-DD"),
-              dayjs(res.data.data.voteEndTime, "YYYY-MM-DD"),
+            dayjs(res.data.data.voteEndTime, "YYYY-MM-DD"),
-            ];
+          ];
-          })
+        })
-          .catch((err) => {
+        .catch((err) => {
-            console.log("获取投票信息失败", err);
+          console.log("获取投票信息失败", err);
-          });
+        });
     };
     const updateToTask = (res) => {
       console.log("props.isLevel=====", props.isLevel);
@@ -358,31 +353,31 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 12,
         })
-            .then(() => {
+          .then(() => {
-              //message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            //message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-              ctx.emit("changeData", false);
+            ctx.emit("changeData", false);
-              state.addLoading = false;
+            state.addLoading = false;
-            })
+          })
-            .catch(() => {
+          .catch(() => {
-              //message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
+            //message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
-            });
+          });
       } else if (props.isLevel == 2) {
         apiTask
-            .addTask({
+          .addTask({
-              courseId: res.data.data.voteId,
+            courseId: res.data.data.voteId,
-              name: res.data.data.voteName,
+            name: res.data.data.voteName,
-              projectId: props.projectId,
+            projectId: props.projectId,
-              projectTaskId: props.projectTaskId || 0,
+            projectTaskId: props.projectTaskId || 0,
-              stageId: props.chooseStageId || 0,
+            stageId: props.chooseStageId || 0,
-              type: 12,
+            type: 12,
-            })
+          })
-            .then(() => {
+          .then(() => {
-              //message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
+            //message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
-              ctx.emit("changeData", false);
+            ctx.emit("changeData", false);
-            })
+          })
-            .catch(() => {
+          .catch(() => {
-              ////message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
+            ////message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
-            });
+          });
       } else if (props.isLevel == 3) {
         addTempTask({
           courseId: res.data.data.voteId,
@@ -392,24 +387,24 @@ export default {
           stageId: props.chooseStageId || 0,
           type: 12,
         })
-            .then(() => {
+          .then(() => {
-              ctx.emit("changeData", false);
+            ctx.emit("changeData", false);
-              //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+            //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-            })
+          })
-            .catch(() => {
+          .catch(() => {
-              //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-            });
+          });
       }
     };
     //修改投票信息接口
     const updateVoteInfo = () => {
       if (!state.inputV1) {
         message.destroy();
-        return message.info("请输入投票名称");
+        return message.warning("请输入投票名称");
       }
       if (!state.ballotId) {
         message.destroy();
-        return message.info("请创建题干信息");
+        return message.warning("请创建题干信息");
       }
 
       if (!state.time) {
@@ -417,7 +412,7 @@ export default {
         return message.warning("请输入直播时间");
       }
       if (!state.basevote) {
-        return message.info("请上传投票基数");
+        return message.warning("请上传投票基数");
       }
       if (state.time != undefined) {
         state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
@@ -435,31 +430,31 @@ export default {
       };
       if (props.edit) {
         api
-            .editVote(obj)
+          .editVote(obj)
-            .then(async (res) => {
+          .then(async (res) => {
-              console.log("updte======");
+            console.log("updte======");
-              await updateToTask(res);
+            await updateToTask(res);
-              closeDrawer();
+            closeDrawer();
-              message.destroy();
+            message.destroy();
-              message.success("修改投票信息成功");
+            message.success("修改投票信息成功");
-            })
+          })
-            .catch(() => {
+          .catch(() => {
-              message.destroy();
+            message.destroy();
-              message.error("修改投票信息失败");
+            message.error("修改投票信息失败");
-            });
+          });
       } else {
         api
-            .createVote(obj)
+          .createVote(obj)
-            .then(async (res) => {
+          .then(async (res) => {
-              await updateToTask(res);
+            await updateToTask(res);
-              closeDrawer();
+            closeDrawer();
-              message.destroy();
+            message.destroy();
-              message.success("创建投票信息成功");
+            message.success("创建投票信息成功");
-            })
+          })
-            .catch(() => {
+          .catch(() => {
-              message.destroy();
+            message.destroy();
-              message.error("创建投票信息失败");
+            message.error("创建投票信息失败");
-            });
+          });
       }
     };
     const queryStem = () => {
@@ -522,8 +517,8 @@ export default {
             width: calc(100%);
             height: 40px;
             background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
+              rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -707,7 +702,6 @@ export default {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
-
           .textarea {
             width: 423px;
 

src/views/courselibrary/CoursewareManage.vue

@@ -686,10 +686,10 @@
                 <div class="btnText">取消</div>
               </div>
               <div class="btn btn6" v-if="isEdit == 0" @click="handlePush">
-                <div class="btnText">确定</div>
+                <div class="btnText">保存</div>
               </div>
               <div class="btn btn6" v-if="isEdit == 1">
-                <div class="btnText">已保存</div>
+                <div class="btnText">未提交</div>
               </div>
               <div class="btn btn6" @click="reviewClick">
                 <div class="btnText">提交审核</div>
@@ -4544,11 +4544,6 @@ export default defineComponent({
     };
     //保存面授课
     const handlePush = (param) => {
-      //state.isEdit = 1;
-
-      console.log("========", state.addLoading);
-      console.log("state.imgList");
-      console.log(state.imgList);
       let files = "";
       if (state.imgList.length) {
         state.imgList.forEach((item) => {
@@ -4556,7 +4551,7 @@ export default defineComponent({
         });
       }
       files = files.slice(0, files.length - 1);
-      console.log(files);
+      console.log("filesfiles",files);
       const postData = {
         offcourseId: state.offcourseId, //不传代表新增
         name: state.qdms_inputV1,
@@ -4594,9 +4589,10 @@ export default defineComponent({
       edit(postData).then((res) => {
         if (res.data.code === 200) {
           getTableDate();
-          ft_exit();
+         // ft_exit();
           rest();
           state.addLoading = false;
+          state.isEdit = 1;
           // console.log("res.data", res.data);
           if (param === "review") {
             //新建时点击审核按钮
@@ -5064,10 +5060,9 @@ export default defineComponent({
     };
     //获取教师
     const getTea = async () => {
-      console.log("获取授课教师信息33333333333");
+
       options4CurName.value = state.teacher;
       options4CurId.value = state.teacherId;
-
       const item1 = await getMemberInfoApi({
         pageNo: state.currentPageTea1,
         pageSize: state.pageSizeTea1,
@@ -5411,6 +5406,8 @@ export default defineComponent({
     //提交审核
     const reviewClick = () => {
       console.log("ft_eidt", state.ft_eidt);
+      handlePush("review");
+      /*
       if (state.ft_eidt) {
         //编辑面授课
         submitReview();
@@ -5419,6 +5416,7 @@ export default defineComponent({
         //shouke
         handlePush("review");
       }
+      */
     };
     const submitReview = (id) => {
       state.addLoading = true;

src/views/projectcenter/ClassAdd.vue

@@ -621,7 +621,7 @@ export default {
     const beforeUpload1 = () => {
       return new Promise((resovle, reject) => {
         if (uplodaFileCount) {
-          message.info("上传文件数量已达最大数量");
+          message.warning("上传文件数量已达最大数量");
           return reject(false);
         }
         return resovle(true);

src/views/projectcenter/SonProject.vue

@@ -621,7 +621,7 @@ export default {
     const beforeUpload1 = () => {
       return new Promise((resovle, reject) => {
         if (uplodaFileCount) {
-          message.info("上传文件数量已达最大数量");
+          message.warning("上传文件数量已达最大数量");
           return reject(false);
         }
         return resovle(true);

src/views/projectcenter/templateAdd.vue

@@ -488,7 +488,7 @@ export default {
     const beforeUpload1 = () => {
       return new Promise((resovle, reject) => {
         if (uplodaFileCount) {
-          message.info("上传文件数量已达最大数量");
+          message.warning("上传文件数量已达最大数量");
           return reject(false);
         }
         return resovle(true);

src/views/research/components/ResearchAddPin.vue

@@ -212,7 +212,7 @@ export default {
 
     const minChange = (e) => {
       if (e > curItem.value.maxScore)
-        return message.info("最低分不能超过最高分");
+        return message.warning("最低分不能超过最高分");
       curItem.value.minScore = e;
       let arr = state.scoreListClone.concat([]);
       arr.map((value, index) => {
@@ -224,7 +224,7 @@ export default {
     };
     const maxChange = (e) => {
       if (e < curItem.value.minScore)
-        return message.info("最高分不能低于最低分");
+        return message.warning("最高分不能低于最低分");
       curItem.value.maxScore = e;
       let arr = state.scoreListClone.concat([]);
       arr.map((value, index) => {