From 131eeb9242d44ec8ad6e219d3c9fea5605835ac4 Mon Sep 17 00:00:00 2001
From: 13703816893 <l_cheny@foxmail.com>
Date: Wed, 28 Jun 2023 17:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E8=A3=85=E7=BD=AE--=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../photographicDevice/components/gpsSite.vue | 11 ++-
 .../components/parameterSetDialog.vue         | 71 ++++++++++++++++++-
 .../components/runStatus.vue                  | 12 ++--
 .../components/workStatus.vue                 | 17 +++--
 .../photographicDevice/index.vue              | 18 ++---
 5 files changed, 94 insertions(+), 35 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
index b8205b7..a05680e 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="setimgDialog" title="GPS位置" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog class="setimgDialog" title="GPS位置数据" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -42,12 +42,9 @@
       <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
       <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
       <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置型号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置版本号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产厂家" min-width="100" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产日期" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="出厂编号" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="半径" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="维度" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="经度" min-width="80" show-overflow-tooltip></el-table-column>
     </el-table>
     <div class="pageNation">
       <el-pagination
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
index 08a197c..eec5d94 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
@@ -223,8 +223,57 @@
           <videoCapture ref="videoCaptureref"></videoCapture>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="装置运行状态" name="7">装置运行状态</el-tab-pane>
-      <el-tab-pane label="GPS位置" name="8">GPS位置</el-tab-pane>
+      <el-tab-pane label="装置运行状态" name="7">
+        <div class="runform">
+          <el-form :model="runStatusForm" :inline="true"  label-width="150px">
+            <el-form-item label="4G信号强度">
+              <el-input v-model="runStatusForm.zztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="2G信号强度">
+              <el-input v-model="runStatusForm.newzztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="剩余运行内存">
+              <el-input v-model="runStatusForm.newzztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="剩余存储内存">
+              <el-input v-model="runStatusForm.newzztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="上次启动时间">
+              <el-input v-model="runStatusForm.newzztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="查询最新时间">
+              <el-input v-model="runStatusForm.newzztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item class="runformbtn">
+              <el-button type="primary">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="GPS位置" name="8">
+        <div class="runform">
+          <el-form :model="gpsForm" :inline="true"  label-width="150px">
+            <el-form-item label="坐标类型">
+              <el-input v-model="gpsForm.zztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="半径">
+              <el-input v-model="gpsForm.newzztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="维度">
+              <el-input v-model="gpsForm.newzztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="经度">
+              <el-input v-model="gpsForm.newzztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="查询最新时间">
+              <el-input v-model="gpsForm.newzztime" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item class="runformbtn">
+              <el-button type="primary">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-tab-pane>
       <el-tab-pane label="基本操作" name="9">
         <div class="resetDevice">
           <h3>装置复位</h3>
@@ -261,6 +310,8 @@ export default {
         zztime: "", //装置时间
         newzztime: "", //新装置时间
       },
+      runStatusForm: {},
+      gpsForm: {},
       tabsActive: "first",
       rowData: {},
     };
@@ -338,6 +389,22 @@ export default {
         width: 200px;
       }
     }
+    .runform{
+      width: 730px;
+      margin: 0 auto;
+      margin-top: 24px;
+      .runformbtn{
+        margin-top: 10px;
+        width: 100%;
+        display: flex;
+        .el-form-item__content{
+          margin: auto;
+        }
+      }
+      .el-input {
+        width: 200px;
+      }
+    }
     .queryParam {
       width: 400px;
       margin: 0 auto;
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
index 21d34b3..c28f3af 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="setimgDialog" title="运行状态" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog class="setimgDialog" title="装置运行状态" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -42,12 +42,10 @@
       <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
       <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
       <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置型号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置版本号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产厂家" min-width="100" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产日期" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="出厂编号" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="4G信号强度" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="2G信号强度" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="剩余运行内存" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="剩余存储内存" min-width="100" show-overflow-tooltip></el-table-column>
     </el-table>
     <div class="pageNation">
       <el-pagination
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
index 45470b8..ff408c6 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
@@ -42,12 +42,17 @@
       <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
       <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
       <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置型号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置版本号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产厂家" min-width="100" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产日期" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="出厂编号" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="电源电压" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="工作温度" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="电池电量" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="浮充状态" min-width="100" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.name == 0 ? '充电' : '放电'  }}</template>
+      </el-table-column>
+      <el-table-column prop="name" label="工作总时间" min-width="120" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="连续工作时间" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="name" label="网络连接状态" min-width="100" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.name == 0 ? '已连接' : '未连接'  }}</template>
+      </el-table-column>
     </el-table>
     <div class="pageNation">
       <el-pagination
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 1a2b95a..da75bc1 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -230,9 +230,10 @@
           >
           </el-table-column> -->
           <el-table-column
-            label="数据查询"
-            :show-overflow-tooltip="true"
-            width="120"
+            fixed="right"
+            label="操作"
+            width="580"
+            v-if="roleUser != 2"
           >
             <template slot-scope="scope">
               <el-dropdown
@@ -258,15 +259,6 @@
                   <el-dropdown-item command="GPS">GPS位置</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
-            </template>
-          </el-table-column>
-          <el-table-column
-            fixed="right"
-            label="操作"
-            width="580"
-            v-if="roleUser != 2"
-          >
-            <template slot-scope="scope">
               <el-button
                 @click.native.stop="handleParameterSet(scope.row)"
                 type="text"
@@ -688,7 +680,7 @@ export default {
         case "runStatus":
           this.$refs.runStatus_ref.display();
           break;
-        case "gpsSite":
+        case "GPS":
           this.$refs.gpsSite_ref.display();
           break;
         default: