From cea121f20aecf3ec67b0f36bcad9c1f31300e07c Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 18 Apr 2024 17:28: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/components/Sidebar.vue                    | 30 ++++-----
 .../components/parameterSetDialog.vue         | 61 ++++++++++++++++++-
 vue.config.js                                 |  6 +-
 3 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index e2e813a..fed3e36 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -78,21 +78,21 @@ export default {
           index: "/realTimeSearch",
           title: "历史图片",
         },
-        {
-          icon: "iconfont icon-fubing",
-          index: "/weatherIce",
-          title: "气象覆冰",
-          subs: [
-            {
-              index: "/weather",
-              title: "气象监测",
-            },
-            {
-              index: "/icing",
-              title: "覆冰监测",
-            },
-          ],
-        },
+        // {
+        //   icon: "iconfont icon-fubing",
+        //   index: "/weatherIce",
+        //   title: "气象覆冰",
+        //   subs: [
+        //     {
+        //       index: "/weather",
+        //       title: "气象监测",
+        //     },
+        //     {
+        //       index: "/icing",
+        //       title: "覆冰监测",
+        //     },
+        //   ],
+        // },
         {
           icon: "el-icon-files",
           index: "/property",
diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index 48e920b..8b8fbb4 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -53,6 +53,13 @@
                 @focus="handleFocus"
               >
               </el-date-picker>
+              <el-button
+                type="primary"
+                @click="setnowTime"
+                style="margin-left: 12px"
+                :loading="nowTimesetLoading"
+                >校时</el-button
+              >
             </el-form-item>
             <el-form-item>
               <el-button
@@ -997,6 +1004,7 @@ export default {
       isShow: false,
       activeName: "1",
       timeLoading: false,
+      nowTimesetLoading: false,
       timesetLoading: false,
       devicenewtime: "",
       devicetime: "",
@@ -1250,9 +1258,56 @@ export default {
             },
             {
               name: "time",
-              value: this.devicenewtime / 1000,
+              value: Math.round(this.devicenewtime / 1000),
+            },
+          ];
+          this.setTermFn(params);
+        } else {
+          console.log("error submit!!");
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "请填写新装置时间",
+            type: "error",
+          });
+          return false;
+        }
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "装置下线，发送指令失败",
+          type: "error",
+        });
+      }
+    },
+    //校时
+    setnowTime() {
+      if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
+        const deviceNowTime = new Date().getTime();
+        console.log(deviceNowTime);
+        this.devicenewtime = deviceNowTime;
+        if (
+          deviceNowTime !== "" &&
+          deviceNowTime !== undefined &&
+          deviceNowTime !== null
+        ) {
+          this.nowTimesetLoading = true;
+          let params = [
+            {
+              name: "act",
+              value: "time",
+            },
+            {
+              name: "flag",
+              value: 1,
+            },
+            {
+              name: "time",
+              value: Math.round(deviceNowTime / 1000),
             },
           ];
+          console.log(params);
           this.setTermFn(params);
         } else {
           console.log("error submit!!");
@@ -2018,6 +2073,7 @@ export default {
             this.i = 0;
             this.timeLoading = false;
             this.timesetLoading = false;
+            this.nowTimesetLoading = false;
             this.sampLoading = false;
             this.sampSetLoading = false;
             this.upperLoading = false;
@@ -2093,6 +2149,7 @@ export default {
             });
             this.timeLoading = false;
             this.timesetLoading = false;
+            this.nowTimesetLoading = false;
             this.sampLoading = false;
             this.sampSetLoading = false;
             this.upperLoading = false;
@@ -2230,6 +2287,8 @@ export default {
       this.tabsActive = "first";
       this.samplingForm = {};
       this.deviceTimeForm = {};
+      this.devicenewtime = "";
+      this.devicetime = "";
       this.upperComputer = {};
       this.inetComputer = {};
       this.idParameter = {};
diff --git a/vue.config.js b/vue.config.js
index 9e6977d..04fbc7d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,12 +22,12 @@ module.exports = defineConfig({
       "/api": {
         //表示拦截以/api开头的请求路径
         //target: "http://180.166.218.222:40080", //dell
-        target: "http://192.168.1.190:8080", //liu 本机ip  需要去掉/Api
+        // 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": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },