浏览代码

弹窗关闭

“wangyihan” 1 年之前
父节点
当前提交
aa9ce6067d

+ 0 - 1
src/views/datav/LeftChartTop.vue

@@ -110,7 +110,6 @@ export default {
   methods: {
     initData() {
       alarm().then((res) => {
-        console.log(res, 444);
         this.data = res.data;
         this.switper();
       });

+ 8 - 7
src/views/datav/index.vue

@@ -224,22 +224,23 @@ export default {
           case 16:
             icon = require(`./img/sos.png`);
             break;
-
           case 17:
-            // 跌倒
             icon = require(`./img/didian.png`);
             break;
+          case 20:
+            icon = require(`./img/shebei.png`);
+            break;
+          case 21:
+            icon = require(`./img/diedao.png`);
+            break;
           case 22:
-            // 心率
             icon = require(`./img/xinlv.png`);
             break;
-          case 24:
-            icon = require(`./img/shebei.png`);
-            break;
           case 25:
-            // 围栏
             icon = require(`./img/weilan.png`);
             break;
+          default:
+            return null
         }
         // console.log("执行了");
         console.log("icon", icon);

+ 0 - 1
src/views/equBigData/equ.vue

@@ -155,7 +155,6 @@ export default {
     //轮询
     switper() {
       if (this.timer) {
-        console.log(this.timer, "1212");
         return;
       }
       let looper = (a) => {

+ 1 - 1
src/views/system/device/index.vue

@@ -110,7 +110,7 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
     <!-- 添加或修改设备列对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="设备属性">
           <el-radio-group v-model="form.deviceProper">

+ 3 - 0
src/views/system/profile/index.vue

@@ -249,6 +249,7 @@
       :visible.sync="open"
       width="1200px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row>
@@ -778,6 +779,7 @@
       :visible.sync="toSee"
       width="1200px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"
@@ -1668,6 +1670,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.toSee = false;
       this.reset();
     },
     // 表单重置