pref:修改环境变量

portal-manager-ui/admin/.env

-VUE_APP_API_BASE_URL=http://192.168.0.98:11072/zwfw
+VUE_APP_API_BASE_URL=http://192.168.0.98:11072

portal-manager-ui/admin/.env.development

 # 开发环境配置
 NODE_ENV = development
 
-VUE_APP_API_BASE_URL=http://192.168.0.98:11078/zwfw
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078

portal-manager-ui/admin/.env.production

 # 生产环境配置
 NODE_ENV = production
 
-VUE_APP_API_BASE_URL=/portal_home/zwfw
+VUE_APP_API_BASE_URL=''

portal-manager-ui/admin/.env.test

 # 生产环境配置
 NODE_ENV = test
 
-VUE_APP_API_BASE_URL=/portal_home/zwfw
+VUE_APP_API_BASE_URL=''

portal-manager-ui/admin/src/App.vue

@@ -72,12 +72,11 @@ body,
 #app {
   width: 100% !important;
   min-width: 1440px !important;
-  min-height: 100% !important;
-  display: flex;
 }
 .ant-spin-nested-loading,
 .ant-spin-container {
   width: 100%;
-  height: 100% !important;
+  min-height: 100% !important;
+  display: flex;
 }
 </style>

portal-manager-ui/admin/src/api/APIServe.js

-import http from '../request/http'
-
+import http from "../request/http";
 
 // 1.9.1. 查询API服务列表
 export function serviceApiList(params) {
-    return http.post("system/service/api/list", params)
+  return http.post("/zwfw/system/service/api/list", params);
 }
 // 1.9.2. 查看API服务
 export function serviceApiInfo(params) {
-    return http.get("system/service/api/info", params)
+  return http.get("/zwfw/system/service/api/info", params);
 }
 // 1.9.3. 保存更新API服务
 export function serviceApiSave(params) {
-    return http.post("system/service/api/save", params)
+  return http.post("/zwfw/system/service/api/save", params);
 }
 // 1.9.4. 删除API服务
 export function serviceApiDelete(params) {
-    return http.get("system/service/api/delete", params)
+  return http.get("/zwfw/system/service/api/delete", params);
 }
-
-
-
-
-
-

portal-manager-ui/admin/src/api/api.js

 // const BASE_URL = process.env.VUE_APP_API_BASE_URL
 module.exports = {
-    fileCommonupload: `/file/commonupload`, //1.2.4. 上传附件
-}
+  fileCommonupload: `/zwfw/file/commonupload`, //1.2.4. 上传附件
+};

portal-manager-ui/admin/src/api/applService.js

-import http from '../request/http'
-
+import http from "../request/http";
 
 // 1.10.1. 查询应用服务列表
 export function serviceList(params) {
-    return http.post("system/service/list", params)
+  return http.post("/zwfwsystem/service/list", params);
 }
 // 1.10.2. 查看应用服务
 export function serviceInfo(params) {
-    return http.get("system/service/info", params)
+  return http.get("/zwfwsystem/service/info", params);
 }
 // 1.10.3. 保存更新应用服务
 export function serviceSave(params) {
-    return http.post("system/service/save", params)
+  return http.post("/zwfwsystem/service/save", params);
 }
 // 1.10.4. 删除应用服务
 export function serviceDelete(params) {
-    return http.get("system/service/delete", params)
+  return http.get("/zwfwsystem/service/delete", params);
 }
-
-
-
-
-
-

portal-manager-ui/admin/src/api/area.js

-import http from '../request/http'
-
+import http from "../request/http";
 
 // 1.14.1. 查询区域列表
 export function areaList(params) {
-    return http.post("area/list", params)
+  return http.post("/zwfw/area/list", params);
 }
 // 1.14.2. 查看区域
 export function areaInfo(params) {
-    return http.get("area/info", params)
+  return http.get("/zwfw/area/info", params);
 }
 // 1.14.3. 查看区域子信息
 export function getListByParentId(params) {
-    return http.get("area/getListByParentId", params)
+  return http.get("/zwfw/area/getListByParentId", params);
 }
 // 1.14.4. 获取所有区域信息
 export function areaTreeselect(params) {
-    return http.post("area/treeselect", params)
+  return http.post("/zwfw/area/treeselect", params);
 }
-
-
-
-
-
-
-

portal-manager-ui/admin/src/api/authorityMis.js

-import http from '../request/http'
-
+import http from "../request/http";
 
 // 1.4.1. 查询角色信息列表
 export function roleList(params) {
-    return http.post("role/list", params)
+  return http.post("/zwfw/role/list", params);
 }
 
 // 1.4.2. 查看角色信息
 export function roleInfo(params) {
-    return http.get("role/info", params)
+  return http.get("/zwfw/role/info", params);
 }
 
 // 1.4.3. 保存更新角色信息
 export function roleSave(params) {
-    return http.post("role/save", params)
+  return http.post("/zwfw/role/save", params);
 }
 
 // 1.4.4. 删除角色信息
 export function roleDelete(params) {
-    return http.get("role/delete", params)
+  return http.get("/zwfw/role/delete", params);
 }
 // 1.6.1. 分配菜单到角色
 export function assignMenuToRole(params) {
-    return http.post("role/auth/assignMenuToRole", params)
+  return http.post("/zwfw/role/auth/assignMenuToRole", params);
 }
-
-
-
-
-

portal-manager-ui/admin/src/api/dataAdmin.js

-import http from '../request/http'
+import http from "../request/http";
 
 // 1.15.1. 获取站点下的数据管理列表
 export function censusListInterface(params) {
-    return http.post("site/model/census/list", params)
+  return http.post("/zwfw/site/model/census/list", params);
 }
-
-
-

portal-manager-ui/admin/src/api/menuMgmt.js

-import http from '../request/http'
+import http from "../request/http";
 
 // 1.7.1. 查询菜单信息业务列表
 export function menuList(params) {
-    return http.post("menu/list", params)
+  return http.post("/zwfw/menu/list", params);
 }
 
-
 // 1.7.2. 查看菜单信息业务
 export function menuInfo(params) {
-    return http.get("menu/info", params)
+  return http.get("/zwfw/menu/info", params);
 }
 
-
 // 1.7.3. 保存更新菜单信息业务
 export function menuSave(params) {
-    return http.post("menu/save", params)
+  return http.post("/zwfw/menu/save", params);
 }
 
 // 1.7.4. 删除菜单信息业务
 export function menuDelete(params) {
-    return http.get("menu/delete", params)
+  return http.get("/zwfw/menu/delete", params);
 }
 
 // 1.7.5. 查询所有可用菜单
 export function menuFindAll(params) {
-    return http.post("menu/findAll", params)
+  return http.post("/zwfw/menu/findAll", params);
 }
 
 // 1.3.8 查询菜单权限列表
 export function menuFindAllTree(params) {
-    return http.post("menu/list/tree", params)
+  return http.post("/zwfw/menu/list/tree", params);
 }
-
-
-
-

portal-manager-ui/admin/src/api/siteArrange.js

-import http from '../request/http'
+import http from "../request/http";
 
 // 1.16.1. 查询站点编排列表
 export function appsListInterface(params) {
-    return http.post("site/model/list", params)
+  return http.post("/zwfw/site/model/list", params);
 }
-
-
-

portal-manager-ui/admin/src/api/user.js

@@ -2,21 +2,21 @@ import http from "../request/http";
 
 // 1.2.1. 登录
 export function LoginInterface(params) {
-  return http.post("login/login", params);
+  return http.post("/zwfw/login/login", params);
 }
 // 1.2.2. 首页
 export function loginIndex(params) {
-  return http.post("login/index", params);
+  return http.post("/zwfw/login/index", params);
 }
 // 1.2.3. 登出
 export function LogoutInterface(params) {
-  return http.post("login/logout", params);
+  return http.post("/zwfw/login/logout", params);
 }
 // 1.2.4. 用户修改密码
 export function changePassword(params) {
-  return http.post("user/change/password", params);
+  return http.post("/zwfw/user/change/password", params);
 }
 // 管理员修改密码
 export function editPassword(params) {
-  return http.post("user/reset/password", params);
+  return http.post("/zwfw/user/reset/password", params);
 }

portal-manager-ui/admin/src/api/userManagement.js

-import http from '../request/http'
-
+import http from "../request/http";
 
 // 1.3.1. 查询用户信息业务列表
 export function userList(params) {
-    return http.post("user/list", params)
+  return http.post("/zwfw/user/list", params);
 }
 // 1.3.2. 查看用户信息业务
 export function userInfo(params) {
-    return http.get("user/info", params)
+  return http.get("/zwfw/user/info", params);
 }
 // 1.3.3. 保存更新用户信息业务
 export function userSave(params) {
-    return http.post("user/save", params)
+  return http.post("/zwfw/user/save", params);
 }
 // 1.3.4. 删除用户信息业务
 export function userDelete(params) {
-    return http.get("user/delete", params)
+  return http.get("/zwfw/user/delete", params);
 }
 // 1.3.5. 用户站点授权
 export function userSiteAuth(params) {
-    return http.post("user/siteAuth", params)
+  return http.post("/zwfw/user/siteAuth", params);
 }
-
-
-

portal-manager-ui/admin/src/request/request.js

 import Vue from "vue";
-import router from "@/router"
-import axios from 'axios'
-import { message } from 'ant-design-vue';
-import Storage from "@/utils/js/Storage"
+import router from "@/router";
+import axios from "axios";
+import { message } from "ant-design-vue";
+import Storage from "@/utils/js/Storage";
 const service = axios.create({
   baseURL: process.env.VUE_APP_API_BASE_URL,
   // timeout: 10000
-})
-service.interceptors.request.use(config => {
+});
+service.interceptors.request.use(
+  (config) => {
     Vue.prototype.$setLoading({
       spinning: true,
       tip: "请稍等",
     });
     config.data = JSON.stringify(config.data);
     config.headers = {
-    'Content-Type': 'application/json;charset=utf-8'
-  }
-  const Authorization = JSON.parse(localStorage.getItem('Authorization'));
+      "Content-Type": "application/json;charset=utf-8",
+    };
+    const Authorization = JSON.parse(localStorage.getItem("Authorization"));
     if (Authorization) {
       config.headers.Authorization = Authorization;
     }
-  return config
-}, error => {
-  Promise.reject(error)
-})
-service.interceptors.response.use(response => {
+    return config;
+  },
+  (error) => {
+    Promise.reject(error);
+  }
+);
+service.interceptors.response.use(
+  (response) => {
     Vue.prototype.$setLoading(false);
     if (response.data.code !== undefined && response.data.msg !== undefined) {
-    let { code, msg } = response.data
+      let { code, msg } = response.data;
       if (code === -1) {
         message.error({
           content: msg,
           maxCount: 1,
-      })
+        });
       } else if (code === 401) {
         message.error({
           message: msg,
           maxCount: 1,
-      })
-      Storage.remove(2, "userInfo")
-      Storage.remove(2, "siteId")
-      Storage.remove(2, "Authorization")
-      router.push('/')
+        });
+        Storage.remove(2, "userInfo");
+        Storage.remove(2, "siteId");
+        Storage.remove(2, "Authorization");
+        router.push("/");
       }
     }
