*

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -39,6 +39,7 @@
 </template>
 
 <script>
+  import store from "@/store";
 import { mapGetters } from 'vuex'
 import elementResizeDetectorMaker from "element-resize-detector"
 import TagsView from './TagsView'
@@ -108,6 +109,7 @@ export default {
         if(res.code == 200){
           setToken(res.data.accessToken)
           setTenantid(id)
+          store.commit('SET_TOKEN', res.data.token)
           location.reload();
           this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
         }

dsk-operate-ui/src/views/enterpriseManagement/programme.vue

@@ -275,7 +275,7 @@
       /** 根据角色ID查询菜单树结构 */
       getRoleMenuTreeselect(roleId) {
         return roleMenuTreeselect(roleId).then(response => {
-          this.menuOptions = response.data;
+          this.menuOptions = response.menus;
           return response;
         });
       },
@@ -390,15 +390,16 @@
         detailTenantPackage(packageId).then(response => {
           this.form = response.data;
           this.open = true;
+          console.log(res.data)
           this.$nextTick(() => {
-            roleMenu.then(res => {
-              let checkedKeys = res.data.checkedKeys
+            // roleMenu.then(res => {
+              let checkedKeys = res.data.menuIds
               checkedKeys.forEach((v) => {
                 this.$nextTick(()=>{
                   this.$refs.menu.setChecked(v, true ,false);
                 })
               })
-            });
+            // });
           });
           this.title = "修改方案";
         });

dsk-operate-ui/vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://47.104.91.229:9099/prod-api`,
-        target: `http://192.168.0.165:9098`,//施
-        // target: `http://192.168.60.6:9098`,//谭
+        // target: `http://192.168.0.165:9098`,//施
+        target: `http://192.168.60.6:9098`,//谭
         // target: `http://139.9.157.49:9099`,//测试
         changeOrigin: true,
         pathRewrite: {