Merge remote-tracking branch 'origin/master'

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

 # 开发环境配置
 NODE_ENV = development
 
-#VUE_APP_API_BASE_URL=http://192.168.0.98:11078
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078
+VUE_APP_API_IMG_URL = http://192.168.0.98:11078/
 #宜宾
-VUE_APP_API_BASE_URL=http://10.12.185.213:11072
+#VUE_APP_API_BASE_URL=http://10.12.185.213:11072
+#VUE_APP_API_IMG_URL = http://10.12.185.213:11072/

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

@@ -2,3 +2,4 @@
 NODE_ENV = production
 
 VUE_APP_API_BASE_URL=/basics_api
+VUE_APP_API_IMG_URL = /

portal-manager-ui/admin/public/index.html

@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>
-    <%= htmlWebpackPlugin.options.title %>
+    智慧大厅综合管理系统
   </title>
   <style>
     *,

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

@@ -45,7 +45,7 @@ export default {
   mixins: [menu],
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_IMG_URL,
       menuPermission: [],
     };
   },

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

@@ -39,7 +39,7 @@ export default {
   mixins: [menu],
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_IMG_URL,
       siteId: "",
       siteModelList: [], // 站点编排列表
     };

portal-manager-ui/admin/src/views/thePlatformIsSet/components/menuManagement/components/addEdit.vue

@@ -140,8 +140,8 @@
         </a-form-model-item>
       </a-form-model>
       <template slot="footer">
-        <a-button type="primary" @click="Modal_Ok">确定</a-button>
         <a-button @click="resetForm">重置</a-button>
+        <a-button type="primary" @click="Modal_Ok">确定</a-button>
       </template>
     </a-modal>
   </div>
@@ -154,6 +154,7 @@ export default {
   data() {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
+      api2: process.env.VUE_APP_API_IMG_URL,
       EditModalLoading: false, //确定回调 loading
       compileInfoForm: {
         name: "",

portal-manager-ui/admin/src/views/thePlatformIsSet/components/menuManagement/menuMgmt.vue

@@ -86,7 +86,7 @@ export default {
   name: "PortalAdminVueMenuMgmt",
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_IMG_URL,
       EditModalVisible: false,
       searchForm: {
         name: undefined,

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/addEditRole.vue

@@ -40,8 +40,8 @@
         </a-form-model-item>
       </a-form-model>
       <template slot="footer">
-        <a-button type="primary" @click="roleEditModal_Ok">确定</a-button>
         <a-button @click="resetForm">重置</a-button>
+        <a-button type="primary" @click="roleEditModal_Ok">确定</a-button>
       </template>
     </a-modal>
   </div>

portal-manager-ui/admin/src/views/thePlatformIsSet/setPlatformes.vue

@@ -47,9 +47,7 @@ import Storage from "@/utils/js/Storage";
 export default {
   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_IMG_URL,
       platformPermission: [],
     };
   },

portal-manager-ui/admin/vue.config.js

@@ -20,7 +20,7 @@ module.exports = defineConfig({
   transpileDependencies: true,
   lintOnSave: false,
   // 打包目录--多加一层dist打zip时候把dist外壳打进去
-  outputDir: "dist/dist",
+  outputDir: "dist",
   configureWebpack: {
     plugins: [...plugins],
   },