module-menu-vue 0.3.11 → 0.3.13

package/src/components/Util/axios.js

@@ -1,90 +1,90 @@
-import axios from 'axios';
-import getStore from './userInfo';
-import { checkToken } from './permessionUtils';
-let tokenValue = 'ba8db130f3334ae5b432b1398e0c1b1d';
-axios.interceptors.response.use(
-  (response) => {
-    if (response.status === 200) {
-      return response;
-    } else if (response.data.code === 401 || response.status === 401 || response.status === 302 || response.status === 403) {
-      console.log('response env: ', process.env.NODE_ENV)
-      if (process.env.NODE_ENV === 'production') {
-        tokenValue = getStore({ name: 'access_token' });
-      }
-      checkToken(tokenValue);
-    } else {
-      console.log('接口异常 response');
-      return Promise.reject('error');
-    }
-  },
-  (error) => {
-    console.log('error', error)
-    if (error.response) {
-      if (error.response.status === 401) {
-        console.log('response error env: ', process.env.NODE_ENV)
-        if (process.env.NODE_ENV === 'production') {
-          tokenValue = getStore({ name: 'access_token' });
-        }
-        checkToken(tokenValue);
-      } else if (error.response.status === 403) {
-        // 提示无权限等
-      } else {
-        // 其他错误处理
-      }
-    }
-    console.log('=========', JSON.stringify(error))
-    return Promise.reject(error.response);
-  },
-);
-
-/** 全局请求拦截器 */
-axios.interceptors.request.use(
-  async (params) => {
-    // 多种环境，对接门户时，需要在请求头中设置token等信息
-    const environmentList = ['production', 'development', 'test']
-    console.log('request env: ', process.env.NODE_ENV)
-    if (environmentList.includes(process.env.NODE_ENV)) {
-      console.log('环境进来了。。。')
-      const TENANT_ID = getStore({ name: 'tenantId' }) || '1';
-      const isToken = (params.headers || {}).isToken === false;
-      const token = getStore({ name: 'access_token' });
-      console.log('token', token)
-      console.log('isToken', isToken)
-      console.log('TENANT_ID', TENANT_ID)
-      if (token && !isToken) {
-        params.headers['Authorization'] = `Bearer ${token}`;
-      }
-      if (TENANT_ID) {
-        params.headers["TENANT-ID"] = TENANT_ID; // 租户ID
-      }
-      return params;
-    }
-    params.headers['Authorization'] = `Bearer ${tokenValue}`;
-    params.headers['TENANT-ID'] = '1';
-    console.log('params', JSON.stringify(params))
-    return params;
-  },
-  function (error) {
-    // 对请求错误做些什么
-    return Promise.reject(error);
-  },
-);
-
-function Axios(url, method) {
-  return new Promise((resolve, reject) => {
-      axios({
-        method: method,
-        url: url,
-      })
-      .then((res) => {
-        console.log('res', res)
-        resolve(res);
-      })
-      .catch((err) => {
-        console.log('err', err)
-        reject(err);
-      });
-  })
-}
-
+import axios from 'axios';
+import getStore from './userInfo';
+import { checkToken } from './permessionUtils';
+let tokenValue = 'ff1d727b433e4c2daf77c3e3f0190016';
+axios.interceptors.response.use(
+  (response) => {
+    if (response.status === 200) {
+      return response;
+    } else if (response.data.code === 401 || response.status === 401 || response.status === 302 || response.status === 403) {
+      console.log('response env: ', process.env.NODE_ENV)
+      if (process.env.NODE_ENV === 'production') {
+        tokenValue = getStore({ name: 'access_token' });
+      }
+      checkToken(tokenValue);
+    } else {
+      console.log('接口异常 response');
+      return Promise.reject('error');
+    }
+  },
+  (error) => {
+    console.log('error', error)
+    if (error.response) {
+      if (error.response.status === 401) {
+        console.log('response error env: ', process.env.NODE_ENV)
+        if (process.env.NODE_ENV === 'production') {
+          tokenValue = getStore({ name: 'access_token' });
+        }
+        checkToken(tokenValue);
+      } else if (error.response.status === 403) {
+        // 提示无权限等
+      } else {
+        // 其他错误处理
+      }
+    }
+    console.log('=========', JSON.stringify(error))
+    return Promise.reject(error.response);
+  },
+);
+
+/** 全局请求拦截器 */
+axios.interceptors.request.use(
+  async (params) => {
+    // 多种环境，对接门户时，需要在请求头中设置token等信息
+    const environmentList = ['production', 'development', 'test']
+    console.log('request env: ', process.env.NODE_ENV)
+    if (environmentList.includes(process.env.NODE_ENV)) {
+      console.log('环境进来了。。。')
+      const TENANT_ID = getStore({ name: 'tenantId' }) || '1';
+      const isToken = (params.headers || {}).isToken === false;
+      const token = getStore({ name: 'access_token' });
+      console.log('token', token)
+      console.log('isToken', isToken)
+      console.log('TENANT_ID', TENANT_ID)
+      if (token && !isToken) {
+        params.headers['Authorization'] = `Bearer ${token}`;
+      }
+      if (TENANT_ID) {
+        params.headers["TENANT-ID"] = TENANT_ID; // 租户ID
+      }
+      return params;
+    }
+    params.headers['Authorization'] = `Bearer ${tokenValue}`;
+    params.headers['TENANT-ID'] = '1';
+    console.log('params', JSON.stringify(params))
+    return params;
+  },
+  function (error) {
+    // 对请求错误做些什么
+    return Promise.reject(error);
+  },
+);
+
+function Axios(url, method) {
+  return new Promise((resolve, reject) => {
+      axios({
+        method: method,
+        url: url,
+      })
+      .then((res) => {
+        console.log('res', res)
+        resolve(res);
+      })
+      .catch((err) => {
+        console.log('err', err)
+        reject(err);
+      });
+  })
+}
+
 export default Axios;

