From b0c93415c50517b16dc459db60f34ce176eff981 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 6 Jul 2023 13:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/baseInfor.vue                  | 21 +++++++++++++++++--
 .../photographicDevice/components/gpsSite.vue | 21 +++++++++++++++++--
 .../components/runStatus.vue                  | 21 +++++++++++++++++--
 .../components/workStatus.vue                 | 21 +++++++++++++++++--
 .../photographicDevice/index.vue              | 14 +++++++++++--
 .../userEquipment/lineInformation/index.vue   | 10 +++++++++
 src/views/system/userManagement.vue           |  6 +++---
 7 files changed, 101 insertions(+), 13 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
index 0b6a70c..2254652 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
@@ -4,7 +4,7 @@
     title="基本信息"
     :visible.sync="isShow"
     :close-on-click-modal="false"
-    width="70%"
+    width="1280px"
   >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
@@ -124,7 +124,14 @@ export default {
     return {
       isShow: false,
       formdata: {},
-      listData: [],
+      listData: [
+        {
+          name: "测试",
+        },
+        {
+          name: "测试2",
+        },
+      ],
       loading: false,
       seltermid: "", //装置id
       selcmdId: "", //cmdId
@@ -184,5 +191,15 @@ export default {
 </script>
 <style lang="less">
 .baseInforDialog {
+  .pageNation {
+    justify-content: flex-start;
+    margin-top: 16px;
+    .el-pagination {
+      padding: 0px;
+      .el-select .el-input {
+        margin-left: 0px;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
index edaedac..2c619d4 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
@@ -4,7 +4,7 @@
     title="GPS位置数据"
     :visible.sync="isShow"
     :close-on-click-modal="false"
-    width="70%"
+    width="1280px"
   >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
@@ -106,7 +106,14 @@ export default {
     return {
       isShow: false,
       formdata: {},
-      listData: [],
+      listData: [
+        {
+          name: "测试",
+        },
+        {
+          name: "测试2",
+        },
+      ],
       loading: false,
       seltermid: "", //装置id
       selcmdId: "", //cmdId
@@ -166,5 +173,15 @@ export default {
 </script>
 <style lang="less">
 .gpsSiteDialog {
+  .pageNation {
+    justify-content: flex-start;
+    margin-top: 16px;
+    .el-pagination {
+      padding: 0px;
+      .el-select .el-input {
+        margin-left: 0px;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
index bd624b9..d255d0d 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
@@ -4,7 +4,7 @@
     title="装置运行状态"
     :visible.sync="isShow"
     :close-on-click-modal="false"
-    width="70%"
+    width="1280px"
   >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
@@ -112,7 +112,14 @@ export default {
     return {
       isShow: false,
       formdata: {},
-      listData: [],
+      listData: [
+        {
+          name: "测试",
+        },
+        {
+          name: "测试2",
+        },
+      ],
       loading: false,
       seltermid: "", //装置id
       selcmdId: "", //cmdId
@@ -172,5 +179,15 @@ export default {
 </script>
 <style lang="less">
 .runStatusDialog {
+  .pageNation {
+    justify-content: flex-start;
+    margin-top: 16px;
+    .el-pagination {
+      padding: 0px;
+      .el-select .el-input {
+        margin-left: 0px;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
index 4e77be6..38474b1 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
@@ -4,7 +4,7 @@
     title="工作状态"
     :visible.sync="isShow"
     :close-on-click-modal="false"
-    width="70%"
+    width="1280px"
   >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
@@ -138,7 +138,14 @@ export default {
     return {
       isShow: false,
       formdata: {},
-      listData: [],
+      listData: [
+        {
+          name: "测试",
+        },
+        {
+          name: "测试2",
+        },
+      ],
       loading: false,
       seltermid: "", //装置id
       selcmdId: "", //cmdId
@@ -198,5 +205,15 @@ export default {
 </script>
 <style lang="less">
 .workStatus {
+  .pageNation {
+    justify-content: flex-start;
+    margin-top: 16px;
+    .el-pagination {
+      padding: 0px;
+      .el-select .el-input {
+        margin-left: 0px;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 336d6f0..0f17a58 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -106,12 +106,22 @@
             min-width="150"
           >
           </el-table-column>
+          <el-table-column
+            prop="isonline"
+            label="是否在线"
+            show-overflow-tooltip
+            fixed
+          >
+            <template slot-scope="scope">
+              {{ scope.row.isonline ? "在线" : "离线" }}</template
+            >
+          </el-table-column>
+
           <el-table-column prop="cmdid" label="SIM卡号" show-overflow-tooltip>
           </el-table-column>
           <el-table-column prop="cmdid" label="网络类型" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="cmdid" label="状态" show-overflow-tooltip>
-          </el-table-column>
+
           <el-table-column prop="cmdid" label="装置型号" show-overflow-tooltip>
           </el-table-column>
           <el-table-column prop="cmdid" label="装置厂家" show-overflow-tooltip>
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 5aa9267..43e7b14 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -48,6 +48,16 @@
             min-width="120"
           >
           </el-table-column>
+          <el-table-column
+            prop="status"
+            label="是否启用"
+            show-overflow-tooltip
+            min-width="120"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.status == 1 ? "已启用" : "未启用" }}</template
+            >
+          </el-table-column>
 
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
diff --git a/src/views/system/userManagement.vue b/src/views/system/userManagement.vue
index 7ddb683..b09fc51 100644
--- a/src/views/system/userManagement.vue
+++ b/src/views/system/userManagement.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="camerChannel">
+  <div class="usermanagement">
     <div class="deviceBox">
       <div class="deviceBtnGroup">
         <h4>用户管理</h4>
@@ -170,7 +170,7 @@ export default {
 };
 </script>
 <style lang="less">
-.camerChannel {
+.usermanagement {
   width: calc(100% - 24px);
   height: calc(100% - 24px);
   padding: 12px 12px;
@@ -178,7 +178,7 @@ export default {
 
   .deviceBox {
     border: 1px solid #dddddd;
-    height: calc(100% - 24x);
+    height: calc(100% - 24px);
     padding: 12px;
     border-radius: 4px;
   }