jsk

src/views/certificate/certificateManage/certificateInfo/index.vue

@@ -120,7 +120,7 @@
         <el-table-column label="签发日期" align="center" width="120" prop="issueDay" :show-overflow-tooltip="true"/>
         <el-table-column label="有效期至" align="center" width="120" prop="issueLifespan" :show-overflow-tooltip="true"/>
         <el-table-column label="设备编号" align="center" prop="deviceNo" :show-overflow-tooltip="true"/>
-        <el-table-column label="槽位编号" align="center" prop="soltNo" :show-overflow-tooltip="true"/>
+        <el-table-column label="槽位编号" align="center" prop="slotNo" :show-overflow-tooltip="true"/>
         <el-table-column label="当前状态" align="center" prop="stateName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->

src/views/certificate/certificateReturnManage/certificateAtake/index.vue

@@ -184,7 +184,7 @@
             </el-tab-pane>
         </el-tabs>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm2">确 定</el-button>
+          <el-button type="primary" @click="submitFormset">确 定</el-button>
           <el-button @click="cancel2">取 消</el-button>
         </div>
       </el-dialog>
@@ -359,6 +359,8 @@
                     issueAddr:"",
                     issueDay:"",
                     issueLifespan:"",
+                    exitTime:"",
+                    entryTime:"",
                     isEle:"0"
                 };
                 this.resetForm("baseForm");
@@ -415,20 +417,22 @@
                   this.title2 = titled;
                 }
             },
-            submitForm2: function() {
+            submitFormset: function() {
-                const param={"certificateNos":this.selectCertificateNos,"type":this.selectType,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
+                const params={"certificateNos":this.selectCertificateNos,"type":this.selectType,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
-                console.log("param",param);
+                console.log("params",params);
-                getCertificateTakeAddPageApi(param).then(response => {
+                getCertificateTakeAddPageApi(params).then(response => {
-                  console.log("response",response);
+                  console.log("getCertificateTakeAddPageApi  response",response)
-                if(response.code==200){
+                  if(response.code==200){
-                  this.getList();
+                    this.getList();
-                  this.open2 = false;
+                    this.open2 = false;
-                  this.reset();
+                    this.reset();
-                  this.$modal.msgSuccess("操作成功");
+                    this.$modal.msgSuccess("操作成功");
-                }else{
+                  }else{
-                  this.$modal.msgError(response.msg);
+                    this.$modal.msgError(response.msg);
-                }
+                  }
-                });
+                }).catch(error => {
+                 console.error(error);
+               });
             },
             // 取消按钮
             cancel2() {

src/views/certificate/certificateReturnManage/certificateTask/index.vue

@@ -68,8 +68,8 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
       <div style="width: 98%;margin: 10px;display: flex;flex-direction: column;align-items: flex-end;">
-          <div style="font-weight: bold;">存证任务数/已完成数：235/130</div>
+          <div style="font-weight: bold;">存证任务数/已完成数：{{saveNum}}/{{saveNumd}}</div>
-          <div style="font-weight: bold;">取证任务数/已完成数：235/230</div>
+          <div style="font-weight: bold;">取证任务数/已完成数：{{takeNum}}/{{takeNumd}}</div>
       </div>
       <el-table v-loading="loading" :data="tableListData" @selection-change="handleSelectionChange" height="800">
         <el-table-column type="selection" width="60" align="center" fixed="left"/>
@@ -169,7 +169,7 @@
         listDeptExcludeChild,
     } from '@/api/system/dept'
     import { getCertificateTaskListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi,
-    getCertificateTakeReturnPageApi,addCertificateCheckApi } from "@/api/certificateManage/index";
+    getCertificateTakeReturnPageApi,addCertificateCheckApi,getCertificateTaskNumApi } from "@/api/certificateManage/index";
     import base64 from 'base-64';
     import { getToken } from '@/utils/auth'
     import Treeselect from '@riophae/vue-treeselect'
@@ -216,6 +216,10 @@
                 },
                 activeName:"baseSetting",
                 deviceData:{},
+                saveNum:0,
+                saveNumd:0,
+                takeNum:0,
+                takeNumd:0,
                 // 表单参数
                 baseForm: {
                     deptId:null,
@@ -308,6 +312,7 @@
         },
         mounted(){
             this.getList();
+            this.getNum();
         },
 
         methods: {
@@ -321,6 +326,16 @@
                 this.resetForm("queryForm");
                 this.handleQuery();
             },
+            getNum(){
+              let param = {}
+              getCertificateTaskNumApi(param).then(response => {
+                console.log("response",response)
+                  this.saveNum = response.data.saveNum;
+                  this.saveNumd = response.data.saveNumd;
+                  this.takeNum = response.data.takeNum;
+                  this.takeNumd = response.data.takeNumd;
+              });
+            },
             /** 查询列表 */
             getList() {
                 this.loading = true;