package/src/components/Util/config.js

@@ -1,14 +1,14 @@
-const address = location.hostname
-const port = location.port
-const baseCof = 
-process.env.NODE_ENV === 'production' ? 
-{
-    baseSever: `https://${address}:${port}`,
-    basePath: `/app/cmcc/data`,
-}
-:
-{
-    baseSever: location.origin,
-    basePath: '/cmcc/data',
-};                                                                                                                                                     
+const address = location.hostname
+const port = location.port
+const baseCof = 
+process.env.NODE_ENV === 'production' ? 
+{
+    baseSever: `https://${address}:${port}`,
+    basePath: `/app/cmcc/data`,
+}
+:
+{
+    baseSever: location.origin,
+    basePath: '/cmcc/data',
+};                                                                                                                                                     
 export default baseCof;

package/src/components/Util/permessionUtils.js

@@ -1,47 +1,47 @@
-import Axios from './axios';
-const localStorageToken = localStorage.getItem('ACCESS_TOKEN')
-const stash = sessionStorage.getItem('stash')
-const DEFAULT_LOGOUT_URL = localStorageToken ? '/admin-ui/login' : stash === 'GZW' ? '/data-platform/#/login' : stash === 'PANWEI' ? '/bigdata-portal/#/login' : '/#/login'
-import { integrationLogout } from '../User/service.js'
-// 校验token是否失效
-export const checkToken = async (token) => {
-  if (localStorageToken) {
-    await integrationLogout()
-    this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
-        localStorage.clear();
-        sessionStorage.clear();
-        getLoginUrl()
-          .then((res) => {
-            if (res && res.data && res.data.data && res.data.data.loginoutUrl) {
-              console.log('Login URL found:', res.data.data.loginoutUrl);
-              window.location.replace(res.data.data.loginoutUrl);
-            } else {
-              console.log('No login URL found, redirect to default login page.');
-              window.location.replace('/admin-ui/login');
-            }
-          })
-          .catch((e) => {
-            console.log('GetLoginUrl error: ', e);
-            window.location.replace('/admin-ui/login');
-          });
-    }});
-  } else {
-    const url = stash === 'GZW' ? `/data-platform/auth/oauth/check_token?token=${token}` : `/auth/oauth/check_token?token=${token}`
-    Axios(url, 'get')
-      .then().catch(() =>{
-        this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
-            localStorage.clear();
-            sessionStorage.clear();
-            location.href = DEFAULT_LOGOUT_URL;
-        }});
-    })
-  }
-}
-
-// 获取登录地址信息
-export function getLoginUrl() {
-  return Axios(
-    '/admin-api/system/auth/getCodeUrl',
-    'get',
-  )
+import Axios from './axios';
+const localStorageToken = localStorage.getItem('ACCESS_TOKEN')
+const stash = sessionStorage.getItem('stash')
+const DEFAULT_LOGOUT_URL = localStorageToken ? '/admin-ui/login' : stash === 'GZW' ? '/data-platform/#/login' : stash === 'PANWEI' ? '/bigdata-portal/#/login' : '/#/login'
+import { integrationLogout } from '../User/service.js'
+// 校验token是否失效
+export const checkToken = async (token) => {
+  if (localStorageToken) {
+    await integrationLogout()
+    this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+        localStorage.clear();
+        sessionStorage.clear();
+        getLoginUrl()
+          .then((res) => {
+            if (res && res.data && res.data.data && res.data.data.loginoutUrl) {
+              console.log('Login URL found:', res.data.data.loginoutUrl);
+              window.location.href = res.data.data.loginoutUrl;
+            } else {
+              console.log('No login URL found, redirect to default login page.');
+              window.location.href = res.data.data.loginoutUrl;
+            }
+          })
+          .catch((e) => {
+            console.log('GetLoginUrl error: ', e);
+            window.location.href = '/admin-ui/login';
+          });
+    }});
+  } else {
+    const url = stash === 'GZW' ? `/data-platform/auth/oauth/check_token?token=${token}` : `/auth/oauth/check_token?token=${token}`
+    Axios(url, 'get')
+      .then().catch(() =>{
+        this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+            localStorage.clear();
+            sessionStorage.clear();
+            location.href = DEFAULT_LOGOUT_URL;
+        }});
+    })
+  }
+}
+
+// 获取登录地址信息
+export function getLoginUrl() {
+  return Axios(
+    '/admin-api/system/auth/getCodeUrl',
+    'get',
+  )
 }

