yangjingjing hace 5 años
padre
commit
3722095e1c

+ 2 - 2
.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = 'http://101.132.105.43:8301/'
-VUE_APP_BASE_API = 'http://127.0.0.1:8301/'
+VUE_APP_BASE_API = 'http://101.132.105.43:8301/'
+#VUE_APP_BASE_API = 'http://127.0.0.1:8301/'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

+ 2 - 4
src/views/demp/monitordata/Index.vue

@@ -337,10 +337,8 @@ export default {
   },
   methods: {
     tableRowClassName(val) {
-      if (val.row.lowValue != null && val.row.highValue != null) {
-        if (val.row.dataValue < val.row.lowValue || val.row.dataValue > val.row.highValue) {
-          return 'warning-row'
-        }
+      if (val.row.status != '0') {
+        return 'warning-row'
       }
       return ''
     },

+ 1 - 1
src/views/detectdata/devicethreshold.vue

@@ -71,7 +71,7 @@
                 type="warning"
                 icon="el-icon-lock"
                 circle
-                v-show="user.roleName!='企业用户'&&scope.row.editable!='1'"
+                v-show="user.roleName!='企业用户'&&scope.row.editable=='0'"
                 @click="unlockEdit(scope.row)"
               />
               </el-tooltip>