From 96a971c168b605b0f89d1f70343ff4d041a67c3c Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Mon, 24 Nov 2025 09:16:16 +0800
Subject: [PATCH] jsk

---
 .../certificateInfo/index.vue                 |  2 +-
 .../certificateAtake/index.vue                | 38 ++++++++++--------
 .../certificateTask/index.vue                 | 39 +++++++++++++------
 3 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/src/views/certificate/certificateManage/certificateInfo/index.vue b/src/views/certificate/certificateManage/certificateInfo/index.vue
index e9aa7f8..97b5c7f 100644
--- a/src/views/certificate/certificateManage/certificateInfo/index.vue
+++ b/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"/> -->
diff --git a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
index d7ac1a7..d2ede01 100644
--- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
@@ -105,7 +105,7 @@
       />
 
       <!-- 添加或修改参数配置对话框 -->
-      <el-dialog :title="title+''" :visible.sync="open" width="700px" append-to-body> 
+      <el-dialog :title="title+''" :visible.sync="open" width="700px" append-to-body>
         <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
           <el-row>
             <el-col :span="12">
@@ -148,7 +148,7 @@
                 </el-form-item>
             </el-col>
           </el-row>
-        </el-form> 
+        </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -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() {
-                const param={"certificateNos":this.selectCertificateNos,"type":this.selectType,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
-                console.log("param",param);
-                getCertificateTakeAddPageApi(param).then(response => {
-                  console.log("response",response);
-                if(response.code==200){
-                  this.getList();
-                  this.open2 = false;
-                  this.reset();
-                  this.$modal.msgSuccess("操作成功");
-                }else{
-                  this.$modal.msgError(response.msg);
-                }
-                });
+            submitFormset: function() {
+                const params={"certificateNos":this.selectCertificateNos,"type":this.selectType,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
+                console.log("params",params);
+                getCertificateTakeAddPageApi(params).then(response => {
+                  console.log("getCertificateTakeAddPageApi  response",response)
+                  if(response.code==200){
+                    this.getList();
+                    this.open2 = false;
+                    this.reset();
+                    this.$modal.msgSuccess("操作成功");
+                  }else{
+                    this.$modal.msgError(response.msg);
+                  }
+                }).catch(error => {
+                 console.error(error);
+               });
             },
             // 取消按钮
             cancel2() {
diff --git a/src/views/certificate/certificateReturnManage/certificateTask/index.vue b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
index 76301aa..9336de4 100644
--- a/src/views/certificate/certificateReturnManage/certificateTask/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
@@ -51,7 +51,7 @@
             plain
             icon="el-icon-download"
             size="mini"
-            @click="handleExport" 
+            @click="handleExport"
           >导出</el-button>
         </el-col>
         <el-col :span="1.5">
@@ -68,11 +68,11 @@
         <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;">取证任务数/已完成数：235/230</div>
+          <div style="font-weight: bold;">存证任务数/已完成数：{{saveNum}}/{{saveNumd}}</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"/> 
+        <el-table-column type="selection" width="60" align="center" fixed="left"/>
         <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
             <template slot-scope="scope">
                 <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
@@ -100,7 +100,7 @@
             <span @click="checkCode(scope.row)" style="color:blue">查看</span>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150"/> 
+        <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150"/>
         <el-table-column label="操作类型" align="center" prop="typeName" width="120" :show-overflow-tooltip="true"/>
         <el-table-column label="操作截至日期" align="center" prop="processDate" width="120" :show-overflow-tooltip="true"/>
         <el-table-column label="处理结果" align="center" prop="processStateName" :show-overflow-tooltip="true">
@@ -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,
@@ -307,10 +311,11 @@
             };
         },
         mounted(){
-            this.getList(); 
+            this.getList();
+            this.getNum();
         },
 
-        methods: { 
+        methods: {
             /** 搜索按钮操作 */
             handleQuery() {
                 this.queryParams.pageNum = 1;
@@ -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;
@@ -424,7 +439,7 @@
                 });
             },
             /** 删除按钮操作 */
-            handleDelete(row) { 
+            handleDelete(row) {
                 this.$modal.confirm('是否确认删除数据项？').then(function() {
                     return  deleteCertificateInfoApi({deviceId:row.deviceId});
                 }).then(() => {
@@ -481,12 +496,12 @@
                   this.$modal.msgSuccess("撤回成功");
                   });
                 }).catch(() => {});
-              } 
+              }
             },
             // 多选框选中数据
-            handleSelectionChange(selection) { 
+            handleSelectionChange(selection) {
               this.chosenList = selection;
-         
+
               this.single = selection.length!=1
               this.multiple = !selection.length
             },