-  return response.data
-}, error => {
+    return response.data;
+  },
+  (error) => {
     if (error && error.response) {
       switch (error.response.status) {
         case 400:
-        error.message = '错误请求'
+          error.message = "错误请求";
           break;
         case 401:
-        error.message = '未授权，请重新登录'
+          error.message = "未授权，请重新登录";
           break;
         case 403:
-        error.message = '拒绝访问'
+          error.message = "拒绝访问";
           break;
         case 404:
-        error.message = '请求错误,未找到该资源'
+          error.message = "请求错误,未找到该资源";
           break;
         case 405:
-        error.message = '请求方法未允许'
+          error.message = "请求方法未允许";
           break;
         case 408:
-        error.message = '请求超时'
+          error.message = "请求超时";
           break;
         case 500:
-        error.message = '服务器端出错'
+          error.message = "服务器端出错";
           break;
         case 501:
-        error.message = '网络未实现'
+          error.message = "网络未实现";
           break;
         case 502:
-        error.message = '网络错误'
+          error.message = "网络错误";
           break;
         case 503:
-        error.message = '服务不可用'
+          error.message = "服务不可用";
           break;
         case 504:
-        error.message = '网络超时'
+          error.message = "网络超时";
           break;
         case 505:
-        error.message = 'http版本不支持该请求'
+          error.message = "http版本不支持该请求";
           break;
         default:
-        error.message = `连接错误${error.response.status}`
+          error.message = `连接错误${error.response.status}`;
       }
     } else {
-    if (JSON.stringify(error).includes('timeout')) {
-
-      Vue.prototype.$message.error('服务器响应超时，请刷新当前页');
+      if (JSON.stringify(error).includes("timeout")) {
+        Vue.prototype.$message.error("服务器响应超时，请刷新当前页");
       }
-    error.message = '连接服务器失败'
-
+      error.message = "连接服务器失败";
     }
     Vue.prototype.$setLoading(false);
-  message.error(error.message);
+    // message.error(error.message);
 
-
-  return Promise.resolve(error.response)
-})
-export default service
+    return Promise.resolve(error.response);
+  }
+);
+export default service;

portal-manager-ui/admin/src/views/dataActuary/dataActuary.vue

@@ -16,7 +16,14 @@
         >
           <div class="flip">
             <div class="mod_min">
-              <img :src="api + item.imgPath" alt />
+              <img
+                :src="
+                  item.imgPath
+                    ? api + item.imgPath
+                    : require('../../assets/images/qyhx.png')
+                "
+                alt
+              />
               <div class="mod_cont">
                 <p>{{ item.name }}</p>
                 <span>
@@ -38,9 +45,7 @@ export default {
   mixins: [menu],
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("zwfw")
-        ? process.env.VUE_APP_API_BASE_URL.replace("zwfw", "")
-        : process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       menuPermission: [],
     };
   },
@@ -137,9 +142,7 @@ export default {
 
         cursor: pointer;
         &:hover > .flip {
-          // border: 1px solid rgb(25, 76, 245) !important;
           transform: translateY(-10px);
-          // transform: rotateX(-360deg) !important;
         }
 
         .flip {

portal-manager-ui/admin/src/views/home/home.vue

@@ -183,7 +183,7 @@ export default {
 @headerH: 4.5rem;
 .Container {
   width: 100%;
-  height: auto;
+  height: 100%;
   position: relative;
   .header_box {
     display: flex;

portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue

@@ -13,7 +13,16 @@
           @click="openWindow(item.modelUrl)"
         >
           <div class="picture">
-            <img width="40" height="35" :src="api + item.modelIcon" alt />
+            <img
+              width="40"
+              height="35"
+              :src="
+                item.modelIcon
+                  ? api + item.modelIcon
+                  : require('../../assets/images/u222.svg')
+              "
+              alt
+            />
           </div>
           <h5 style="margin-top: 10px">{{ item.modelName }}</h5>
         </div>
@@ -30,9 +39,7 @@ export default {
   mixins: [menu],
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("zwfw")
-        ? process.env.VUE_APP_API_BASE_URL.replace("zwfw", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       siteId: "",
       siteModelList: [], // 站点编排列表
     };
@@ -55,8 +62,10 @@ export default {
     },
     openWindow(href) {
       let token = Storage.get(2, "Authorization");
-      let siteid = Storage.get(2, "siteId");
-      let siteName = Storage.get(2, "siteName");
+      let siteid = Storage.get(2, "siteId") ? Storage.get(2, "siteId") : 0;
+      let siteName = Storage.get(2, "siteName")
+        ? Storage.get(2, "siteName")
+        : "";
       let reg = /^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/;
       let info = Storage.get(2, "userInfo");
       let userInfo = JSON.stringify({
@@ -113,7 +122,7 @@ export default {
     position: absolute;
     bottom: 0;
     background-color: rgba(3, 23, 24, 0.452);
-
+    overflow-y: auto;
     .modules {
       margin: 0 100px;
       padding-top: 20px;