From 5ed955abeec76c4b12f1d0a066780f2039c24c9e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 03 十二月 2025 14:47:19 +0800
Subject: [PATCH] 1、英文补充

---
 UI-Project/src/views/hollow/hellowquiphistory.vue |  590 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 306 insertions(+), 284 deletions(-)

diff --git a/UI-Project/src/views/hollow/hellowquiphistory.vue b/UI-Project/src/views/hollow/hellowquiphistory.vue
index a5c673e..1b7243e 100644
--- a/UI-Project/src/views/hollow/hellowquiphistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiphistory.vue
@@ -1,6 +1,6 @@
 <template>  
   <div>  
-<div style="display: flex;width: 2000px;">
+<div style="display: flex;width: 1780px;">
   <el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('searchOrder.processcards')" />
   <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('hellow.isForceList')" clearable
       style="width: 200px;margin-left: 10px;">
@@ -13,20 +13,26 @@
       <el-option :label="$t('basicData.stop')" value="2"></el-option>
       <el-option :label="$t('sorter.endingtask')" value="3"></el-option>
     </el-select>
-          <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')" 
-           style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
-            :end-placeholder="$t('reportmanage.endtime')">
-          </el-date-picker>
+    <el-date-picker
+            style="margin-left: 15px;"
+             v-model="timeRange"
+             type="datetimerange"
+             :shortcuts="shortcuts"
+             range-separator="鑷�"
+             :start-placeholder="$t('reportmanage.starttime')"
+             :end-placeholder="$t('reportmanage.endtime')"
+           />
         <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
    </div>
-      <el-table ref="table" style="margin-top: 20px;height: 580px;width: 100%;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-    <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')" min-width="80" />
-    <el-table-column prop="totalLayer" align="center" :label="$t('hellow.totalLayer')" min-width="80" />
-    <el-table-column prop="totalPairQuantity" align="center" :label="$t('hellow.totalPairQuantity')" min-width="80" />
+      <el-table ref="table" style="margin-top: 20px;height: 580px;width: 99%;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+    <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')" min-width="50" />
+    <el-table-column prop="cell" align="center" :label="$t('searchOrder.line')" min-width="50" />
+    <el-table-column prop="totalLayer" align="center" :label="$t('hellow.totalLayer')" min-width="20" />
+    <el-table-column prop="totalPairQuantity" align="center" :label="$t('hellow.totalPairQuantity')" min-width="50" />
         <el-table-column
           align="center"
           :label="$t('hellow.isForceList')"
-          min-width="80"
+          min-width="50"
           prop="isForce"
         >
         <template #default="scope">  
@@ -38,7 +44,7 @@
         <el-table-column
           align="center"
           :label="$t('searchOrder.state')"
-          min-width="80"
+          min-width="50"
           prop="state"
         >
         <template #default="scope">  
@@ -47,8 +53,8 @@
       </el-tag>  
     </template> 
         </el-table-column>
-        <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
-        <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
+        <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="50" />
+        <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="50" />
         <el-table-column fixed="right" :label="$t('film.operate')" align="center">
             <template #default="scope">
           <el-button type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button>
@@ -86,273 +92,254 @@
           </el-table-column>
         </el-table>
 </el-dialog>
