From 925c468d55aa37705648d40546e686e1638707b8 Mon Sep 17 00:00:00 2001
From: admin-lmm <2497833386@QQ.com>
Date: Thu, 29 Jun 2023 16:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BA=E4=BB=B6=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/basic/components/remoteUpgrade.vue   | 114 ++++++++++++++++++
 jsowell-ui/src/views/pile/basic/detail.vue    |  23 +---
 .../pile/merchant/components/adapayMember.vue |  29 ++---
 3 files changed, 132 insertions(+), 34 deletions(-)
 create mode 100644 jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue

diff --git a/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue
new file mode 100644
index 000000000..45c7a3892
--- /dev/null
+++ b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue
@@ -0,0 +1,114 @@
+<template>
+  <div style="margin-top:10px">
+    <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"
+        border
+        stripe
+        ref="tableData"
+        @row-click="singleElection">
+        <el-table-column label="" width="65">
+            <template slot-scope="scope">
+                <el-radio class="radio" v-model="templateSelection" :label="scope.$index">&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>  
+      <div style="margin-top: 20px">
+        <el-button type="primary">提交</el-button>
+        <el-button>取消选择</el-button>
+      </div>
+    </el-dialog>  
+  </div>
+</template>
+
+<script>
+import { listFirmware } from "@/api/pile/firmware";
+export default {
+  data() {
+    return {
+      templateSelection: '',
+        templateRadio: null,
+      dialogTableVisible: false,
+       queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                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': '小龙女'
+            }
+        ]
+    };
+  },
+  methods: {
+      getList() {
+            this.loading = true;
+            listFirmware(this.queryParams).then(response => {
+              console.log('查询固件接口 firmwareList',response)
+                this.firmwareList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+      singleElection (row) {
+        console.log('row',row)
+        this.templateSelection = this.tableData.indexOf(row);
+        this.templateRadio = row.id;
+      },
+  },
+  created () {
+    this.getList()
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue
index bb73fb5e7..a5c5804d6 100644
--- a/jsowell-ui/src/views/pile/basic/detail.vue
+++ b/jsowell-ui/src/views/pile/basic/detail.vue
@@ -212,19 +212,18 @@
           </el-col>
         </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>
         </el-tab-pane>
-
     </el-tabs>
   </div>
 </template>
 
 <script>
+import remoteUpgrade from './components/remoteUpgrade.vue';
 import {
   getPileDetailById,
   getPileFeedList,
@@ -236,7 +235,7 @@ import VueQr from "vue-qr";
 import {updateFirmware} from "@/api/pile/pileRemote";
 
 export default {
-  components: { VueQr },
+  components: { VueQr ,remoteUpgrade},
   name: "pile-detail",
   dicts: ["connector_status", "connector_type", "sim_supplier", "sim_operator"],
   data() {
@@ -370,22 +369,6 @@ export default {
         this.total = response.data.total;
         this.feedListLoading = false;
       });
-      // this.feedList = [
-      //   {
-      //     time: '2016-05-02',
-      //     description: '设备上线'
-      //   },
-      //   {
-      //     time: '2016-05-01',
-      //     description: '设备离线'
-      //   },
-      //   {
-      //     time: '2016-05-01',
-      //     description: '设备离线'
-      //   }
-      // ];
-      // this.total = 3;
-      // this.loading = false;
     },
   },
   watch: {
diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index e48412728..886c7aa45 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -5,14 +5,14 @@
          </div> -->
         <el-card v-if="adapayMember == null" shadow="hover" style="margin-bottom:10px">
             <div style="margin: 12px 0" >
-                没有查询到会员基本信息，请点击按钮创建会员信息及结算账号
+                没有查询到结算账户，请点击按钮创建结算账户
                 <!-- 刷新按钮 -->
                 <el-button
                     size="medium"
                     type="primary"
                     @click="dialog = true"
                 >
-                    创建会员信息与结算账号
+                    创建结算账户
                 </el-button>
             </div>
         </el-card>
@@ -80,7 +80,7 @@
                     ></el-cascader>
                 </el-form-item>
                 <el-form-item label="统一社会信用码" prop="socialCreditCode">
-                   <el-input v-model.number="dialogForm.socialCreditCode" maxlength="18"></el-input>
+                   <el-input v-model="dialogForm.socialCreditCode" maxlength="18"></el-input>
                 </el-form-item>
                 <el-form-item label="统一社会信用证有效期" prop="socialCreditCodeExpires">
                    <el-input v-model.number="dialogForm.socialCreditCodeExpires" maxlength="8" placeholder="有效期格式为:20190909"></el-input>
@@ -200,7 +200,8 @@ export default {
         return {
             dialog:false,
             dialogForm:{
-                bankAcctType:'1'
+                bankAcctType:'1',
+                merchantId:this.merchantId
             },
             // 汇付会员
             adapayMember: '',
@@ -300,13 +301,13 @@ export default {
                         trigger: "blur",
                     }
                 ], 
-                imgList: [
-                    {
-                        required: true,
-                        message: "请上传三张照片",
-                        trigger: "change",
-                    }
-                ],
+                // imgList: [
+                //     {
+                //         required: true,
+                //         message: "请上传三张照片",
+                //         trigger: "change",
+                //     }
+                // ],
                  businessName:[{
                         required: true,
                         message: "请输入企业名称",
@@ -422,9 +423,9 @@ export default {
             console.log("图片上传成功 url：", this.imageUrl);
             // console.log("图片上传成功 res：", res);
             this.fileList.push({ url: res.url });
-            console.log('push方法', this.fileList);
-            this.dialogForm.imgList = this.fileList
-            // console.log(this.dialogForm.imgList,'this.dialogForm.imgList');
+            // console.log('push方法', this.fileList);
+            this.dialogForm.imgList = this.fileList.map(obj => obj.url)
+            console.log(this.dialogForm.imgList,'this.dialogForm.imgList');
 
         },
         handleRemove(file, fileList) {