Просмотр исходного кода

校正周界防范status对应意义,下线状态修改不可点击

wangtao 3 лет назад
Родитель
Сommit
262fc91349

+ 0 - 29
.history/public/static/config_20220701170121.js

@@ -1,29 +0,0 @@
-/*
- * @Author: wt 1241351815@qq.com
- * @Date: 2022-04-25 10:21:18
- * @LastEditors: wt 1241351815@qq.com
- * @LastEditTime: 2022-05-13 15:02:51
- * @FilePath: \securityHtml\public\static\config.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-
-// api 请求路径
-var PLATFROM_CONFIG = {};
-//PLATFROM_CONFIG.baseUrl = "https://smartpark.caih.com/spapi"
-//PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/af"
-
-PLATFROM_CONFIG.baseUrl = "http://101.133.214.75:81/af"
-    //PLATFROM_CONFIG.baseUrl = "http://172.16.120.213:8082"
-    // PLATFROM_CONFIG.baseUrl = "http://localhost:8082"
-    //PLATFROM_CONFIG.baseUrl = "http://10.21.39.1:8082" //生产
-    //alarming WEBSOCKET
-let userInfo = window.localStorage.getItem("key");
-var PLATFROM_WEBSOCKET = {};
-PLATFROM_WEBSOCKET.wsUrl = `ws://10.21.39.1:8080/afws/uskyWS?${userInfo}`
-    // PLATFROM_WEBSOCKET.wsUrl = `ws://172.16.120.246:8081/uskyWS?${userInfo}`
-
-
-//iframe 请求路径
-//http://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9 初始路径http://172.16.120.246:9000/
-var PLATFROM_IFRAME = {};
-PLATFROM_IFRAME.iframeUrl = `https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9`

+ 0 - 29
.history/public/static/config_20220701170126.js

@@ -1,29 +0,0 @@
-/*
- * @Author: wt 1241351815@qq.com
- * @Date: 2022-04-25 10:21:18
- * @LastEditors: wt 1241351815@qq.com
- * @LastEditTime: 2022-05-13 15:02:51
- * @FilePath: \securityHtml\public\static\config.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-
-// api 请求路径
-var PLATFROM_CONFIG = {};
-//PLATFROM_CONFIG.baseUrl = "https://smartpark.caih.com/spapi"
-//PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/af"
-
-PLATFROM_CONFIG.baseUrl = "http://101.133.214.75:81/af"
-    //PLATFROM_CONFIG.baseUrl = "http://172.16.120.213:8082"
-    // PLATFROM_CONFIG.baseUrl = "http://localhost:8082"
-    //PLATFROM_CONFIG.baseUrl = "http://10.21.39.1:8082" //生产
-    //alarming WEBSOCKET
-let userInfo = window.localStorage.getItem("key");
-var PLATFROM_WEBSOCKET = {};
-PLATFROM_WEBSOCKET.wsUrl = `ws://10.21.39.1:8080/afws/uskyWS?${userInfo}`
-    // PLATFROM_WEBSOCKET.wsUrl = `ws://172.16.120.246:8081/uskyWS?${userInfo}`
-
-
-//iframe 请求路径
-//http://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9 初始路径http://172.16.120.246:9000/
-var PLATFROM_IFRAME = {};
-PLATFROM_IFRAME.iframeUrl = `https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9`

+ 0 - 29
.history/public/static/config_20220701170128.js

@@ -1,29 +0,0 @@
-/*
- * @Author: wt 1241351815@qq.com
- * @Date: 2022-04-25 10:21:18
- * @LastEditors: wt 1241351815@qq.com
- * @LastEditTime: 2022-05-13 15:02:51
- * @FilePath: \securityHtml\public\static\config.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-
-// api 请求路径
-var PLATFROM_CONFIG = {};
-//PLATFROM_CONFIG.baseUrl = "https://smartpark.caih.com/spapi"
-//PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/af"
-
-PLATFROM_CONFIG.baseUrl = "http://101.133.214.75:81/af"
-    //PLATFROM_CONFIG.baseUrl = "http://172.16.120.213:8082"
-    // PLATFROM_CONFIG.baseUrl = "http://localhost:8082"
-    //PLATFROM_CONFIG.baseUrl = "http://10.21.39.1:8082" //生产
-    //alarming WEBSOCKET
-let userInfo = window.localStorage.getItem("key");
-var PLATFROM_WEBSOCKET = {};
-PLATFROM_WEBSOCKET.wsUrl = `ws://10.21.39.1:8080/afws/uskyWS?${userInfo}`
-    // PLATFROM_WEBSOCKET.wsUrl = `ws://172.16.120.246:8081/uskyWS?${userInfo}`
-
-
-//iframe 请求路径
-//http://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9 初始路径http://172.16.120.246:9000/
-var PLATFROM_IFRAME = {};
-PLATFROM_IFRAME.iframeUrl = `https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9`

+ 1 - 1
public/static/config.js

@@ -25,4 +25,4 @@ PLATFROM_WEBSOCKET.wsUrl = `ws://10.21.39.1:8080/afws/uskyWS?${userInfo}`
 //iframe 请求路径
 //http://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9 初始路径http://172.16.120.246:9000/
 var PLATFROM_IFRAME = {};
-PLATFROM_IFRAME.iframeUrl = `https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9`
+PLATFROM_IFRAME.iframeUrl = `https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9`

+ 17 - 19
src/views/device/guard/index.vue

@@ -96,7 +96,7 @@
       <el-table-column label="防区名称" align="center" prop="dkZoneName"  show-overflow-tooltip />
       <el-table-column label="设备状态" align="center" prop="status"  show-overflow-tooltip >
         <template slot-scope="scope">
-          <span  :class="scope.row.status == '0' ? 'success' : scope.row.status == '1' ? 'warning' : 'danger' ">{{scope.row.status == "0" ? "启用" : scope.row.status == "1" ? "停用" : "报废"}}</span>
+          <span  :class="scope.row.status == '1' ? 'success' : scope.row.status == '1' ? 'warning' : 'danger' ">{{scope.row.status == "1" ? "在线" : "下线"}}</span>
         </template>
       </el-table-column>
       <el-table-column label="设防状态" align="center" prop="dkAreaStatus"  show-overflow-tooltip >
@@ -107,10 +107,12 @@
       <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
       <el-table-column label="操作" width="150" fixed="right" >
         <template slot-scope="scope">
+
           <el-button
             icon="el-icon-edit"
             style="color: #406ce5"
             @click="handleUpdate(scope.row)"
+            disabled="scope.row.status != '1'"
             >编辑</el-button
           >
           <el-button
@@ -162,7 +164,7 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="12" >
+          <!-- <el-col :span="12" >
             <el-form-item label="设备状态" prop="status">
               <el-select v-model="form.status"  size="small" placeholder="请选择设备状态">
                 <el-option
@@ -173,7 +175,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12" >
             <el-form-item label="设防状态" prop="dkAreaStatus">
               <el-select v-model="form.dkAreaStatus"  size="small" placeholder="请选择设防状态">
@@ -221,7 +223,7 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="12" >
+          <!-- <el-col :span="12" >
             <el-form-item label="设备状态" prop="status">
               <el-select v-model="form.status"  size="small" placeholder="请选择设备状态">
                 <el-option
@@ -232,7 +234,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12" >
             <el-form-item label="设防状态" prop="dkAreaStatus">
               <el-select v-model="form.dkAreaStatus"  size="small" placeholder="请选择设防状态">
@@ -267,20 +269,16 @@ export default {
   data() {
     return {
       // 状态数据字典
-      deviceStatus: [
-        {
-          dictLabel: "启用",
-          dictValue: 0,
-        },
-        {
-          dictLabel: "停用",
-          dictValue: 1,
-        },
-        {
-          dictLabel: "报废",
-          dictValue: 2,
-        },
-      ],
+      // deviceStatus: [
+      //   {
+      //     dictLabel: "在线",
+      //     dictValue: 1,
+      //   },
+      //   {
+      //     dictLabel: "下线",
+      //     dictValue: 0,
+      //   }
+      // ],
       defenseStatus:[
         {
           dictLabel: "设防",