-  <el-dialog v-model="dialogFormVisiblea" top="15vh" width="65%" :title="$t('hellow.listFormula')">
-    <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
-     <el-form  label-width="150px">
-      <el-form label-width="150px" label-position="right">
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-              <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
-                <el-input disabled v-model="formulaName" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
-            <el-select v-model="filmRemove" clearable  style="width: 220px" disabled>
-        <el-option :label="$t('Mounting.removal')" value="1"></el-option>
-        <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
-      </el-select>
-              </el-form-item>
-            </div>
-              </div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
-                <el-input disabled v-model="bottomRemove" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
-                <el-input disabled v-model="topRemove" autocomplete="off" />
-           </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
-                <el-input disabled v-model="leftRemove" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
-            <el-input disabled v-model="rightRemove" autocomplete="off" />
-              </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.casOneb')" :required="true" style="width: 16vw;">
-            <el-select v-model="casOne" clearable disabled style="width: 220px">
-              <el-option :label="$t('hellow.F')" value="0"></el-option>
-              <el-option :label="$t('hellow.Y')" value="1"></el-option>
-            </el-select>
-           </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.casTwob')" style="width: 16vw;">
-            <el-select v-model="casTwo" clearable disabled style="width: 220px">
-              <el-option :label="$t('hellow.F')" value="0"></el-option>
-              <el-option :label="$t('hellow.Y')" value="1"></el-option>
-            </el-select>
-              </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.casThreeb')" style="width: 16vw;">
-            <el-select v-model="casThree" clearable disabled style="width: 220px">
-              <el-option :label="$t('hellow.F')" value="0"></el-option>
-              <el-option :label="$t('hellow.Y')" value="1"></el-option>
-            </el-select>
-           </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.casFourb')" style="width: 16vw;">
-            <el-select v-model="casFour" clearable disabled style="width: 220px">
-              <el-option :label="$t('hellow.F')" value="0"></el-option>
-              <el-option :label="$t('hellow.Y')" value="1"></el-option>
-            </el-select>
-              </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.frameOneb')" :required="true" style="width: 16vw;">
-                <el-input disabled v-model="frameOne" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.frameTwob')" style="width: 16vw;">
-            <el-input disabled v-model="frameTwo" autocomplete="off" />
-              </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.frameThreeb')" style="width: 16vw;">
-                <el-input disabled v-model="frameThree" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.frameFourb')" style="width: 16vw;">
-            <el-input disabled v-model="frameFour" autocomplete="off" />
-              </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" :required="true" style="width: 16vw;">
-                <el-input disabled v-model="intervalFrameHeightOne" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 16vw;">
-            <el-input disabled v-model="intervalFrameHeightTwo" autocomplete="off" />
-              </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 16vw;">
-                <el-input disabled v-model="intervalFrameHeightThree" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 16vw;">
-            <el-input disabled v-model="intervalFrameHeightFour" autocomplete="off" />
-              </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" :required="true" style="width: 16vw;">
-            <el-input disabled v-model="intervalFrameWidthOne" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 16vw;">
-            <el-input disabled v-model="intervalFrameWidthTwo" autocomplete="off" />
-              </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 16vw;">
-            <el-input disabled v-model="intervalFrameWidthThree" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 16vw;">
-            <el-input disabled v-model="intervalFrameWidthFour" autocomplete="off" />
-              </el-form-item>
-            </div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameTypedOne')" :required="true" style="width: 16vw;">
-            <el-select v-model="intervalFrameTypeOne" clearable  style="width: 220px" disabled>
-        <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
-        <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
-      </el-select>
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 16vw;">
-            <el-select v-model="intervalFrameTypeTwo" clearable  style="width: 220px" disabled>
-        <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
-        <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
-      </el-select>
-              </el-form-item>
-            </div>
-              </div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 16vw;">
-            <el-select v-model="intervalFrameTypeThree" clearable  style="width: 220px" disabled>
-        <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
-        <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
-      </el-select>
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 16vw;">
-            <el-select v-model="intervalFrameTypeFour" clearable  style="width: 220px" disabled>
-        <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
-        <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
-      </el-select>
-              </el-form-item>
-            </div>
-              </div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-              <el-form-item :label="$t('hellow.sealInsertb')" :required="true" style="width: 16vw;">
-                <el-input disabled v-model="sealInsert" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-        </el-row>
-        </el-form>
-            </el-form>
+<el-dialog v-model="dialogFormVisiblea" top="10vh" width="90%" :title="$t('hellow.listFormula')">
+  <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
+    <el-form label-width="150px" label-position="right">
+      <!-- 绗竴琛岋細3涓厓绱� -->
+      <el-row style="margin-top: 20px;">
+        <el-col :span="8">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.formulaName')" style="width: 90%;">
+              <el-input disabled v-model="formulaName" autocomplete="off" />
+            </el-form-item>
           </div>
+        </el-col>
+        <el-col :span="8">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 90%;">
+              <el-select v-model="filmRemove" clearable style="width: 100%" disabled placeholder=" ">
+                <el-option :label="$t('Mounting.removal')" value="1"></el-option>
+                <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.sealInsertb')" style="width: 90%;">
+              <el-input disabled v-model="sealInsert" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+
+      <!-- 绗簩琛岋細4涓厓绱� -->
+      <el-row style="margin-top: 20px;">
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.topRemove')" style="width: 90%;">
+              <el-input disabled v-model="topRemove" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.bottomRemove')" style="width: 90%;">
+              <el-input disabled v-model="bottomRemove" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.leftRemove')" style="width: 90%;">
+              <el-input disabled v-model="leftRemove" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.rightRemove')" style="width: 90%;">
+              <el-input disabled v-model="rightRemove" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+
+      <!-- 绗笁琛岋細4涓厓绱� -->
+      <el-row style="margin-top: 20px;">
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.casOneb')" style="width: 90%;">
+              <el-select v-model="casOne" clearable disabled style="width: 100%" placeholder=" ">
+                <el-option :label="$t('hellow.F')" value="0"></el-option>
+                <el-option :label="$t('hellow.Y')" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.casTwob')" style="width: 90%;">
+              <el-select v-model="casTwo" clearable disabled style="width: 100%" placeholder=" ">
+                <el-option :label="$t('hellow.F')" value="0"></el-option>
+                <el-option :label="$t('hellow.Y')" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.casThreeb')" style="width: 90%;">
+              <el-select v-model="casThree" clearable disabled style="width: 100%" placeholder=" ">
+                <el-option :label="$t('hellow.F')" value="0"></el-option>
+                <el-option :label="$t('hellow.Y')" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.casFourb')" style="width: 90%;">
+              <el-select v-model="casFour" clearable disabled style="width: 100%" placeholder=" ">
+                <el-option :label="$t('hellow.F')" value="0"></el-option>
+                <el-option :label="$t('hellow.Y')" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+
+      <!-- 绗洓琛岋細4涓厓绱� -->
+      <el-row style="margin-top: 20px;">
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.frameOneb')" style="width: 90%;">
+              <el-input disabled v-model="frameOne" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.frameTwob')" style="width: 90%;">
+              <el-input disabled v-model="frameTwo" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.frameThreeb')" style="width: 90%;">
+              <el-input disabled v-model="frameThree" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.frameFourb')" style="width: 90%;">
+              <el-input disabled v-model="frameFour" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+
+      <!-- 绗簲琛岋細4涓厓绱� -->
+      <el-row style="margin-top: 20px;">
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 90%;">
+              <el-input disabled v-model="intervalFrameHeightOne" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 90%;">
+              <el-input disabled v-model="intervalFrameHeightTwo" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 90%;">
+              <el-input disabled v-model="intervalFrameHeightThree" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 90%;">
+              <el-input disabled v-model="intervalFrameHeightFour" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+
+      <!-- 绗叚琛岋細4涓厓绱� -->
+      <el-row style="margin-top: 20px;">
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 90%;">
+              <el-input disabled v-model="intervalFrameWidthOne" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 90%;">
+              <el-input disabled v-model="intervalFrameWidthTwo" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 90%;">
+              <el-input disabled v-model="intervalFrameWidthThree" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 90%;">
+              <el-input disabled v-model="intervalFrameWidthFour" autocomplete="off" />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+
+      <!-- 绗竷琛岋細4涓厓绱� -->
+      <el-row style="margin-top: 20px;">
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 90%;">
+              <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" disabled placeholder=" ">
+                <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+                <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 90%;">
+              <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" disabled placeholder=" ">
+                <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+                <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 90%;">
+              <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" disabled placeholder=" ">
+                <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+                <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div style="font-size: 15px;">
+            <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 90%;">
+              <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" disabled placeholder=" ">
+                <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+                <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
 </el-dialog>
 </div>
 </template>  
@@ -470,8 +457,8 @@
       flowCardId: flowCardId.value,
       isForceList: celllist,
       stateList: stateList,
-      beginDate: (timeRange.value && timeRange.value[0]) || '',
-      endDate: (timeRange.value && timeRange.value[1]) || '',
+        beginDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[0])) || '',
+        endDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[1])) || '',
   })
     if (response.code == 200) {
       ElMessage.success(response.message);
@@ -513,8 +500,8 @@
       flowCardId: flowCardId.value,
       isForceList: celllist,
       stateList: stateList,
-      beginDate: (timeRange.value && timeRange.value[0]) || '',
-      endDate: (timeRange.value && timeRange.value[1]) || '',
+        beginDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[0])) || '',
+        endDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[1])) || '',
   })
     if (response.code == 200) {
       currentPage2.value = 1
@@ -619,11 +606,46 @@
 const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
 return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
+const shortcuts = [
+  {
+    text: '鏈�杩戜竴鍛�',
+    value: () => {
+      const backendTime = new Date(getglobalDate)
+      const oneWeekAgo = new Date(getglobalDate)
+      oneWeekAgo.setHours(0, 0, 0, 0);
+      oneWeekAgo.setDate(oneWeekAgo.getDate() - 7)
+      timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)]
+      window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+    },
+  },
+  {
+    text: '鏈�杩戜竴涓湀',
+    value: () => {
+      const backendTime = new Date(getglobalDate)
+      const oneWeekAgo = new Date(getglobalDate)
+      oneWeekAgo.setHours(0, 0, 0, 0);
+      oneWeekAgo.setMonth(oneWeekAgo.getMonth() - 1)
+      timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)]
+      window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+    },
+  },
+  {
+    text: '鏈�杩戜笁涓湀',
+    value: () => {
+      const backendTime = new Date(getglobalDate)
+      const oneWeekAgo = new Date(getglobalDate)
+      oneWeekAgo.setHours(0, 0, 0, 0);
+      oneWeekAgo.setMonth(oneWeekAgo.getMonth() - 3)
+      timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)]
+      window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+},
+  },
+]
 // 鏍煎紡鍖栧悗绔椂闂村苟璁$畻涓�鍛ㄥ墠鐨勬椂闂�
 const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
 function parseAndSetTime() {
 const backendTime = new Date(getglobalDate);
-const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+const oneWeekAgo = new Date(backendTime.getTime() - 0 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
   oneWeekAgo.setHours(0, 0, 0, 0);
 timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
 window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))

--
Gitblit v1.8.0