From b6af649c30215242a4f10ab8c8a3e781065d82ec Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Thu, 9 Jun 2022 17:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E4=BB=B6=E6=B7=BB=E5=8A=A0=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/iot/firmware/index.vue          | 19 ++++++++++++++++--
 vue/src/views/iot/product/product-app.vue     | 11 +++++++---
 vue/src/views/iot/product/product-edit.vue    | 20 ++++++++++++++++---
 .../iot/product/product-things-model.vue      |  4 ++--
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/vue/src/views/iot/firmware/index.vue b/vue/src/views/iot/firmware/index.vue
index dd319d9f..1d936aa3 100644
--- a/vue/src/views/iot/firmware/index.vue
+++ b/vue/src/views/iot/firmware/index.vue
@@ -21,11 +21,15 @@
     <el-card style="padding-bottom:100px;">
         <el-table v-loading="loading" :data="firmwareList" @selection-change="handleSelectionChange">
             <el-table-column label="固件名称" align="center" prop="firmwareName" />
-            <el-table-column label="产品名称" align="center" prop="productName" />
+            <el-table-column label="产品名称" align="center" prop="productName">
+                <template slot-scope="scope">
+                    <el-link :underline="false" type="primary" @click="handleViewProduct(scope.row.productId)">{{scope.row.productName}}</el-link>
+                </template>
+            </el-table-column>
 
             <el-table-column label="下载地址" align="center" prop="filePath" width="400">
                 <template slot-scope="scope">
-                    <el-link :href="getDownloadUrl(scope.row.filePath)" :underline="false" type="primary">{{getDownloadUrl(scope.row.filePath)}}</el-link>
+                    <el-link :href="getDownloadUrl(scope.row.filePath)" :underline="false" type="success">{{getDownloadUrl(scope.row.filePath)}}</el-link>
                 </template>
             </el-table-column>
             <el-table-column label="固件版本" align="center" prop="version">
@@ -186,6 +190,17 @@ export default {
         this.getProductShortList();
     },
     methods: {
+        /** 查看产品按钮操作 */
+        handleViewProduct(productId) {
+            this.$router.push({
+                path: '/iot/product-edit',
+                query: {
+                    t: Date.now(),
+                    productId: productId,
+                }
+            });
+        },
+        // 获取下载路径前缀
         getDownloadUrl(path) {
             return window.location.origin + process.env.VUE_APP_BASE_API + path;
         },
diff --git a/vue/src/views/iot/product/product-app.vue b/vue/src/views/iot/product/product-app.vue
index dd2a1996..7e6d958a 100644
--- a/vue/src/views/iot/product/product-app.vue
+++ b/vue/src/views/iot/product/product-app.vue
@@ -2,7 +2,12 @@
 <div style="padding-left:20px;">
     <el-row :gutter="10">
         <el-col :span="14">
-            <el-tag type="danger" style="margin-left:15px;">该功能暂不可用,后面版本发布</el-tag>
+            <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                    <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button>
+                </el-col>
+                <el-tag type="danger" style="margin-left:15px;">该功能暂不可用,后面版本发布</el-tag>
+            </el-row>
             <el-table v-loading="loading" :data="modelList" border style="margin-bottom:60px;margin-top:20px;" size="small">
                 <el-table-column label="名称" align="center" prop="modelName" />
                 <el-table-column label="标识符" align="center" prop="identifier" />
@@ -71,7 +76,7 @@ export default {
             },
             form: {},
             // 产品
-            productInfo:{},
+            productInfo: {},
         };
     },
     watch: {
@@ -121,4 +126,4 @@ export default {
     background: linear-gradient(303deg, #b2e9fc 50%, #b5c4f8 50%);
 
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/vue/src/views/iot/product/product-edit.vue b/vue/src/views/iot/product/product-edit.vue
index 143e03ba..90fbf290 100644
--- a/vue/src/views/iot/product/product-edit.vue
+++ b/vue/src/views/iot/product/product-edit.vue
@@ -190,11 +190,25 @@ export default {
         if (this.form.productId != 0) {
             this.getProduct();
         }
-        this.init();
+        // 获取分类信息
+        this.getShortCategory();
+    },
+    activated() {
+        const time = this.$route.query.t;
+        if (time != null && time != this.uniqueId) {
+            this.uniqueId = time;
+            // 获取产品信息
+            let productId = this.$route.query.productId
+            if (productId != null && productId!=0) {
+                this.form.productId = Number(productId);
+                this.getProduct();
+                this.getShortCategory();
+            }
+        }
     },
     methods: {
-        init() {
-            // 获取简短分类列表
+        // 获取简短分类列表
+        getShortCategory() {
             listShortCategory().then(response => {
                 this.categoryShortList = response.data;
             })
diff --git a/vue/src/views/iot/product/product-things-model.vue b/vue/src/views/iot/product/product-things-model.vue
index baa6ecb4..e4582063 100644
--- a/vue/src/views/iot/product/product-things-model.vue
+++ b/vue/src/views/iot/product/product-things-model.vue
@@ -5,10 +5,10 @@
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-if="productInfo.status==1">新增</el-button>
         </el-col>
         <el-col :span="1.5">
-            <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button>
+            <el-button type="success" plain icon="el-icon-upload2" size="mini" @click="handleSelect" v-if="productInfo.status==1">导入通用物模型</el-button>
         </el-col>
         <el-col :span="1.5">
-            <el-button type="success" plain icon="el-icon-upload2" size="mini" @click="handleSelect" v-if="productInfo.status==1">导入通用物模型</el-button>
+            <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button>
         </el-col>
         <el-col :span="1.5">
             <el-button type="info" plain icon="el-icon-view" size="mini" @click="handleOpenThingsModel">查看物模型</el-button>