From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/StockBasicData/stockBasicData.vue |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 70a5bcc..a0d3c9e 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -20,8 +20,7 @@
 const requestData = {  
   line: 2001  
 };  
-const now = new Date();
-const timeRange = ref([new Date(now.setHours(0, 0, 0, 0)), new Date(now.setHours(23, 59, 59, 999))])
+const timeRange = ref([])
 const selectValuesa = reactive([]);
 // request.post("/cacheGlass/taskCache/selectEdgTask",{
 //   ...requestData,  
@@ -52,8 +51,7 @@
       stateList=[selectValuesa[1]];
     }
   }
-
-
+console.log(timeRange.value[0],timeRange.value[1]);
   const response = await request.post("/cacheGlass/edgGlassTaskInfo/setEdgGlassInfoRequest", {
     cellList: celllist,
     stateList: stateList,
@@ -86,7 +84,7 @@
         glassId: row.glassId,
         state: 8,
         line: row.line,
-        workingProcedure: '鍐峰姞宸�',
+        workingProcedure: '纾ㄨ竟',
     })
     if (response.code === 200) {
       ElMessage.success(response.message);
@@ -119,7 +117,7 @@
         glassId: row.glassId,
         state: 9,
         line: row.line,
-        workingProcedure: '鍐峰姞宸�',
+        workingProcedure: '纾ㄨ竟',
     })
     if (response.code === 200) {
       ElMessage.success(response.message);
@@ -135,7 +133,7 @@
   }  
 };   
 let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
 // 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
 const handleMessage = (data) => {
   // 鏇存柊 tableData 鐨勬暟鎹�
@@ -157,21 +155,22 @@
 <template>
   <div>
     <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
-      <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('璇烽�夋嫨绾胯矾')" clearable>
+      <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('璇烽�夋嫨绾胯矾')" clearable style="margin-left: 20px;margin-bottom: 10px;">
             <el-option label="纾ㄨ竟涓�绾�" value="2001"></el-option>
             <el-option label="纾ㄨ竟浜岀嚎" value="2002"></el-option>
           </el-select>
 
-          <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('璇烽�夋嫨鐘舵��')" clearable >
+          <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('璇烽�夋嫨鐘舵��')" clearable style="margin-left: 20px;margin-bottom: 10px;" >
             <el-option label="鏈(杈�" value="0"></el-option>
             <el-option label="纾ㄨ竟涓�" value="1"></el-option>
             <el-option label="宸茬(杈�" value="2"></el-option>
           </el-select>
-          <span class="demonstration">鏃堕棿娈�</span>
-            <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+          <span class="demonstration" style="margin-left: 20px;margin-bottom: 10px;">鏃堕棿娈�</span>
+            <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"  style="margin-left: 20px;margin-bottom: 10px;" value-format = "YYYY-MM-DD hh:mm:ss"
+            
               end-placeholder="缁撴潫鏃ユ湡">
             </el-date-picker>
-          <el-button type="primary" style="margin-left: 10px;" @click="setEdgGlassInfoRequest()">{{
+          <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="setEdgGlassInfoRequest()">{{
         $t('reportmanage.inquire')
       }}</el-button>
 

--
Gitblit v1.8.0