From 708f93dc2874d599125c1f13c008920460d36a8b Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 16 Mar 2023 10:15:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E6=96=B0=E5=A2=9E=E4=B8=8A=E4=BC=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/DashBoard/index.vue              |  1 -
 .../device/Product/Detail/BasicInfo/indev.vue     | 10 +++++++++-
 src/views/device/Product/Detail/index.vue         |  3 +--
 src/views/device/Product/DialogTips/index.vue     | 15 ++++++---------
 src/views/device/Product/Save/index.vue           |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index 122e5f4e..a4001a96 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -228,7 +228,6 @@ const getOnline = () => {
             onlineYdata.reverse();
             setOnlineChartOpition(x, onlineYdata);
             onlineFooter.value[0].value = y?.[1];
-            console.log(res.result);
         }
     });
 };
diff --git a/src/views/device/Product/Detail/BasicInfo/indev.vue b/src/views/device/Product/Detail/BasicInfo/indev.vue
index ed0a99af..5d0fbd22 100644
--- a/src/views/device/Product/Detail/BasicInfo/indev.vue
+++ b/src/views/device/Product/Detail/BasicInfo/indev.vue
@@ -41,19 +41,21 @@
         </j-descriptions>
     </j-card>
     <!-- 编辑 -->
-    <Save ref="saveRef" :isAdd="isAdd" :title="title" />
+    <Save ref="saveRef" :isAdd="isAdd" :title="title"  @success="refresh"/>
 </template>
 
 <script lang="ts" setup>
 import { useProductStore } from '@/store/product';
 import Save from '../../Save/index.vue';
 import moment from 'moment';
+import { useRoute } from 'vue-router';
 import {
     EditOutlined,
     DeleteOutlined,
     PlusOutlined,
 } from '@ant-design/icons-vue';
 const productStore = useProductStore();
+const route = useRoute();
 const saveRef = ref();
 const isAdd = ref(2);
 const title = ref('编辑');
@@ -69,4 +71,10 @@ const editConfig = () => {
 const changeTables = () => {
     productStore.tabActiveKey = 'Device';
 };
+/**
+ * 修改成功刷新
+ */
+const refresh = () =>{
+    productStore.refresh(route.params.id as string);
+}
 </script>
diff --git a/src/views/device/Product/Detail/index.vue b/src/views/device/Product/Detail/index.vue
index 5101ef4f..ac561b62 100644
--- a/src/views/device/Product/Detail/index.vue
+++ b/src/views/device/Product/Detail/index.vue
@@ -151,7 +151,6 @@ watch(
     () => route.params.id,
     (newId) => {
         if (newId) {
-            console.log(newId);
             productStore.tabActiveKey = 'Info';
             productStore.refresh(newId as string);
         }
@@ -230,7 +229,7 @@ const getProtocol = async () => {
  * 详情页跳转到设备页
  */
 const jumpDevice = () => {
-    console.log(productStore.current?.id);
+    // console.log(productStore.current?.id);
     const searchParams = {
         column: 'productId',
         termType: 'eq',
diff --git a/src/views/device/Product/DialogTips/index.vue b/src/views/device/Product/DialogTips/index.vue
index 72928eb9..afa3fb44 100644
--- a/src/views/device/Product/DialogTips/index.vue
+++ b/src/views/device/Product/DialogTips/index.vue
@@ -22,8 +22,8 @@
                 <div class="product-title">产品创建成功</div>
             </div>
             <div style="display: flex">
-                <div class="product-id">产品ID: {{ idValue.value }}</div>
-                <div class="product-btn" @click="showDetail">查看详情</div>
+                <div class="product-id">产品ID: {{ idValue }}</div>
+                <div class="product-btn" @click="showDetail" style="cursor: pointer;">查看详情</div>
             </div>
             <div>接下来推荐操作:</div>
             <div class="product-main">1、配置产品接入方式</div>
@@ -49,10 +49,12 @@
 import { getImage } from '@/utils/comm.ts';
 import { useProductStore } from '@/store/product';
 import { CheckCircleOutlined } from '@ant-design/icons-vue';
+import { useMenuStore } from '@/store/menu';
 const visible = ref<boolean>(false);
 const productStore = useProductStore();
 const router = useRouter();
 const idValue = ref({});
+const menuStore = useMenuStore();
 /**
  * 弹窗关闭
  */
@@ -70,17 +72,12 @@ const show = (id: string) => {
  * 查看详情
  */
 const showDetail = () => {
-    jump(idValue.value);
-};
-/**
- * 跳转页面
- */
-const jump = (id: string) => {
-    router.push('/iot/device/product/detail/' + id);
+    menuStore.jumpPage('device/Product/Detail',{id:idValue.value})
 };
 defineExpose({
     show: show,
 });
+
 </script>
 <style lang="less" scoped>
 .product-tips {
diff --git a/src/views/device/Product/Save/index.vue b/src/views/device/Product/Save/index.vue
index 69b5d9af..fb35ffc1 100644
--- a/src/views/device/Product/Save/index.vue
+++ b/src/views/device/Product/Save/index.vue
@@ -395,7 +395,7 @@ const submitData = () => {
                     message.success('保存成功！');
                     visible.value = false;
                     emit('success');
-                    dialogRef.value.show(form.id);
+                    dialogRef.value.show(res.result.id);
                 } else {
                     message.error('操作失败');
                 }