xujuanning vor 2 Monaten
Ursprung
Commit
7b516179d5

+ 30 - 0
src/views/IntegratedAlarm/reliability/customAnalyse/index.vue

@@ -97,6 +97,7 @@
               collapse-tags
               placeholder="全部描述"
               filterable
+              ref="currSelect"
             >
               <el-option
                 v-for="item in state.alarmIdList"
@@ -286,6 +287,8 @@ import {
 } from "@/api/zhbj/index.js";
 import dayjs from "dayjs";
 const isFullScreen = ref(false);
+const currSelect = ref(null);
+const clickNum = ref(1);
 onMounted(() => {
   const clientHeight =
     document.documentElement.clientHeight || document.body.clientHeight;
@@ -300,6 +303,26 @@ onMounted(() => {
     isFullScreen.value = window.screen.height == clientHeight;
   };
 
+  const parentBox = document.querySelector("#app");
+  const multSelectTages = document.querySelector(".multSelectTages");
+  parentBox.addEventListener("click", (event) => {
+    event.stopPropagation();
+    if (
+      event?.target?.className?.indexOf("is-reverse") === -1 &&
+      clickNum.value % 2 === 0
+    ) {
+      clickNum.value++;
+    }
+  });
+
+  multSelectTages.addEventListener("click", (event) => {
+    event.stopPropagation();
+    if (clickNum.value % 2 === 0) {
+      currSelect.value.blur();
+    }
+    clickNum.value++;
+  });
+
   getWpArray();
   getequipmentmodel_list();
   getfetchRelatePart();
@@ -908,3 +931,10 @@ const compare = function (property) {
   }
 }
 </style>
+<style lang="less">
+.multSelectTages {
+  .el-input__suffix {
+    z-index: 500;
+  }
+}
+</style>

+ 34 - 2
src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -119,10 +119,11 @@
               collapse-tags
               placeholder="全部描述"
               filterable
+              ref="currSelect"
             >
               <el-option
                 v-for="item in state.alarmIdList"
-                :key="item.id"
+                :key="item.alarmId"
                 :label="item.description"
                 :value="item.alarmId"
               >
@@ -334,6 +335,8 @@ import {
 import dayjs from "dayjs";
 
 const isFullScreen = ref(false);
+const currSelect = ref(null);
+const clickNum = ref(1);
 onMounted(() => {
   const clientHeight =
     document.documentElement.clientHeight || document.body.clientHeight;
@@ -348,6 +351,26 @@ onMounted(() => {
     isFullScreen.value = window.screen.height == clientHeight;
   };
 
+  const parentBox = document.querySelector("#app");
+  const multSelectTages = document.querySelector(".multSelectTages");
+  parentBox.addEventListener("click", (event) => {
+    event.stopPropagation();
+    if (
+      event?.target?.className?.indexOf("is-reverse") === -1 &&
+      clickNum.value % 2 === 0
+    ) {
+      clickNum.value++;
+    }
+  });
+
+  multSelectTages.addEventListener("click", (event) => {
+    event.stopPropagation();
+    if (clickNum.value % 2 === 0) {
+      currSelect.value.blur();
+    }
+    clickNum.value++;
+  });
+
   getWpArray();
   getequipmentmodel_list();
   getfetchRelatePart();
@@ -419,7 +442,7 @@ const getWpArray = async () => {
   changZhanArray.value = data;
   if (state.typeVal != "booststation") {
     state.changZhan = data[0]?.id;
-    getTableList();
+    // getTableList();
   } else {
     state.changZhan = "";
     state.modelId = "";
@@ -976,3 +999,12 @@ const compare = function (property) {
   }
 }
 </style>
+<style lang="less">
+.history-analyse {
+  .el-select {
+    .el-input__suffix {
+      z-index: 500;
+    }
+  }
+}
+</style>

+ 4 - 0
src/views/IntegratedAlarm/yhjyReport/index.vue

@@ -648,9 +648,13 @@ export default {
         const pdfWidth = doc.internal.pageSize.getWidth();
         const pdfHeight = (imgProps.height * pdfWidth) / imgProps.width;
 
+        console.log(111, pdfWidth);
+        console.log(222, pdfHeight);
+
         // 计算每页的高度
         const pageHeight = doc.internal.pageSize.getHeight();
         let heightLeft = pdfHeight;
+        console.log(333, pageHeight);
 
         // 添加第一页
         doc.addImage(imgData, "PNG", 0, 0, pdfWidth, pdfHeight);

+ 31 - 20
src/views/SandTable/SandTable.vue

@@ -800,6 +800,17 @@ export default {
       ];
 
       const chartColors = [
+        "#1890ff", // 阿里蓝
+        "#40a0e0", // 天空蓝
+        "#fadb7d", // 浅黄
+        "#ffc53d", // 亮黄橙
+        "#ff85c0", // 粉红
+        "#eb647b", // 珊瑚红
+        "#52c41a", // 绿色
+        "#13a8a8", // 青绿
+        "#fa541c", // 深橙红
+        "#85a5ff", // 浅紫蓝
+
         "#c23531", // 红色系
         "#2f4554", // 深蓝灰
         "#61a0a8", // 蓝绿
@@ -811,38 +822,38 @@ export default {
         "#6e7074", // 灰蓝
         "#546570", // 深灰
 
+        "#3e73e9",
+        "#4fa6e8",
+        "#70d0f4",
+        "#b7eb8f", // 浅绿黄
+        "#87e8de", // 水蓝
+        "#b37feb", // 紫罗兰
+        "#597ef7", // 宝蓝
+        "#13c2c2", // 青色
         "#c4ccd3", // 浅灰
         "#f05b72", // 亮红
-        "#ef5b9c", // 玫瑰粉
-        "#f47983", // 桃红
+
+        "#2f54eb", // 深宝蓝
         "#d87c7c", // 灰红
         "#93b7e3", // 天蓝
-        "#a4d8c2", // 薄荷绿
         "#e5d854", // 柠檬黄
+        "#a4d8c2", // 薄荷绿
+        "#ffc149",
+        "#ff7a87",
+        "#70d0f4",
+        "#cff4d8",
+
+        
+        "#ef5b9c", // 玫瑰粉
+        "#f47983", // 桃红
+        
         "#ef91aa", // 粉紫
         "#87f7cf", // 青蓝
 
-        "#b7eb8f", // 浅绿黄
-        "#87e8de", // 水蓝
-        "#b37feb", // 紫罗兰
-        "#597ef7", // 宝蓝
-        "#13c2c2", // 青色
-        "#2f54eb", // 深宝蓝
         "#722ed1", // 深紫
         "#eb2f96", // 洋红
         "#fa8c16", // 橙色
         "#a0d911", // 酸橙绿,
-
-        "#1890ff", // 阿里蓝
-        "#40a0e0", // 天空蓝
-        "#fadb7d", // 浅黄
-        "#ffc53d", // 亮黄橙
-        "#ff85c0", // 粉红
-        "#eb647b", // 珊瑚红
-        "#52c41a", // 绿色
-        "#13a8a8", // 青绿
-        "#fa541c", // 深橙红
-        "#85a5ff", // 浅紫蓝
       ];
 
       // 创建一个对象,将每个故障类别或部件与一种颜色对应起来

+ 2 - 2
src/views/SandTable/component/ThreeModel1.vue

@@ -32,7 +32,7 @@
           "
         ></div>
       </div>
-      <div
+      <!-- <div
         class="three-html-dom build-info"
         :id="fanInfoLayer.id"
         v-show="fanInfoLayer.show"
@@ -88,7 +88,7 @@
           <div class="build-info-item-num">{{ gzsl }}</div>
           <div class="build-info-item-text">故障</div>
         </div>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>

+ 2 - 2
src/views/economicsOperation/benchmarkingManagement/intervalBenchmarking/index.vue

@@ -241,7 +241,7 @@
           :current-page="pageD.currentPage"
           :page-size="pageD.pagesize"
           @size-change="handleSizeDChange"
-          :page-sizes="[19, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="pageD.total"
         >
@@ -311,7 +311,7 @@ export default {
         total: 0,
       },
       pageD: {
-        pagesize: 19,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

+ 3 - 2
src/views/economicsOperation/benchmarkingManagement/siteBenchmarking/index.vue

@@ -1,3 +1,4 @@
+
 <template>
   <div class="parcel-box">
     <div class="form-wrapper">
@@ -258,7 +259,7 @@
           :current-page="pageD.currentPage"
           :page-size="pageD.pagesize"
           @size-change="handleSizeDChange"
-          :page-sizes="[23, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="pageD.total"
         >
@@ -737,7 +738,7 @@ export default {
         total: 0,
       },
       pageD: {
-        pagesize: 23,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },