From 53073ea34bfca64a2dd6ef0c4f0ca43737cd20a5 Mon Sep 17 00:00:00 2001
From: admin-lmm <2497833386@QQ.com>
Date: Thu, 29 Jun 2023 17:14:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E6=A1=A9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E5=B7=B2=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/basic/components/remoteUpgrade.vue   | 88 ++++++-------------
 jsowell-ui/src/views/pile/basic/detail.vue    | 25 ++----
 jsowell-ui/vue.config.js                      |  4 +-
 3 files changed, 37 insertions(+), 80 deletions(-)

diff --git a/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue
index 45c7a3892..ae5db27bb 100644
--- a/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue
+++ b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue
@@ -3,24 +3,22 @@
     <el-button type="primary" icon="el-icon-s-tools" round @click="dialogTableVisible = true">测试远程固件升级</el-button>
     <el-dialog title="配件升级" :visible.sync="dialogTableVisible">
       <el-table
-        :data="tableData"
+        :data="firmwareList"
         border
         stripe
-        ref="tableData"
+        ref="firmwareList"
         @row-click="singleElection">
-        <el-table-column label="" width="65">
+        <el-table-column width="65">
             <template slot-scope="scope">
-                <el-radio class="radio" v-model="templateSelection" :label="scope.$index">&nbsp;</el-radio>
+                <el-radio class="radio" v-model="templateSelection" >&nbsp;</el-radio>
             </template>
         </el-table-column>
-        <el-table-column prop="id" label="ID"></el-table-column>
-        <el-table-column prop="title" label="标题"></el-table-column>
-        <el-table-column prop="priority" label="优先级"></el-table-column>
-        <el-table-column prop="state" label="状态"></el-table-column>
-        <el-table-column prop="dealingPeople" label="处理人"></el-table-column>
+        <el-table-column prop="name" label="固件名称"></el-table-column>
+        <el-table-column prop="description" label="固件描述"></el-table-column>
+        <el-table-column prop="filePath" label="路径"></el-table-column>
       </el-table>  
       <div style="margin-top: 20px">
-        <el-button type="primary">提交</el-button>
+        <el-button type="primary" @click="submit">提交</el-button>
         <el-button>取消选择</el-button>
       </div>
     </el-dialog>  
@@ -29,11 +27,13 @@
 
 <script>
 import { listFirmware } from "@/api/pile/firmware";
+import {updateFirmware} from "@/api/pile/pileRemote";
 export default {
+  props:['pileSn'],
   data() {
     return {
       templateSelection: '',
-        templateRadio: null,
+      templateRadioId: null,
       dialogTableVisible: false,
        queryParams: {
                 pageNum: 1,
@@ -41,53 +41,21 @@ export default {
                 name: null,
             },
         multipleSelection: [],
-      tableData: [
-            {
-                'id': 1,
-                'title': '嘿嘿嘿',
-                'priority': '高',
-                'state': 1,
-                'dealingPeople': '小龙女'
-                },
-            {
-                'id': 2,
-                'title': '嘻嘻嘻',
-                'priority': '中',
-                'state': 2,
-                'dealingPeople': '小龙女'
-            },
-            {
-                'id': 3,
-                'title': '哈哈哈',
-                'priority': '低',
-                'state': 3,
-                'dealingPeople': '小龙女'
-            },
-            {
-                'id': 3,
-                'title': '哈哈哈',
-                'priority': '低',
-                'state': 3,
-                'dealingPeople': '小龙女'
-            },
-            {
-                'id': 3,
-                'title': '哈哈哈',
-                'priority': '低',
-                'state': 3,
-                'dealingPeople': '小龙女'
-            },
-            {
-                'id': 3,
-                'title': '哈哈哈',
-                'priority': '低',
-                'state': 3,
-                'dealingPeople': '小龙女'
-            }
-        ]
+        firmwareList:[]
     };
   },
   methods: {
+    submit(){
+      //  console.log('接收传递的 pileSn',this.pileSn,this.templateRadioId);
+      const data = {
+        pileSns: [this.pileSn],
+        firmwareId: this.templateRadioId
+      };
+      console.log("远程升级固件:", data);
+      updateFirmware(data).then((response) => {
+        console.log("updateFirmware结果：", response);
+      });
+    },
       getList() {
             this.loading = true;
             listFirmware(this.queryParams).then(response => {
@@ -98,13 +66,13 @@ export default {
             });
         },
       singleElection (row) {
-        console.log('row',row)
-        this.templateSelection = this.tableData.indexOf(row);
-        this.templateRadio = row.id;
+        this.templateSelection = this.firmwareList.indexOf(row);
+        this.templateRadioId = row.id;
+        // console.log('this.templateRadio',this.templateRadioId)
       },
   },
-  created () {
-    this.getList()
+  created() {
+    // this.getList()
   }
 }
 </script>
diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue
index a5c5804d6..9d883ae65 100644
--- a/jsowell-ui/src/views/pile/basic/detail.vue
+++ b/jsowell-ui/src/views/pile/basic/detail.vue
@@ -213,10 +213,7 @@
         </el-row>
       </el-tab-pane>
         <el-tab-pane label="配置管理" name="second">
-            <el-button type="primary" icon="el-icon-s-tools" round @click="updateFirmware('/update.bin')">远程升级</el-button>
-
-            <el-button type="primary" icon="el-icon-s-tools" round @click="updateFirmware('/update2.bin')">远程升级2</el-button>
-            <remoteUpgrade></remoteUpgrade>
+            <remoteUpgrade :pileSn="pileSn" ref="second"></remoteUpgrade>
         </el-tab-pane>
     </el-tabs>
   </div>
@@ -232,7 +229,6 @@ import {
 import { queryConnectorListByParams } from "@/api/pile/connector";
 // 二维码组件
 import VueQr from "vue-qr";
-import {updateFirmware} from "@/api/pile/pileRemote";
 
 export default {
   components: { VueQr ,remoteUpgrade},
@@ -291,17 +287,6 @@ export default {
     setTimeout(() => {}, 300);
   },
   methods: {
-    // 远程升级固件
-    updateFirmware(filePath) {
-      const data = {
-        pileSns: [this.pileSn],
-        filePath: filePath
-      };
-      console.log("远程升级固件:", data);
-      updateFirmware(data).then((response) => {
-        console.log("updateFirmware结果：", response);
-      });
-    },
     //点击二维码事件
     qrcodeClick(row) {
       if (this.flag) {
@@ -348,8 +333,12 @@ export default {
         console.log("getPileDetailById结果：", this.pileDetail);
       });
     },
-    handleClick() {
-      console.log("handleClick");
+     handleClick(tab, event) {
+      // console.log(tab.name, event);
+      if(tab.name === 'second') {
+        this.$refs.second.getList();
+      }
+      // this.initializeData(tab.name);
     },
     // 刷新按钮重新获取数据
     refreshPileConnectorList() {
diff --git a/jsowell-ui/vue.config.js b/jsowell-ui/vue.config.js
index 91b937c42..6f2d63df2 100644
--- a/jsowell-ui/vue.config.js
+++ b/jsowell-ui/vue.config.js
@@ -35,9 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        // target: `http://localhost:8080`,
         // 更改代理为本地地址
-        // target: `http://192.168.2.3:8080`,
+        target: `http://192.168.2.3:8080`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",