From 5c3ce1f285e0391b2c783086ec026e51b2743aa2 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 28 Feb 2024 15:00:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/parameterSetDialog.vue         | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index 7bd6955..2d3a984 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -30,7 +30,7 @@
           >
             <el-form-item label="装置时间">
               <el-date-picker
-                v-model="deviceTimeForm.zztime"
+                v-model="devicetime"
                 type="datetime"
                 placeholder="查询日期时间"
                 value-format="timestamp"
@@ -45,7 +45,7 @@
             <el-form-item label="新装置时间">
               <!-- <el-input v-model="deviceTimeForm.newzztime"></el-input> -->
               <el-date-picker
-                v-model="deviceTimeForm.newzztime"
+                v-model="devicenewtime"
                 type="datetime"
                 placeholder="选择日期时间"
                 value-format="timestamp"
@@ -761,6 +761,8 @@ export default {
       activeName: "1",
       timeLoading: false,
       timesetLoading: false,
+      devicenewtime: "",
+      devicetime: "",
       deviceTimeForm: {
         zztime: "", //装置时间
         newzztime: "", //新装置时间
@@ -900,7 +902,14 @@ export default {
         .catch((err) => {});
     },
     handleFocus() {
-      this.deviceTimeForm.newzztime = new Date();
+      if (
+        this.devicenewtime == "" ||
+        this.devicenewtime == undefined ||
+        this.devicenewtime == null
+      ) {
+        this.devicenewtime = new Date();
+        console.log(this.devicenewtime);
+      }
     },
     //装置时间查询
     searchTime() {
@@ -931,8 +940,12 @@ export default {
     //设置装置时间： .\bin\xympadmn.exe --server=127.0.0.1 --port=6891 --act=time --cmdid=XY-SIMULATOR-0015 --flag=1 --time=20230101122322
     setTime() {
       if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
-        console.log(this.deviceTimeForm.newzztime);
-        if (this.deviceTimeForm.newzztime !== "") {
+        console.log(this.devicenewtime);
+        if (
+          this.devicenewtime !== "" &&
+          this.devicenewtime !== undefined &&
+          this.devicenewtime !== null
+        ) {
           this.timesetLoading = true;
           let params = [
             {
@@ -945,7 +958,7 @@ export default {
             },
             {
               name: "time",
-              value: this.deviceTimeForm.newzztime,
+              value: this.devicenewtime / 1000,
             },
           ];
           this.setTermFn(params);
@@ -1563,12 +1576,10 @@ export default {
             console.log(JSON.parse(res.data.data));
             //时间
             console.log(this.tabName);
-            this.deviceTimeForm = JSON.parse(res.data.data);
+            //this.devicenewtime = JSON.parse(res.data.data).timestamp * 1000;
             if (this.tabName == "装置时间") {
-              this.showLookTime = true;
-              this.deviceTimeForm.zztime = this.deviceTimeForm.timestamp * 1000;
-              console.log(this.deviceTimeForm.zztime);
-              return;
+              this.devicetime = JSON.parse(res.data.data).timestamp * 1000;
+              console.log(this.devicetime);
             }
             //采集参数
             this.samplingForm = JSON.parse(res.data.data);
@@ -1705,8 +1716,8 @@ export default {
       this.isShow = false;
       this.activeName = "1";
       this.tabsActive = "first";
-      this.deviceTimeForm = {};
       this.samplingForm = {};
+
       this.upperComputer = {};
       this.idParameter = {};
       this.gpsForm = {};

From c9a84a7eb3c19e34e23f92bc0f0089d17813cb44 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 29 Feb 2024 08:54:44 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/realTimeMonitor/components/setAppDialog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/realTimeMonitor/components/setAppDialog.vue b/src/views/realTimeMonitor/components/setAppDialog.vue
index ac8c288..64ba553 100644
--- a/src/views/realTimeMonitor/components/setAppDialog.vue
+++ b/src/views/realTimeMonitor/components/setAppDialog.vue
@@ -340,7 +340,7 @@ export default {
             { name: "type13", value: 1 },
             //productionDate 生产日期
             { name: "name14", value: "productionDate" },
-            { name: "value14", value: this.appForm.productionDate },
+            { name: "value14", value: this.appForm.productionDate / 1000 },
             { name: "type14", value: 0 },
             //心跳周期
             { name: "name15", value: "heartbeat" },
@@ -505,7 +505,7 @@ export default {
             this.appForm.model = resultContent.model; // 装置型号
             this.appForm.equipName = resultContent.equipName; // 装置名称
             this.appForm.bsManufacturer = resultContent.bsManufacturer; // 生产厂家
-            this.appForm.productionDate = resultContent.productionDate; // 生产日期
+            this.appForm.productionDate = resultContent.productionDate * 1000; // 生产日期
             this.$message({
               duration: 1500,
               showClose: true,

From c2797030dced4a178dbcacac0b3a03cf12136198 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 29 Feb 2024 14:46:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/realTimeMonitor/components/carouselChart.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue
index 295d3a3..05e1932 100644
--- a/src/views/realTimeMonitor/components/carouselChart.vue
+++ b/src/views/realTimeMonitor/components/carouselChart.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="thumb-example">
     <div class="radioBox" v-if="roleUser == 1 || roleUser == 0">
-      {{ radioPx }}
+      {{ radioPx }} <span>({{ fileSize.toFixed(2) }}M)</span>
       <!-- <span>(共{{ terminalPhoto.length }}张)</span> -->
     </div>
     <div class="topPic">
@@ -186,6 +186,7 @@ export default {
       currentPage: 0,
       srcList: [],
       radioPx: "",
+      fileSize: "",
       roleUser: "",
       localPoints: [], //线缆坐标
       flagLine: true, //线缆标识
@@ -377,6 +378,7 @@ export default {
       } else {
         this.radioPx = "";
       }
+      this.fileSize = data.fileSize / (1024 * 1024);
       this.getPointList(data);
     },
     loadImage() {

From 8ffb77634f47081d6faa84dbecda171289d22480 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 1 Mar 2024 16:03:29 +0800
Subject: [PATCH 4/4] youhua

---
 .../components/parameterSetDialog.vue         | 246 ++++++++++++++----
 1 file changed, 202 insertions(+), 44 deletions(-)

diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index 2d3a984..0dcd9aa 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -242,7 +242,32 @@
         <div class="tabsBox">
           <el-tabs v-model="tabsActive" type="card" @tab-click="idhandleClick">
             <el-tab-pane label="查询实际参数" name="first">
-              <div class="queryParam">
+              <div class="queryParam" v-if="rowData.protocol == '65284'">
+                <el-form
+                  :model="zjidParameter"
+                  label-position="right"
+                  label-width="124px"
+                >
+                  <el-form-item label="杆塔ID">
+                    <el-input
+                      v-model="zjidParameter.componentId"
+                      disabled="disabled"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      @click="idSearch"
+                      :loading="idLoading"
+                      >查询</el-button
+                    >
+                    <p class="looktime" v-if="lookTime && showLookTime">
+                      {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                    </p>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="queryParam" v-else>
                 <el-form
                   :model="idParameter"
                   label-position="right"
@@ -281,7 +306,47 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="设置参数" name="second">
-              <div class="queryParam">
+              <div class="queryParam" v-if="rowData.protocol == '65284'">
+                <el-form
+                  :model="zjidParameter"
+                  label-position="right"
+                  label-width="124px"
+                  ref="idParameterref"
+                  :rules="zjidrules"
+                >
+                  <el-form-item>
+                    <el-select
+                      v-model="zjvalue"
+                      placeholder="请选择"
+                      @change="zjchange"
+                    >
+                      <el-option
+                        v-for="item in zjoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="杆塔ID" prop="componentId" v-if="idFlag">
+                    <el-input v-model="zjidParameter.componentId"></el-input>
+                  </el-form-item>
+                  <el-form-item label="CMD_ID" prop="newCmdId" v-else>
+                    <el-input v-model="zjidParameter.newCmdId"></el-input>
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      @click="idSet"
+                      :loading="idSetLoading"
+                      >设置</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="queryParam" v-else>
                 <el-form
                   :model="idParameter"
                   label-position="right"
@@ -793,7 +858,33 @@ export default {
       },
       upperLoading: false,
       upperSetLoading: false,
-
+      //浙江id参数
+      zjvalue: 1,
+      zjoptions: [
+        {
+          value: 1,
+          label: "杆塔ID",
+        },
+        {
+          value: 2,
+          label: "CMD_ID",
+        },
+      ],
+      idFlag: true,
+      zjidParameter: {
+        newCmdId: "",
+        componentId: "",
+      },
+      zjidrules: {
+        // newCmdId: [
+        //   { required: true, message: "请输入CMD_ID", trigger: "blur" },
+        //   { validator: validCmid, trigger: "blur" },
+        // ],
+        // componentId: [
+        //   { required: true, message: "请输入杆塔ID", trigger: "blur" },
+        //   { validator: validCmid, trigger: "blur" },
+        // ],
+      },
       //id参数
       idParameter: {
         newCmdId: "",
@@ -1000,6 +1091,7 @@ export default {
     //id重置数据
     idhandleClick() {
       this.idParameter = {};
+      this.zjidParameter = {};
       this.lookTime = "";
       clearInterval(this.timer);
       this.i = 0;
@@ -1207,6 +1299,17 @@ export default {
         });
       }
     },
+    //浙江change
+    zjchange(val) {
+      console.log(val);
+      if (val == 1) {
+        console.log("杆塔id");
+        this.idFlag = true;
+      } else {
+        console.log("cmdid");
+        this.idFlag = false;
+      }
+    },
     //id参数查询
     // --act=termid [0xAC] --flag=[Request Set Flag, default is set=1, 0: request] --newcmdid=[New CMD ID] --compid=[Component Id] --orgid=[Original Id]
     idSearch() {
@@ -1225,7 +1328,7 @@ export default {
             },
             {
               name: "rf",
-              value: 2,
+              value: 1,
             },
             {
               name: "newcmdid",
@@ -1285,33 +1388,86 @@ export default {
         this.$refs.idParameterref.validate((valid) => {
           if (valid) {
             this.idSetLoading = true;
-            let params = [
-              {
-                name: "act",
-                value: "termid",
-              },
-              {
-                name: "flag",
-                value: 1,
-              },
-              {
-                name: "rf",
-                value: 255,
-              },
-              {
-                name: "newcmdid",
-                value: this.idParameter.newCmdId,
-              },
-              {
-                name: "compid",
-                value: this.idParameter.componentId,
-              },
-              {
-                name: "orgid",
-                value: this.idParameter.originalId,
-              },
-            ];
-            this.setTermFn(params);
+            if (this.rowData.protocol == 65284) {
+              if (this.zjvalue == 1) {
+                let params = [
+                  {
+                    name: "act",
+                    value: "termid",
+                  },
+                  {
+                    name: "flag",
+                    value: 1,
+                  },
+                  {
+                    name: "rf",
+                    value: 2,
+                  },
+                  // {
+                  //   name: "newcmdid",
+                  //   value: this.idParameter.newCmdId,
+                  // },
+                  {
+                    name: "compid",
+                    value: this.zjidParameter.componentId,
+                  },
+                ];
+                this.setTermFn(params);
+              } else {
+                let params = [
+                  {
+                    name: "act",
+                    value: "termid",
+                  },
+                  {
+                    name: "flag",
+                    value: 1,
+                  },
+                  {
+                    name: "rf",
+                    value: 1,
+                  },
+                  {
+                    name: "newcmdid",
+                    value: this.zjidParameter.newCmdId,
+                  },
+                  // {
+                  //   name: "compid",
+                  //   value: this.idParameter.componentId,
+                  // },
+                ];
+                this.setTermFn(params);
+              }
+            } else {
+              let params = [
+                {
+                  name: "act",
+                  value: "termid",
+                },
+                {
+                  name: "flag",
+                  value: 1,
+                },
+                {
+                  name: "rf",
+                  value: 255,
+                },
+                {
+                  name: "newcmdid",
+                  value: this.idParameter.newCmdId,
+                },
+                {
+                  name: "compid",
+                  value: this.idParameter.componentId,
+                },
+                {
+                  name: "orgid",
+                  value: this.idParameter.originalId,
+                },
+              ];
+
+              this.setTermFn(params);
+            }
           } else {
             console.log("error submit!!");
             return false;
@@ -1589,24 +1745,25 @@ export default {
             this.idParameter = JSON.parse(res.data.data);
             this.waterForm = JSON.parse(res.data.data);
             this.osdParams = JSON.parse(res.data.data);
+            this.zjidParameter = JSON.parse(res.data.data);
             if (this.osdParams.textContent == "null ") {
               console.log("我是空");
               this.osdParams.textContent = "";
             }
 
             if (this.tabName == "上位机信息") {
-              let hexArray = this.upperComputer.ip
-                .toString(16)
-                .match(/.{1,2}/g)
-                .reverse();
-              console.log(hexArray);
-              for (let j = 0; j < hexArray.length; j++) {
-                console.log(hexArray[j]);
-                console.log(parseInt(hexArray[j], 16));
-                hexArray[j] = parseInt(hexArray[j], 16);
-              }
-              console.log(hexArray);
-              this.upperComputer.ip = hexArray.join(".");
+              // let hexArray = this.upperComputer.ip
+              //   .toString(16)
+              //   .match(/.{1,2}/g)
+              //   .reverse();
+              // console.log(hexArray);
+              // for (let j = 0; j < hexArray.length; j++) {
+              //   console.log(hexArray[j]);
+              //   console.log(parseInt(hexArray[j], 16));
+              //   hexArray[j] = parseInt(hexArray[j], 16);
+              // }
+              // console.log(hexArray);
+              this.upperComputer.ip = this.upperComputer.ipStr;
               //ip地址解析结束
               console.log(this.idParameter);
             }
@@ -1717,9 +1874,10 @@ export default {
       this.activeName = "1";
       this.tabsActive = "first";
       this.samplingForm = {};
-
+      this.deviceTimeForm = {};
       this.upperComputer = {};
       this.idParameter = {};
+      this.zjidParameter = {};
       this.gpsForm = {};
       this.waterForm = {};
       this.osdParams = {};