feature/bug修改

src/views/plan/order/index.vue

@@ -387,6 +387,13 @@ option.value = {
           ctableRef.value.startSelect();
         }
       },
+      rules: [
+        {
+          required: true,
+          message: "报故单不能为空",
+          trigger: "change",
+        },
+      ],
     },
     {
       label: "报故单id",

src/views/report/productionScheduling/line/index.vue

@@ -7,11 +7,23 @@
       @search-reset="resetChange"
     />
     <div class="btns">
-      <el-button type="primary" @click="exportToPNG">导出PNG图片</el-button>
-      <el-button type="primary" @click="exportToPDF">导出PDF文件</el-button>
+      <div>
+        <el-button type="primary" @click="exportToPNG">导出PNG图片</el-button>
+        <el-button type="primary" @click="exportToPDF">导出PDF文件</el-button>
+      </div>
       <!-- <el-button type="params" v-print="printObj" @click="toPrint"
         >打印</el-button
       > -->
+      <div class="illustration">
+        <div style="display: flex">
+          <div class="round1"></div>
+          :完成
+        </div>
+        <div style="display: flex">
+          <div class="round2"></div>
+          :未完成
+        </div>
+      </div>
     </div>
     <div class="main-content">
       <div ref="ganttRef" id="gantt_here" class="gantt-container"></div>
@@ -451,6 +463,28 @@ watch(
 <style scoped lang="scss">
 .btns {
   margin: 7px 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .illustration {
+    display: flex;
+    padding-right: 5%;
+    align-items: center;
+    width: 230px;
+    justify-content: space-between;
+    .round2 {
+      width: 20px;
+      height: 20px;
+      background-color: orange;
+      border-radius: 10px;
+    }
+    .round1 {
+      width: 20px;
+      height: 20px;
+      background-color: green;
+      border-radius: 10px;
+    }
+  }
 }
 :deep(.avue-crud__body) {
   display: none;

src/views/report/productionScheduling/order/index.vue

@@ -7,11 +7,23 @@
       @search-reset="resetChange"
     />
     <div class="btns">
-      <el-button type="primary" @click="exportToPNG">导出PNG图片</el-button>
-      <el-button type="primary" @click="exportToPDF">导出PDF文件</el-button>
+      <div>
+        <el-button type="primary" @click="exportToPNG">导出PNG图片</el-button>
+        <el-button type="primary" @click="exportToPDF">导出PDF文件</el-button>
+      </div>
       <!-- <el-button type="params" v-print="printObj" @click="toPrint"
         >打印</el-button
       > -->
+      <div class="illustration">
+        <div style="display: flex">
+          <div class="round1"></div>
+          :完成
+        </div>
+        <div style="display: flex">
+          <div class="round2"></div>
+          :未完成
+        </div>
+      </div>
     </div>
     <div class="main-content">
       <div ref="ganttRef" id="gantt_here" class="gantt-container"></div>
@@ -445,6 +457,28 @@ watch(
 <style scoped lang="scss">
 .btns {
   margin: 7px 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .illustration {
+    display: flex;
+    padding-right: 5%;
+    align-items: center;
+    width: 230px;
+    justify-content: space-between;
+    .round2 {
+      width: 20px;
+      height: 20px;
+      background-color: orange;
+      border-radius: 10px;
+    }
+    .round1 {
+      width: 20px;
+      height: 20px;
+      background-color: green;
+      border-radius: 10px;
+    }
+  }
 }
 :deep(.avue-crud__body) {
   display: none;

src/views/report/statistics/screens/capacity/index.vue

@@ -99,7 +99,7 @@ const setShowData1 = (num, time) => {
 };
 const getListData = async () => {
   const { data } = await getOffLineInfo();
-  datas.value = [...data, ...data, ...data];
+  datas.value = data;
 };
 onMounted(async () => {
   window.addEventListener("resize", checkFullscreen);

src/views/report/statistics/screens/tasks/index.vue

@@ -81,12 +81,12 @@
               <div class="box">
                 <div style="display: flex; align-items: center">
                   <dv-digital-flop
-                    :config="completeNumConfigs[index]"
+                    :config="completeNumConfigs[index + 3]"
                     class="flop"
                   />
                   <span class="plan-num">/</span>
                   <dv-digital-flop
-                    :config="taskNumConfigs[index]"
+                    :config="taskNumConfigs[index + 3]"
                     class="flop"
                   />
                 </div>
@@ -125,12 +125,12 @@
               <div class="box">
                 <div style="display: flex; align-items: center">
                   <dv-digital-flop
-                    :config="completeNumConfigs[index]"
+                    :config="completeNumConfigs[index + 3]"
                     class="flop"
                   />
                   <span class="plan-num">/</span>
                   <dv-digital-flop
-                    :config="taskNumConfigs[index]"
+                    :config="taskNumConfigs[index + 3]"
                     class="flop"
                   />
                 </div>
@@ -181,7 +181,11 @@ const showdatas2 = ref([]);
 const showdatas3 = ref([]);
 const getData = async () => {
   const { data } = await getStationTaskInfo();
-  datas.value = data;
+  datas.value = [...data];
+  // if (datas.value.length < 9) {
+  //   completeNumConfigs.value.splice(0, datas.value.length - 1);
+  //   taskNumConfigs.value.splice(0, datas.value.length - 1);
+  // }
 };
 const interval1 = ref(null);
 const sum1 = ref(1);
@@ -217,7 +221,7 @@ const setShowDatas = async (time) => {
     showdatas1.value = dataA.splice(0, 3);
     showdatas2.value = dataB.splice(3, 3);
     showdatas3.value = dataC.splice(6, 3);
-    setNumber(1750);
+    setNumber(2000);
   }
 };
 const completeNumConfigs = ref([
@@ -348,18 +352,32 @@ const setTimeOutFnc = (array, num, time) => {
   }, time);
 };
 const setNumber = (time) => {
-  showdatas1.value.forEach((item, index) => {
-    setTimeOutFnc(completeNumConfigs.value[index], item.completeNum, time);
-    setTimeOutFnc(taskNumConfigs.value[index], item.taskNum, time);
-  });
-  showdatas2.value.forEach((item, index) => {
-    setTimeOutFnc(completeNumConfigs.value[index + 3], item.completeNum, time);
-    setTimeOutFnc(taskNumConfigs.value[index + 3], item.taskNum, time);
-  });
-  showdatas3.value.forEach((item, index) => {
-    setTimeOutFnc(completeNumConfigs.value[index + 6], item.completeNum, time);
-    setTimeOutFnc(taskNumConfigs.value[index + 6], item.taskNum, time);
-  });
+  if (showdatas1.value.length > 0) {
+    showdatas1.value.forEach((item, index) => {
+      setTimeOutFnc(completeNumConfigs.value[index], item.completeNum, time);
+      setTimeOutFnc(taskNumConfigs.value[index], item.taskNum, time);
+    });
+  }
+  if (showdatas2.value.length > 0) {
+    showdatas2.value.forEach((item, index) => {
+      setTimeOutFnc(
+        completeNumConfigs.value[index + 3],
+        item.completeNum,
+        time
+      );
+      setTimeOutFnc(taskNumConfigs.value[index + 3], item.taskNum, time);
+    });
+  }
+  if (showdatas3.value.length > 0) {
+    showdatas2.value.forEach((item, index) => {
+      setTimeOutFnc(
+        completeNumConfigs.value[index + 3],
+        item.completeNum,
+        time
+      );
+      setTimeOutFnc(taskNumConfigs.value[index + 3], item.taskNum, time);
+    });
+  }
 };
 onUnmounted(() => {
   if (interval1.value) {
@@ -467,7 +485,6 @@ onUnmounted(() => {
     display: flex;
     flex-direction: column;
     align-items: center;
-    justify-content: space-between;
   }
   .grid-item {
     height: 100%;
@@ -478,6 +495,7 @@ onUnmounted(() => {
     padding: 2vh 1vh;
     width: 31vw;
     height: 25vh;
+    margin-bottom: 3vh;
 
     .grid-bottom {
       display: flex;