From fafc902dd2615fd10b377c320ce100824ea6bb96 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 16 Apr 2024 13:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/iceApi.js                       | 20 +++++++++
 src/utils/api/index.js                        |  7 +---
 src/views/iceWeather/components/leftTree.vue  | 19 +--------
 src/views/iceWeather/weather/index.vue        | 42 ++++++++++++++-----
 .../components/imageCapture.vue               |  6 ++-
 vue.config.js                                 |  4 +-
 6 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/src/utils/api/iceApi.js b/src/utils/api/iceApi.js
index 482e890..d9d346e 100644
--- a/src/utils/api/iceApi.js
+++ b/src/utils/api/iceApi.js
@@ -1,5 +1,25 @@
 import request from "../request";
 //获取装置总数图表
+//郑州左侧树状结构接口
+export function getICEdyTreeList(data) {
+  return request({
+    url: "/xymanager/getdyTreeList",
+    method: "post",
+    data,
+  });
+}
+//气象相关的接口
+export function weatherLastJoggle(data) {
+  return request({
+    url: "/xymanager/weather/latest",
+    method: "get",
+    params: data,
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+  });
+}
+
 //获取数据接口
 export function getDataListJoggle(data) {
   return request({
diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index ddc0ec4..63e4b76 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -62,11 +62,8 @@ export function updateUserApi(data) {
 export function getdyTreeListJoggle(data) {
   return request({
     url: "/xymanager/getdyTreeList",
-    method: "get",
-    params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
+    method: "post",
+    data,
   });
 }
 //获取所有杆塔下的图片列表，实时监控
diff --git a/src/views/iceWeather/components/leftTree.vue b/src/views/iceWeather/components/leftTree.vue
index 0a0aeff..ad1afa2 100644
--- a/src/views/iceWeather/components/leftTree.vue
+++ b/src/views/iceWeather/components/leftTree.vue
@@ -76,7 +76,7 @@
   </div>
 </template>
 <script>
-import { getICEdyTreeList } from "@/utils/api/index";
+import { getICEdyTreeList } from "@/utils/api/iceApi";
 export default {
   data() {
     return {
@@ -140,22 +140,7 @@ export default {
 
       getICEdyTreeList({
         type: -1,
-        lineid: [
-          "234",
-          "238",
-          "253",
-          "242",
-          "233",
-          "231",
-          "243",
-          "235",
-          "248",
-          "230",
-          "236",
-          "239",
-          "257",
-          "255",
-        ],
+        devtype: [2, 3],
       })
         .then((res) => {
           this.lineTreeData = res.data.list;
diff --git a/src/views/iceWeather/weather/index.vue b/src/views/iceWeather/weather/index.vue
index c0da6a4..e2157cc 100644
--- a/src/views/iceWeather/weather/index.vue
+++ b/src/views/iceWeather/weather/index.vue
@@ -251,7 +251,7 @@
 </template>
 <script>
 import leftTree from "../components/leftTree";
-import { getDataListJoggle } from "@/utils/api/iceApi";
+import { getDataListJoggle, weatherLastJoggle } from "@/utils/api/iceApi";
 export default {
   name: "weather",
   components: {
@@ -327,16 +327,13 @@ export default {
       //this.getAllData(data);
     },
     getWeatherData(data) {
-      this.childFlag = false;
-      console.log(data, this.qt);
-      this.loading = true;
-      getDataListJoggle({
-        act: "meteo",
-        qt: this.qt,
-        id: this.id,
-        p: this.page,
-        ps: this.pageSize,
-        latest: 1,
+      console.log(data);
+      weatherLastJoggle({
+        dyId: 8,
+        lineId: data.lineid,
+        pageNum: this.page,
+        pageSize: this.pageSize,
+        towerId: data.towerid,
       })
         .then((res) => {
           console.log(res);
@@ -348,6 +345,29 @@ export default {
           console.log(err); //代码错误、请求失败捕获
         });
     },
+
+    // getWeatherData(data) {
+    //   this.childFlag = false;
+    //   console.log(data, this.qt);
+    //   this.loading = true;
+    //   getDataListJoggle({
+    //     act: "meteo",
+    //     qt: this.qt,
+    //     id: this.id,
+    //     p: this.page,
+    //     ps: this.pageSize,
+    //     latest: 1,
+    //   })
+    //     .then((res) => {
+    //       console.log(res);
+    //       this.tableData = res.data;
+    //       this.total = Number(res.page.totalRecords);
+    //       this.loading = false;
+    //     })
+    //     .catch((err) => {
+    //       console.log(err); //代码错误、请求失败捕获
+    //     });
+    // },
     //点击分页
     handleCurrentChange(val) {
       this.page = val;
diff --git a/src/views/photographicDevice/components/imageCapture.vue b/src/views/photographicDevice/components/imageCapture.vue
index 1fe8e86..5febbdb 100644
--- a/src/views/photographicDevice/components/imageCapture.vue
+++ b/src/views/photographicDevice/components/imageCapture.vue
@@ -721,6 +721,7 @@ export default {
           name: "",
         },
       ], //河南
+      //
       selaccess: "", //选中的通道
       capturenr: {}, //查询后的内容
       setForm: {}, //设置参数
@@ -802,6 +803,9 @@ export default {
         case 65284:
           this.ratiolist = this.zhejiangratiolist;
           break;
+        case 65290:
+          this.ratiolist = this.henanratiolist;
+          break;
       }
 
       if (val.protocol == 65281) {
@@ -809,7 +813,7 @@ export default {
         this.$set(this.setForm, "luminance", 50);
         this.$set(this.setForm, "contrast", 50);
         this.$set(this.setForm, "saturation", 50);
-      } else if (val.protocol == 65285) {
+      } else if (val.protocol == 65285 || val.protocol == 65290) {
         this.$set(this.setForm, "resolution", this.ratiolist[7].id);
         this.$set(this.setForm, "luminance", 50);
         this.$set(this.setForm, "contrast", 50);
diff --git a/vue.config.js b/vue.config.js
index 0f25e86..5bdec9f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,10 +21,10 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        target: "http://180.166.218.222:40080", //dell
+        //target: "http://180.166.218.222:40080", //dell
         //target: "http://192.168.1.190:8080", //liu 本机ip  需要去掉/Api
         //target: "http://192.168.50.7:8093", //liu 本机ip  需要去掉/Api
-        // target: "http://192.168.111.211:80", //东视
+        target: "http://192.168.111.211:80", //东视
         changOrigin: true, //是否开启跨域
         pathRewrite: {
           "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的