From fd5ca57b0de4cae0464572d3e863993b23c37ecd Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 10 Jul 2024 14:35:49 +0800
Subject: [PATCH] 2024-06-21

---
 src/api/cdc/collect.js                  |  1 +
 src/views/modules/cdc/collectScreen.vue | 27 ++++++++++++++++++-------
 src/views/modules/code/generation.vue   | 11 +++++++++-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/api/cdc/collect.js b/src/api/cdc/collect.js
index 533a6cc..d74a627 100644
--- a/src/api/cdc/collect.js
+++ b/src/api/cdc/collect.js
@@ -1,5 +1,6 @@
 import {createAPI} from "../../utils/httpRequest";
 
+export const getBaseTime = (data) => createAPI(`/collect/info/base`,'post',data)
 export const selectCollectList = (data)=>createAPI(`/collect/info/list`,'post',data)
 
 export const saveCollect = (data)=>createAPI(`/collect/info/save`,'post',data)
diff --git a/src/views/modules/cdc/collectScreen.vue b/src/views/modules/cdc/collectScreen.vue
index 3689a35..372aa87 100644
--- a/src/views/modules/cdc/collectScreen.vue
+++ b/src/views/modules/cdc/collectScreen.vue
@@ -107,7 +107,7 @@
 
 <script>
 import dayjs from "dayjs";
-import {selectCollectRecordByItemList} from "../../../api/cdc/collect";
+import {getBaseTime, selectCollectRecordByItemList} from "../../../api/cdc/collect";
 
 export default {
   name: 'collectScreen',
@@ -248,6 +248,22 @@ export default {
       let myChart = this.$echarts.init(document.getElementById('main'));
 
       this.option && myChart.setOption(this.option);
+    },
+
+    getBaseTime(){
+      let params = {}
+      getBaseTime(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.getDataList();
+          this.times = setInterval(() => {
+            this.getDataList();
+          }, 1000 * data.time);
+        }else {
+          this.$message.error(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
     }
   },
   watch:{
@@ -270,14 +286,11 @@ export default {
         }
         this.option.xAxis = val.map(item=>item.deviceDesc)
         this.initCharts()
-      }
-    }
+      },
+    },
   },
   created() {
-    this.getDataList();
-    this.times = setInterval(() => {
-      this.getDataList();
-    }, 1000 * 30);
+    this.getBaseTime();
   },
   mounted() {
     this.initCharts();
diff --git a/src/views/modules/code/generation.vue b/src/views/modules/code/generation.vue
index 84fc10a..7160759 100644
--- a/src/views/modules/code/generation.vue
+++ b/src/views/modules/code/generation.vue
@@ -244,6 +244,14 @@ export default {
         this.$message.error(error)
       })
     },
+    searchDrawingNo(){
+      if (!this.searchModel.drawingNo){
+        this.$message.warning("请先获取编码!")
+        return
+      }
+      // 处理流水号
+
+    }
   },
 }
 </script>
@@ -257,8 +265,9 @@ export default {
           <el-input readonly v-model="searchModel.drawingNo"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="8">
         <el-form-item label=" ">
+<!--          <el-button type="primary"  @click="searchDrawingNo">查询编码</el-button>-->
           <el-button type="primary" :loading="getCodeNoLoading" @click="getCodeNoBtn">获取编码</el-button>
           <el-button type="primary" :loading="saveCodeLoading" @click="saveDrawing">占有编码</el-button>
         </el-form-item>