Tang 3 rokov pred
rodič
commit
8beb6cbefb

+ 5 - 0
src/components/Editor/index.vue

@@ -138,6 +138,7 @@ export default {
       };
       this.$api.getPolicy(datats).then((res) => {
         this.datas = res.data.resultContent;
+        console.log(res.data.resultContent.host)
         this.uploadUrl = res.data.resultContent.host;
         resolve();
       });
@@ -150,6 +151,7 @@ export default {
   },
   methods: {
     handleCustomMatcher(node, Delta) {
+      console.log("handleCustomMatcher")
       let ops = [];
       Delta.ops.forEach((op) => {
         if (op.insert && typeof op.insert === "string") {
@@ -185,6 +187,7 @@ export default {
       return Delta;
     },
     base64ToFile(base64, fileName) {
+      console.log("base64ToFile")
       return new Promise((resolve, reject) => {
         let arr = base64.split(",");
         let mime = arr[0].match(/:(.*?);/)[1];
@@ -201,6 +204,7 @@ export default {
       });
     },
     init() {
+      console.log("init")
       const editor = this.$refs.editor;
       this.Quill = new Quill(editor, this.options);
       // 如果设置了上传地址则自定义图片上传事件
@@ -253,6 +257,7 @@ export default {
       };
     },
     imageChange(param, type) {
+      console.log("imageChange")
       this.$upload
         .upload(param.file, this.uploadStatus)
         .then((res) => {

+ 5 - 4
src/components/tableList.vue

@@ -676,9 +676,9 @@
                 >{{ scope.row[item.prop3] }}-{{ scope.row[item.prop4] }}</span
               >
             </div>
-            <div>准考证号:{{ scope.row[item.prop5] }}</div>
-            <div>座位号:{{ scope.row[item.prop6] }}</div>
-            <div>
+            <div v-if="scope.row['fromPlat'] === 2">准考证号:{{ scope.row[item.prop5] }}</div>
+            <div v-if="scope.row['fromPlat'] === 2">座位号:{{ scope.row[item.prop6] }}</div>
+            <div v-if="scope.row['fromPlat'] === 2">
               同步到考场状态:{{
                 scope.row[item.prop7] === 0
                   ? "未同步"
@@ -687,7 +687,8 @@
                   : scope.row[item.prop7] === 2
                   ? "失败"
                   : ""
-              }} <el-button v-if="scope.row[item.prop7] === 2" type="text">原因</el-button>
+              }} 
+              <!-- <el-button v-if="scope.row[item.prop7] === 2" type="text">原因</el-button> -->
             </div>
           </div>
           <div v-else-if="item.scope === 'changAdressKP'">

+ 28 - 20
src/views/education/examManagement/examArrangement/index.vue

@@ -42,9 +42,21 @@
           >适用商品</el-button
         >
         <el-button type="text" @click="watchs(props.scope.row)">预览</el-button>
-        <el-button type="text" @click="downMaterial(props.scope.row)">下载资料</el-button>
-        <el-button type="text" @click="syncUser(props.scope.row)">同步考场信息</el-button>
-        <el-button type="text" @click="syncExam(props.scope.row)"
+        <el-button type="text" @click="downMaterial(props.scope.row)"
+          >下载资料</el-button
+        >
+        <el-button
+          type="text"
+          @click="syncUser(props.scope.row)"
+          v-if="props.scope.row.wisdomNum > 0"
+          :disabled="sysTime < props.scope.row.applyEndTime"
+          >同步考场信息</el-button
+        >
+        <el-button
+          type="text"
+          @click="syncExam(props.scope.row)"
+          v-if="props.scope.row.wisdomNum > 0"
+          :disabled="sysTime < props.scope.row.applyEndTime"
           >同步信息到考场</el-button
         >
         <el-button
@@ -622,10 +634,10 @@
         </div>
       </div>
       <div>
-        <p>总共:{{ syncData.total }}个学员</p>
-        <p>成功:{{ syncData.success }}个学员</p>
+        <p>总共:{{ syncData.total }}条数据</p>
+        <p>成功:{{ syncData.success }}条数据</p>
         <p>
-          失败:{{ syncData.fail }}个学员
+          失败:{{ syncData.fail }}条数据
           <el-button type="text" @click="watchSyncPeople">查看</el-button>
         </p>
       </div>
@@ -727,7 +739,7 @@ export default {
       //   弹窗数据
       listData: {
         applyStatus: [],
-        reportStatus:1,
+        reportStatus: 1,
       },
       statusPop: -1,
       dialogVisible: false,
@@ -828,32 +840,28 @@ export default {
       infoData: {
         applyStatus: [],
       },
+      sysTime: 0,
     };
   },
   mounted() {
+    this.sysTime = new Date().getTime() / 1000;
     this.search();
   },
   activated() {
+    this.sysTime = new Date().getTime() / 1000;
     this.search();
   },
   methods: {
     //下载资料
-    downMaterial(row){
-      this.$refs.downMaterial.openBox(row)
+    downMaterial(row) {
+      this.$refs.downMaterial.openBox(row);
     },
     //同步考场信息
-    syncUser(row){
-       this.$api
+    syncUser(row) {
+      this.$api
         .appcommonwisdomSyncExamStatus({ applyId: row.applyId })
         .then((res) => {
-          this.$message.success("同步成功")
-          // if (res.data && res.data.total) {
-          //   res.data.applyId = row.applyId;
-          //   this.syncData = res.data;
-          //   this.dialogExamSync = true;
-          // } else {
-          //   this.$message.error("没有学员推送");
-          // }
+          this.$message.success("同步成功");
         });
     },
     //同步信息到考场
@@ -1299,7 +1307,7 @@ export default {
         this.statusPop = 1;
         this.listData = {
           applyStatus: [],
-          reportStatus:1,
+          reportStatus: 1,
           applyUrl: "oss/images/avatar/20211013/1634097664410_1397766697",
         };
         this.$nextTick(() => {