From b06b7fddfa6fc16c42852fc2b6473ed57201296f Mon Sep 17 00:00:00 2001
From: 13703816893 <l_cheny@foxmail.com>
Date: Wed, 14 Jun 2023 16:33:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E8=A3=85=E7=BD=AE--?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E3=80=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../photographicDevice/index.vue              | 118 ++++++++++++++++--
 vue.config.js                                 |   6 +-
 2 files changed, 114 insertions(+), 10 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 9b1ac39..461e164 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -3,9 +3,51 @@
     <div class="photoBox">
       <div class="photoGraphicBtnGroup">
         <h4>拍照装置管理</h4>
-        <el-button type="primary" icon="el-icon-plus" @click="handleAddPhoto()"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" @click="handleAddPhoto()" >新增</el-button>
+      </div>
+      <div class="searchBox">
+        <el-form :inline="true" :model="formdata" class="demo-form-inline">
+          <el-form-item label="电压等级" class="dybox">
+            <el-select v-model="formdata.dyId" @change="getSearchxl">
+              <el-option
+                v-for="item in dyOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="线路名称" class="xlbox">
+            <el-select
+              v-model="formdata.lineId"
+              @change="getSearchgt"
+              filterable
+            >
+              <el-option
+                v-for="item in xlOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="杆塔名称">
+            <el-select v-model="formdata.towerId" filterable>
+              <el-option
+                v-for="item in gtOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-input v-model="formdata.searchnr" placeholder="请输入线路/杆塔/设备编号"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit">查询</el-button>
+          </el-form-item>
+        </el-form>
       </div>
       <div class="photoGraphicTable">
         <el-table
@@ -142,7 +184,7 @@
             min-width="80"
             ><template slot-scope="scope"
               >{{ scope.row.batteryCapacity }} /
-              {{ scope.row.batteryVoltage.toFixed(1) }}V</template
+              {{ scope.row.batteryVoltage.toFixed(1) == 0.0 ? 0 : scope.row.batteryVoltage.toFixed(1)}}V</template
             >
           </el-table-column>
           <el-table-column
@@ -282,6 +324,7 @@ import {
   deleteTerminalJoggle,
   resetTerminalApi,
   setTermGPSJoggle,
+  getSearchInfo
 } from "@/utils/api/index";
 import moment from "moment";
 import addPhotoDialog from "./components/addPhotoDialog.vue";
@@ -299,6 +342,15 @@ export default {
   },
   data() {
     return {
+      dyOptions: [{ id: 0, name: "全部" }], //电压数据
+      xlOptions: [{ id: 0, name: "全部" }], //线路数据
+      gtOptions: [{ id: 0, name: "全部" }], //杆塔数据
+      formdata: {
+        dyId: 0,
+        lineId: 0,
+        towerId: 0,
+        searchnr:''
+      },
       terminalTableData: [], //表格数据
       photoDialog: false, //新增弹窗
       photoDialogTitle: "", //弹窗标题
@@ -324,6 +376,41 @@ export default {
     };
   },
   methods: {
+    //获取电压信息
+    getSearchdy() {
+      getSearchInfo({ type: 1 })
+        .then((res) => {
+          this.dyOptions = this.dyOptions.concat(res.data.list);
+          this.formdata.dyId = this.dyOptions[0].id;
+          this.getSearchxl();
+        })
+        .catch((err) => {});
+    },
+    //获取线路数据
+    getSearchxl() {
+      getSearchInfo({ type: 2, id: this.formdata.dyId })
+        .then((res) => {
+          this.xlOptions = [{ id: 0, name: "全部" }];
+          this.xlOptions = this.xlOptions.concat(res.data.list);
+          this.formdata.lineId = this.xlOptions[0].id;
+          this.getSearchgt();
+        })
+        .catch((err) => {});
+    },
+    //获取杆塔数据
+    getSearchgt() {
+      getSearchInfo({ type: 3, id: this.formdata.lineId })
+        .then((res) => {
+          this.gtOptions = [{ id: 0, name: "全部" }];
+          this.gtOptions = this.gtOptions.concat(res.data.list);
+          this.formdata.towerId = this.gtOptions[0].id;
+        })
+        .catch((err) => {});
+    },
+    //查询
+    onSubmit() {
+      this.terminalList();
+    },
     ////获取拍照装置列表数据
     terminalList() {
       this.loading = true;
@@ -528,7 +615,7 @@ export default {
   },
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 .photoGraphicDevice {
   width: calc(100% - 32px);
   height: calc(100% - 32px);
@@ -539,6 +626,23 @@ export default {
     height: calc(100% - 32px);
     padding: 16px;
     border-radius: 4px;
+    .searchBox {
+      .ml10 {
+        margin-left: 10px;
+      }
+      .el-form {
+        .dybox {
+          .el-form-item__content {
+            width: 120px;
+          }
+        }
+        .xlbox {
+          .el-form-item__content {
+            width: 160px;
+          }
+        }
+      }
+    }
   }
   .photoGraphicBtnGroup {
     display: flex;
@@ -547,8 +651,8 @@ export default {
   }
 
   .photoGraphicTable {
-    margin-top: 16px;
-    height: calc(100% - 48px);
+    // margin-top: 16px;
+    height: calc(100% - 70px);
   }
   .dropgps {
     color: @color-primary;
diff --git a/vue.config.js b/vue.config.js
index 3e6b409..51f9db9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,11 +28,11 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        //target: "http://47.96.238.157:8093", //阿里云服务器环境
-        target: "http://180.166.218.222:40080", //dell
+        target: "http://47.96.238.157:8093", //阿里云服务器环境
+        // target: "http://180.166.218.222:40080", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },

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

---
 .../photographicDevice/index.vue               | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 200dc24..3f291bf 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -5,7 +5,7 @@
         <h4>拍照装置管理</h4>
         <el-button type="primary" icon="el-icon-plus" @click="handleAddPhoto()" >新增</el-button>
       </div>
-      <div class="searchBox">
+      <!-- <div class="searchBox">
         <el-form :inline="true" :model="formdata" class="demo-form-inline">
           <el-form-item label="电压等级" class="dybox">
             <el-select v-model="formdata.dyId" @change="getSearchxl">
@@ -48,7 +48,7 @@
             <el-button type="primary" @click="onSubmit">查询</el-button>
           </el-form-item>
         </el-form>
-      </div>
+      </div> -->
       <div class="photoGraphicTable">
         <el-table
           ref="multipleTable"
@@ -425,6 +425,12 @@ export default {
       gpsvalue: "1",
     };
   },
+  created() {
+    this.terminalList();
+    this.getSearchdy();
+    this.roleUser = localStorage.getItem("role");
+    console.log(this.roleUser);
+  },
   methods: {
     //获取电压信息
     getSearchdy() {
@@ -659,12 +665,7 @@ export default {
       this.pageSize = val;
       this.terminalList();
     },
-  },
-  created() {
-    this.terminalList();
-    this.roleUser = localStorage.getItem("role");
-    console.log(this.roleUser);
-  },
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -704,6 +705,7 @@ export default {
 
   .photoGraphicTable {
     // margin-top: 16px;
+    margin-top: 36px;
     height: calc(100% - 70px);
   }
   .dropgps {