From 764e3956bf87edf4fa67c30732026fb099457ac2 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Tue, 1 Nov 2022 16:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/bg-menu.vue                  |  7 ++++--
 src/page/main/config/dict/index.vue         | 26 ++++++++++-----------
 src/page/main/develop/menu/index.vue        | 16 ++++++-------
 src/page/main/develop/menu/menu-form.vue    |  2 +-
 src/page/main/system/role/add/role_form.vue | 12 +++++-----
 src/page/main/system/role/index.vue         | 18 +++++++-------
 src/router/function.js                      |  2 +-
 7 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/components/bg-menu.vue b/src/components/bg-menu.vue
index 1f743cb..1540b80 100644
--- a/src/components/bg-menu.vue
+++ b/src/components/bg-menu.vue
@@ -8,9 +8,9 @@
   >
 
     <!-- LOGO -->
-    <router-link to="/" class="bg-logo">
+    <div @click="gotoPage" class="bg-logo">
       <img style="width:140px;height:22px;" src="../assets/imgs/img_logo.png"/>
-    </router-link>
+    </div>
 
     <!-- 菜单 -->
     <div class="main-menu" v-if="userInfo&& userInfo.system_id">
@@ -172,6 +172,9 @@ export default {
     navAction(path) {
       this.$router.push(path);
     },
+    gotoPage(){
+      window.open('/apaas/portal/ui/#/','_blank')
+    },
     changezz(item){
       this.$trace.setOptionValue('appID',item.value)
     },
diff --git a/src/page/main/config/dict/index.vue b/src/page/main/config/dict/index.vue
index d02af73..0ccd5df 100644
--- a/src/page/main/config/dict/index.vue
+++ b/src/page/main/config/dict/index.vue
@@ -278,7 +278,7 @@ const getTypeList = () => {
           getTableRows()
         }
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     }).catch((err) => {
       console.log(err)
@@ -352,7 +352,7 @@ const getTableRows = () => {
           state.tableRows[state.tableRows.length - 1].canMoveDown = false
         }
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 } // 获取表格数据
@@ -362,10 +362,10 @@ const changeUseRow = (row) => {
     .put(`/apaas/system/v5/dictionary/state?id=${row.id}&state=${row.state}`)
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.data)
+        ElMessage.success(res.data.msg)
         changePage(1)
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 } // 启用禁用
@@ -411,7 +411,7 @@ const edit_row = (row) => {
           state: state.actionRow.state
         }
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     }).catch((err) => {
       console.log(err)
@@ -441,11 +441,11 @@ const addConfirm = () => {
           .post(`/apaas/system/v5/dictionary/add`,params)
           .then((res) => {
             if (res.data.code == 200) {
-              ElMessage.success(res.data.data)
+              ElMessage.success(res.data.msg)
               state.addDialog = false
               changePage(1)
             }else {
-              ElMessage.error(res.data.data)
+              ElMessage.error(res.data.msg)
             }
           })
       }else { // 编辑
@@ -457,11 +457,11 @@ const addConfirm = () => {
           .put(`/apaas/system/v5/dictionary/update`,params)
           .then((res) => {
             if (res.data.code == 200) {
-              ElMessage.success(res.data.data)
+              ElMessage.success(res.data.msg)
               state.addDialog = false
               changePage(1)
             }else {
-              ElMessage.error(res.data.data)
+              ElMessage.error(res.data.msg)
             }
           })
       }
@@ -481,11 +481,11 @@ const deleteData = () => {
     )
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.data)
+        ElMessage.success(res.data.msg)
         state.dialogDelete = false
         changePage(1)
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 } // 确定删除
@@ -517,10 +517,10 @@ const moveRow = (row,type) => {
     .put(`/apaas/system/v5/dictionary/sort`,[...params])
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.data)
+        ElMessage.success(res.data.msg)
         changePage(1)
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
     .catch((err) => {
diff --git a/src/page/main/develop/menu/index.vue b/src/page/main/develop/menu/index.vue
index aed04f8..18d3595 100644
--- a/src/page/main/develop/menu/index.vue
+++ b/src/page/main/develop/menu/index.vue
@@ -177,7 +177,7 @@ const getMenuTree = (type) => {
         })
 
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 } // 获取菜单树
@@ -302,12 +302,12 @@ const fileAction = (val,data,parent,disabled=false) => {
       .delete(`/apaas/system/v5/menu/${data.id}`)
       .then((res) => {
         if (res.data.code == 200) {
-          ElMessage.success(res.data.data)
+          ElMessage.success(res.data.msg)
           state.selectData = null
           let type = parent ? 1 : 2 // 1--有父级  2--无父级
           getMenuTree(type)
         }else {
-          ElMessage.error(res.data.data)
+          ElMessage.error(res.data.msg)
         }
       })
   }else if (val == 4) { // 菜单上移
@@ -375,10 +375,10 @@ const changeSort = (data,nextObj) => {
     .put(`/apaas/system/v5/menu/sort`,params)
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.data)
+        ElMessage.success(res.data.msg)
         getMenuTree()
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 } // 菜单上下移
@@ -406,7 +406,7 @@ const saveMenu = (el,type) => {
               ElMessage.success(res.data.msg)
               getMenuTree()
             }else {
-              ElMessage.error(res.data.data)
+              ElMessage.error(res.data.msg)
             }
           })
         }else { // 新增
@@ -425,11 +425,11 @@ const saveMenu = (el,type) => {
           .post(`/apaas/system/v5/menu/add`,params)
           .then((res) => {
             if (res.data.code == 200) {
-              ElMessage.success(res.data.data)
+              ElMessage.success(res.data.msg)
               state.selectData = null
               getMenuTree()
             }else {
-              ElMessage.error(res.data.data)
+              ElMessage.error(res.data.msg)
             }
           })
       }
diff --git a/src/page/main/develop/menu/menu-form.vue b/src/page/main/develop/menu/menu-form.vue
index 05bc4ab..49d17e8 100644
--- a/src/page/main/develop/menu/menu-form.vue
+++ b/src/page/main/develop/menu/menu-form.vue
@@ -151,7 +151,7 @@ const getGroupList = () => {
       if (res.data.code == 200) {
         state.groupList = res.data.data || []
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     }).catch((err) => {
       console.log(err)
diff --git a/src/page/main/system/role/add/role_form.vue b/src/page/main/system/role/add/role_form.vue
index f4f0184..71853ac 100644
--- a/src/page/main/system/role/add/role_form.vue
+++ b/src/page/main/system/role/add/role_form.vue
@@ -127,7 +127,7 @@ const getMenuTree = () => {
       if (res.data.code == 200) {
         roleState.permissionData = res.data.data || []
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 } // 获取菜单数据
@@ -157,7 +157,7 @@ const getRoleDetail = () => {
         }
         console.log(roleState.formData.permission_arr)
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 } // 获取角色详情
@@ -177,10 +177,10 @@ const saveRole = () => {
           .put(`/apaas/system/v5/role/create`,params)
           .then((res) => {
             if (res.data.code == 200) {
-              ElMessage.success(res.data.data)
+              ElMessage.success(res.data.msg)
               router.push('/system/role')
             }else {
-              ElMessage.error(res.data.data)
+              ElMessage.error(res.data.msg)
             }
           })
       }else { // 编辑
@@ -189,10 +189,10 @@ const saveRole = () => {
           .post(`/apaas/system/v5/role/update`,params)
           .then((res) => {
             if (res.data.code == 200) {
-              ElMessage.success(res.data.data)
+              ElMessage.success(res.data.msg)
               router.push('/system/role')
             }else {
-              ElMessage.error(res.data.data)
+              ElMessage.error(res.data.msg)
             }
           })
       }
diff --git a/src/page/main/system/role/index.vue b/src/page/main/system/role/index.vue
index b4690ee..58c05b2 100644
--- a/src/page/main/system/role/index.vue
+++ b/src/page/main/system/role/index.vue
@@ -306,7 +306,7 @@ const getRoleRows = () => {
         state.tableRows = res.data.data || []
         state.tableTotal = res.data.total
       }else {
-        ElMessage.error(re.data.data)
+        ElMessage.error(re.data.msg)
       }
     })
 } // 获取角色列表
@@ -319,7 +319,7 @@ const getOrgList = () => {
         console.log(res.data.data)
         userState.orgList = res.data.data || []
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 } // 获取组织列表
@@ -343,10 +343,10 @@ const changeUseRow = (row) => {
     .post(`/apaas/system/v5/role/state/${row.id}/${row.state}`)
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.data)
+        ElMessage.success(res.data.msg)
         changePage(1)
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 } // 更改启用禁用状态
@@ -408,7 +408,7 @@ const getUserList = () => {
           })
         })
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 }
@@ -461,11 +461,11 @@ const distribute = () => {
     .post(`/apaas/system/v5/role/allotment/user`,params)
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.data)
+        ElMessage.success(res.data.msg)
         userState.distributeDialog = false
         changePage(1)
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
   
@@ -502,11 +502,11 @@ const deleteData = () => {
     .delete(`/apaas/system/v5/role/delete`,{data: {ids:[...ids]}})
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.data)
+        ElMessage.success(res.data.msg)
         state.delDialog = false
         changePage(1)
       }else {
-        ElMessage.error(res.data.data)
+        ElMessage.error(res.data.msg)
       }
     })
 }
diff --git a/src/router/function.js b/src/router/function.js
index f31fd44..8a68dc0 100644
--- a/src/router/function.js
+++ b/src/router/function.js
@@ -35,7 +35,7 @@ var adminMenu = [
                     menuType: 2,
                   },
                   {
-                    menuName: "服务注册说明",
+                    menuName: "服务注册预览",
                     path: "/ability-register/preview",
                     dict_group_id: "64c156e0-bfff-4bfc-a63a-56effe130a25",
                     menuType: 2,
-- 
2.26.0