现场部署一系列适配提交

manager/.env.production

@@ -7,6 +7,6 @@ ENV = 'production'
 #启动端口
 port = '5002'
 # 国土空间规划“一张图”实施监督信息系统/生产环境
-VUE_APP_BASE_API = 'http://192.168.60.240:8080'
+VUE_APP_BASE_API = 'http://10.254.151.54:8080'
 #通辽部署环境
 #VUE_APP_BASE_API = 'http://10.255.133.174:8080'

website/.env.production

@@ -9,10 +9,10 @@ port = '5000'
 #VITE_APP_BASE_API = 'http://192.168.60.40:8080'
 #VITE_ARC_SERVER_API = 'http://192.168.100.252:6080'
 #通辽部署环境
-VITE_APP_BASE_API = 'http://192.168.60.240:8080'
-VITE_ARC_SERVER_API = 'http://192.168.60.240:6080'
+VITE_APP_BASE_API = 'http://10.254.151.54:8080'
+VITE_ARC_SERVER_API = 'http://10.254.151.54:6080'
 # 单点登录-市级一张图系统
-VITE_APP_SSO_BASE_API = 'http://192.168.60.20:8080'
+VITE_APP_SSO_BASE_API = 'http://10.255.137.105:8080'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 #VITE_BUILD_COMPRESS = gzip

website/src/components/ghcgscygl/ghcgsb/xxgh/czgh/Qxyh/czghcgDialog.vue

@@ -278,8 +278,9 @@ export default {
               addDialog.errorlist = res.data;
               addDialog.loading.close();//关闭文件上传状态loading
             } else {
-              addDialog.formData.filePath = res.msg;
-              addDialog.formData.fileName = files.file.name;
+              let msglist = res.msg.split("******");
+              addDialog.formData.filePath = msglist[0];
+              addDialog.formData.fileName = msglist[1] || files.file.name;
               addDialog.loading.close();//关闭文件上传状态loading
             }
           })

website/src/permission.js

@@ -23,7 +23,7 @@ const whiteList = ['/login', '/auth-redirect', '/bind', '/register'];
 router.beforeEach((to, from, next) => {
     // 全局前置守卫
     NProgress.start()
-    // 获取地址栏参数
+        // 获取地址栏参数
     if (to.query && to.query.token && to.path === '/page') {
         let access_token = to.query.token
         console.log('校验Token是否过期');
@@ -60,7 +60,7 @@ router.beforeEach((to, from, next) => {
             //#endregion
 
             to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
-            /* has token*/
+                /* has token*/
             if (to.path === '/login') {
                 next({ path: '/' })
                 NProgress.done()
@@ -77,7 +77,7 @@ router.beforeEach((to, from, next) => {
                                     router.addRoute(route) // 动态添加可访问路由表
                                 }
                             })
-                            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+                            next({...to, replace: true }) // hack方法 确保addRoutes已完成
                         })
                     }).catch(err => {
                         store.dispatch('LogOut').then(() => {

website/src/views/ghcgscygl/ghcgsb/Search.vue

@@ -511,7 +511,7 @@ export default {
 .dialog-footer {
   width: 100%;
   text-align: center;
-  position: absolute;
+  //position: absolute;
   bottom: 30px;
 }
 </style>

website/src/views/ghcgscygl/ghcgsb/SearchZzq.vue

@@ -608,7 +608,7 @@ export default {
 .dialog-footer {
   width: 100%;
   text-align: center;
-  position: absolute;
+  // position: absolute;
   bottom: 30px;
 }
 </style>

website/src/views/ghcgscygl/ghcgsb/xxgh/Czgh.vue

@@ -1,6 +1,7 @@
 <template>
-  <Sjyh v-if="$store.getters.roles.indexOf('shiji') > -1"></Sjyh>
-  <Qxyh v-else></Qxyh>
+  <!-- <Sjyh v-if="$store.getters.roles.indexOf('shiji') > -1"></Sjyh>
+  <Qxyh v-else></Qxyh> -->
+  <Qxyh></Qxyh>
 </template>
 
 <script>

website/src/views/login.vue

@@ -5,7 +5,7 @@
       <div class="el-login-header">
         <div style="display: flex; align-items: center;">
           <img src="@/assets/backimg/logo.png" class="logo" alt="">
-          <span>准格尔旗国土空间规划“一张图”实施监督信息系统</span>
+          <span>{{ xzqmc }}国土空间规划“一张图”实施监督信息系统</span>
         </div>
       </div>
       <div class="login_center">
@@ -53,7 +53,7 @@
 
       <!--  底部  -->
       <div class="el-login-footer">
-        <span>版权所有：准格尔旗自然资源局</span>
+        <span>版权所有：{{ xzqmc }}自然资源局</span>
       </div>
     </div>
     <div class="login_mask"></div>
@@ -69,6 +69,7 @@ const store = useStore();
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 
+const xzqmc = XZQ_MC;
 const loginForm = ref({
   username: "",
   password: "",
@@ -179,7 +180,7 @@ getCookie();
 .login_cen_left {
   flex: 1;
   height: 100%;
-  background-image: url("../assets/backimg/login_back.jpeg");
+  background-image: url("../assets/backimg/bg.png");
   background-size: cover;
 }
 
@@ -193,7 +194,7 @@ getCookie();
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/backimg/login_back.jpeg");
+  background-image: url("../assets/backimg/bg.png");
   background-size: 100% 100%;
   z-index: 9;
 }

website/src/views/page.vue

@@ -10,7 +10,7 @@
         > -->
     <div class="font-38 posi-abs top-80 font-bold head-title" @click="skipHome">
       <svg-icon style="margin-right: 10px" icon-class="guide" />
-      准格尔旗国土空间规划“一张图”实施监督信息系统
+      {{ xzqmc }}国土空间规划“一张图”实施监督信息系统
     </div>
     <div
       class="margin-top-60 flex-box wrap align-center width-1120"
@@ -44,6 +44,7 @@ export default {
     const store = useStore();
     const home = reactive({
       menu: [],
+      xzqmc: XZQ_MC,
       user: null,
       superUserInfo: {},
       skipHome() {

website/vite.config.js

@@ -54,7 +54,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         "/dev-api": {
           // target: 'http://localhost:8080',
-          target: "http://192.168.60.52:8080",
+          target: "http://192.168.60.240:8080",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },