فهرست منبع

报警确认窗口层级BUG修复

Koishi 1 سال پیش
والد
کامیت
2934a46346
3فایلهای تغییر یافته به همراه8 افزوده شده و 15 حذف شده
  1. 1 1
      src/components/alarmPopupa/index.vue
  2. 5 12
      src/pages/safe/safecomponent.vue
  3. 2 2
      vite.config.js

+ 1 - 1
src/components/alarmPopupa/index.vue

@@ -280,7 +280,7 @@ export default {
   position: absolute;
   right: 0;
   bottom: 0;
-  z-index: 5000;
+  z-index: 1000;
   display: flex;
   flex-direction: column-reverse;
   align-items: center;

+ 5 - 12
src/pages/safe/safecomponent.vue

@@ -21,11 +21,7 @@
         width="150"
         show-overflow-tooltip
       />
-      <el-table-column
-        prop="lvName"
-        label="报警等级"
-        show-overflow-tooltip
-      />
+      <el-table-column prop="lvName" label="报警等级" show-overflow-tooltip />
       <el-table-column
         prop="alarmName"
         label="报警类型"
@@ -64,11 +60,7 @@
             width="150"
             show-overflow-tooltip
           />
-          <el-table-column
-            prop="code"
-            label="报警设备"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="code" label="报警设备" show-overflow-tooltip />
           <el-table-column
             prop="alarmName"
             label="报警类型"
@@ -103,7 +95,7 @@
           </el-table-column>
         </el-table>
       </el-card>
-      <el-button class="confirmAllBtn" type="info" plain @click="confirmAll"
+      <el-button class="confirmAllBtn" type="info" plain @click="confirmAll" :disabled="!dialogTableData.length"
         >确认所有报警</el-button
       >
     </el-dialog>
@@ -111,6 +103,7 @@
 </template>
 
 <script>
+import { confirmAlart } from "@api/api.js";
 export default {
   props: {
     title: {
@@ -301,6 +294,6 @@ export default {
 </style>
 <style lang="scss" >
 .alarmDialog {
-  z-index: 5100 !important;
+  z-index: 1100 !important;
 }
 </style>

+ 2 - 2
vite.config.js

@@ -30,8 +30,8 @@ export default defineConfig({
             // 正则表达式写法
             "^/sharding": {
                 // target: 'http://wanghs.nat300.top',
-                target: "http://10.81.3.154:6015",
-                // target: "http://192.168.1.109:6015",
+                // target: "http://10.81.3.154:6015",
+                target: "http://192.168.1.108:6015",
                 changeOrigin: true, //开启代理
                 rewrite: (path) => path.replace(/^\/sharding/, ""),
             },