package/src/components/Util/userInfo.js

@@ -1,97 +1,97 @@
-/**
-* 获取认证相关的localStorage/SessionStorage
-*/
-function getStore(params) {
-    let { name, debug } = params;
-    // 使用 ACCESS_TOKEN 判断是否是一体化
-    const token = localStorage.getItem('ACCESS_TOKEN')
-    if (token) {
-        let storageStr = '';
-        if (name === 'access_token') {
-            storageStr = localStorage.getItem('ACCESS_TOKEN');
-        } else if (name === 'tenantId') {
-            // 暂定当前租户 curTenantId
-            storageStr = localStorage.getItem('curTenantId');
-        } else if (name === 'userName') {
-            // 获取当前登录用户名称
-            storageStr = localStorage.getItem('userName');
-        } else if (name === 'userId') {
-            // 获取当前登录用户Id
-            storageStr = localStorage.getItem('userId');
-        }
-        return storageStr;
-    } else {
-        const keyName = 'bigdata-';
-        name = keyName + name;
-        let obj = {};
-        let content;
-        obj = sessionStorage.getItem(name);
-        if (!obj || Object.keys(obj).length === 0) obj = localStorage.getItem(name);
-        if (!obj || Object.keys(obj).length === 0) return '';
-        try {
-            obj = JSON.parse(obj);
-        } catch (e) {
-            return '';
-        }
-        if (debug) {
-            return '';
-        }
-        if (obj.dataType === 'string') {
-            content = obj.content;
-        } else if (obj.dataType === 'number') {
-            content = Number(obj.content);
-        } else if (obj.dataType === 'boolean') {
-            // eslint-disable-next-line no-eval
-            content = eval(obj.content);
-        } else if (obj.dataType === 'object') {
-            content = obj.content;
-        }
-        return content;
-    }
-}
-export default getStore;
-
-export const getUserName = () => {
-    // 使用 ACCESS_TOKEN 判断是否是一体化
-    const token = localStorage.getItem('ACCESS_TOKEN')
-    if (token) {
-        const name = getStore({ name: 'userName' });
-        if (!name) {
-        return '';
-        }
-        return name;
-    } else {
-        const userInfo = getStore({ name: 'userInfo' });
-        if (userInfo && Object.keys(userInfo).length > 0 && userInfo.username) {
-            console.log('username', userInfo.username)
-            return userInfo.username;
-        }
-        return '';
-    }
-};
-
-export const getUserId = () => {
-    // 使用 ACCESS_TOKEN 判断是否是一体化
-    const token = localStorage.getItem('ACCESS_TOKEN')
-    if (token) {
-        const id = getStore({ name: 'userId' });
-        if (!id) {
-            return '';
-        }
-        return id;
-    } else {
-        const userInfo = getStore({ name: 'userInfo' });
-        if (userInfo && Object.keys(userInfo).length > 0 && userInfo.id) {
-            return userInfo.id;
-        }
-        return '';
-    }
-}; 
-
-/**
-   * 获取是否拥有系统管理左侧菜单权限标识
-   * @returns
-   */
-export const getIsHaveSystemManagementPermissionFlag = () => {
-    return getStore({ name: 'isHaveSystemManagementPermission' });
+/**
+* 获取认证相关的localStorage/SessionStorage
+*/
+function getStore(params) {
+    let { name, debug } = params;
+    // 使用 ACCESS_TOKEN 判断是否是一体化
+    const token = localStorage.getItem('ACCESS_TOKEN')
+    if (token) {
+        let storageStr = '';
+        if (name === 'access_token') {
+            storageStr = localStorage.getItem('ACCESS_TOKEN');
+        } else if (name === 'tenantId') {
+            // 暂定当前租户 curTenantId
+            storageStr = localStorage.getItem('curTenantId');
+        } else if (name === 'userName') {
+            // 获取当前登录用户名称
+            storageStr = localStorage.getItem('userName');
+        } else if (name === 'userId') {
+            // 获取当前登录用户Id
+            storageStr = localStorage.getItem('userId');
+        }
+        return storageStr;
+    } else {
+        const keyName = 'bigdata-';
+        name = keyName + name;
+        let obj = {};
+        let content;
+        obj = sessionStorage.getItem(name);
+        if (!obj || Object.keys(obj).length === 0) obj = localStorage.getItem(name);
+        if (!obj || Object.keys(obj).length === 0) return '';
+        try {
+            obj = JSON.parse(obj);
+        } catch (e) {
+            return '';
+        }
+        if (debug) {
+            return '';
+        }
+        if (obj.dataType === 'string') {
+            content = obj.content;
+        } else if (obj.dataType === 'number') {
+            content = Number(obj.content);
+        } else if (obj.dataType === 'boolean') {
+            // eslint-disable-next-line no-eval
+            content = eval(obj.content);
+        } else if (obj.dataType === 'object') {
+            content = obj.content;
+        }
+        return content;
+    }
+}
+export default getStore;
+
+export const getUserName = () => {
+    // 使用 ACCESS_TOKEN 判断是否是一体化
+    const token = localStorage.getItem('ACCESS_TOKEN')
+    if (token) {
+        const name = getStore({ name: 'userName' });
+        if (!name) {
+        return '';
+        }
+        return name;
+    } else {
+        const userInfo = getStore({ name: 'userInfo' });
+        if (userInfo && Object.keys(userInfo).length > 0 && userInfo.username) {
+            console.log('username', userInfo.username)
+            return userInfo.username;
+        }
+        return '';
+    }
+};
+
+export const getUserId = () => {
+    // 使用 ACCESS_TOKEN 判断是否是一体化
+    const token = localStorage.getItem('ACCESS_TOKEN')
+    if (token) {
+        const id = getStore({ name: 'userId' });
+        if (!id) {
+            return '';
+        }
+        return id;
+    } else {
+        const userInfo = getStore({ name: 'userInfo' });
+        if (userInfo && Object.keys(userInfo).length > 0 && userInfo.id) {
+            return userInfo.id;
+        }
+        return '';
+    }
+}; 
+
+/**
+   * 获取是否拥有系统管理左侧菜单权限标识
+   * @returns
+   */
+export const getIsHaveSystemManagementPermissionFlag = () => {
+    return getStore({ name: 'isHaveSystemManagementPermission' });
 }

package/src/main.js

@@ -1,11 +1,11 @@
-import Vue from 'vue'
-import ElementUI from 'element-ui';
-import App from './App.vue'
-import 'element-ui/lib/theme-chalk/index.css';
-
-Vue.config.productionTip = false
-Vue.use(ElementUI);
-
-new Vue({
-  render: h => h(App),
-}).$mount('#app')
+import Vue from 'vue'
+import ElementUI from 'element-ui';
+import App from './App.vue'
+import 'element-ui/lib/theme-chalk/index.css';
+
+Vue.config.productionTip = false
+Vue.use(ElementUI);
+
+new Vue({
+  render: h => h(App),
+}).$mount('#app')

package/vue.config.js

@@ -1,34 +1,34 @@
-const url = 'https://192.168.108.203:31950'
-module.exports = {
-  lintOnSave: true,
-  productionSourceMap: false,
-  css: {
-    // 忽略 CSS order 顺序警告
-    extract: { ignoreOrder: true },
-    // 查看CSS属于哪个css文件
-    sourceMap: process.env.NODE_ENV === "development",
-  },
-  // 配置转发代理
-  devServer: {
-    // disableHostCheck: true,
-    port: 8080,
-    proxy: {
-      "/": {
-        // target:' https://10.136.106.82:30011',
-        target: url,
-        ws: false, // 需要websocket 开启
-        changOrigin: true,  //允许跨域
-        pathRewrite: {
-          "^/": "/",
-        },
-      },
-      '/admin-api': {
-        target: url,
-        changeOrigin: true,
-        pathRewrite: { '^': '' },
-      }
-      // 3.5 以后不需要再配置
-    },
-  },
-};
-
+const url = 'https://192.168.108.203:31950'
+module.exports = {
+  lintOnSave: true,
+  productionSourceMap: false,
+  css: {
+    // 忽略 CSS order 顺序警告
+    extract: { ignoreOrder: true },
+    // 查看CSS属于哪个css文件
+    sourceMap: process.env.NODE_ENV === "development",
+  },
+  // 配置转发代理
+  devServer: {
+    // disableHostCheck: true,
+    port: 8080,
+    proxy: {
+      "/": {
+        // target:' https://10.136.106.82:30011',
+        target: url,
+        ws: false, // 需要websocket 开启
+        changOrigin: true,  //允许跨域
+        pathRewrite: {
+          "^/": "/",
+        },
+      },
+      '/admin-api': {
+        target: url,
+        changeOrigin: true,
+        pathRewrite: { '^': '' },
+      }
+      // 3.5 以后不需要再配置
+    },
+  },
+};
+