Merge remote-tracking branch 'origin/master'

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

 #开发环境
 NODE_ENV = "development"
-VUE_APP_API_BASE_URL=http://192.168.0.98:11078/base
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078
 #VUE_APP_API_BASE_URL=http://192.168.0.98:11023
 #VUE_APP_API_BASE_URL=http://192.168.0.217:17311
\ No newline at end of file

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

 #生产环境
 NODE_ENV = "production"
-VUE_APP_API_BASE_URL=http://192.168.0.251:11078/base
\ No newline at end of file
+VUE_APP_API_BASE_URL=http://192.168.0.251:11078
\ No newline at end of file

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

 #测试环境
 NODE_ENV = "test"
-VUE_APP_API_BASE_URL=http://192.168.0.98:11078/base
\ No newline at end of file
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078
\ No newline at end of file

base-manager-ui/admin/src/assets/css/common.css

@@ -213,3 +213,10 @@
 .fontw800{
     font-weight:800;
 }
+
+.skin-box {
+    height: 100%;
+}
+.empty {
+  height: 100%;
+}
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/appmarket/AppPreview.vue

 <template>
   <!-- 应用预览页面 -->
   <div class="app-preview">
-    <!-- <div class="header">
-      <span class="btn" @click="handleBack">
-        <a-icon type="left" class="mr10" />
-        <span>返回上一级</span>
-      </span>
-    </div> -->
-    <!-- <div class="main flex1">
-      <iframe
-        style="width: 100%; height: 100%"
-        :src="previewUrl"
-        frameborder="0"
-      ></iframe>
-    </div> -->
     <iframe
       name="myIframe"
       style="width: 100%; height: 100%"
@@ -28,7 +15,8 @@ export default {
   data() {
     return {
       previewInfo: this.$route.query,
-      previewUrl: "",
+      previewUrl: "http://192.168.0.192:8082",
+      loading: true,
     };
   },
   created() {
@@ -38,7 +26,8 @@ export default {
     sendInfo() {
       let siteId = this.previewInfo.siteId;
       let appId = this.previewInfo.appId;
-      this.previewUrl = `${this.previewInfo.previewUrl}?siteId=${siteId}&appId=${appId}`;
+      let baseUrl = process.env.VUE_APP_API_BASE_URL;
+      this.previewUrl = `${this.previewInfo.previewUrl}?siteId=${siteId}&appId=${appId}&baseUrl=${baseUrl}`;
       /* eslint-disable */
       // myIframe.window.postMessage(obj, "*");
     },
@@ -48,32 +37,8 @@ export default {
 
 <style lang="less" scoped>
 .app-preview {
-  width: 1920px;
-  height: 1080px;
-  // padding-bottom: 20px;
+  width: 100%;
+  height: 100vh;
   background-color: #f5f5f5;
-  // .header {
-  //   width: 100%;
-  //   height: 100px;
-  //   line-height: 100px;
-  //   height: 100px;
-  //   padding: 0px 40px;
-  //   margin-bottom: 10px;
-  //   background: url("../../../assets/img/title.jpg") no-repeat center;
-  //   background-size: 100% 100%;
-  //   box-shadow: 0px 2px 6px 6px #ccc;
-  //   .back-text {
-  //     font-size: 28px;
-  //     color: #ffffff;
-  //   }
-  //   .btn {
-  //     font-size: 28px;
-  //     color: #fff;
-  //     cursor: pointer;
-  //   }
-  // }
-  // .main {
-  //   width: 98%;
-  // }
 }
 </style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/appmarket/components/AppDetailsPage.vue

@@ -168,9 +168,7 @@ export default {
       },
     ];
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       columns,
       appId: this.$route.query.id,
       appInfo: {}, // 应用信息

base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue

@@ -171,9 +171,7 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       columns,
       siteId: local.getLocal("siteId"),
       tableData: [], // 表格数据

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue

@@ -34,7 +34,7 @@
               list-type="picture-card"
               class="avatar-uploader"
               :show-upload-list="false"
-              :action="api2 + 'file/commonupload'"
+              :action="api + 'base/file/commonupload'"
               :before-upload="iconBeforeUpload"
               @change="handleChangeIcon"
             >
@@ -91,7 +91,7 @@
           >
             <a-upload
               name="file"
-              :action="api2 + 'file/commonupload'"
+              :action="api + 'base/file/commonupload'"
               :multiple="false"
               :file-list="fileList"
               @change="handleChangeFile"
@@ -169,10 +169,7 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
-      api2: process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       labelCol: {
         span: 3,
       },

base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue

@@ -55,10 +55,10 @@
           <template slot="modelIcon" slot-scope="text">
             <div v-if="text.modelIcon">
               <div class="svg-box" v-if="isSvg(text.modelIcon)">
-                <img width="30" height="30" :src="api2 + text.modelIcon" />
+                <img width="30" height="30" :src="api + text.modelIcon" />
               </div>
               <div class="svg-box" v-else>
-                <img width="30" height="30" :src="api2 + text.modelIcon" />
+                <img width="30" height="30" :src="api + text.modelIcon" />
               </div>
             </div>
             <span v-else>--</span>
@@ -166,16 +166,16 @@
               <a-upload
                 name="file"
                 list-type="picture-card"
-                :action="api + 'file/commonupload'"
+                :action="api + 'base/file/commonupload'"
                 @change="handleUpload"
                 :before-upload="beforeUpload"
                 :show-upload-list="false"
               >
                 <div v-if="formData.modelIcon">
                   <div class="svg-box" v-if="isSvg(formData.modelIcon)">
-                    <img :src="api2 + formData.modelIcon" />
+                    <img :src="api + formData.modelIcon" />
                   </div>
-                  <img v-else :src="api2 + formData.modelIcon" />
+                  <img v-else :src="api + formData.modelIcon" />
                 </div>
                 <div v-else>
                   <a-icon :type="loading ? 'loading' : 'plus'" />
@@ -261,9 +261,6 @@ export default {
   data() {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
-      api2: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
       columns,
       loading: true,
       title: "新增模块",

base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue

@@ -160,14 +160,14 @@
               list-type="picture-card"
               class="avatar-uploader"
               :show-upload-list="false"
-              :action="api + 'file/commonupload'"
+              :action="api + 'base/file/commonupload'"
               :before-upload="beforeUpload"
               @change="handleChange"
             >
               <img
                 class="logo"
                 v-if="formInfo.logoPath"
-                :src="api2 + formInfo.logoPath"
+                :src="api + formInfo.logoPath"
               />
               <div v-else>
                 <a-icon :type="loading ? 'loading' : 'plus'" />
@@ -307,9 +307,6 @@ export default {
     };
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
-      api2: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
       loading: false,
       options: regionData, // 地区级联数据
       tablename: "", //接口名称

base-manager-ui/admin/src/pages/basicset/surface/appraiseskin/AppraiseSkin.vue

 <template>
-  <div>
+  <div class="skin-box">
     <!-- 评价器 横板皮肤 -->
     <div
       :id="conponentsId"
       class="call-out-skin-across"
+      v-if="imageResolution === '1'"
       :style="{
         background: filterItem('1', 0),
       }"
@@ -96,6 +97,17 @@
         ></div> -->
       </div>
     </div>
+    <!-- 空数据显示 -->
+    <div class="empty flex aic jcc" v-else>
+      <a-empty
+        :image="require('../../../../assets/img/original.png')"
+        :image-style="{
+          height: '80px',
+        }"
+      >
+        <span slot="description"> <a href="#API">暂无皮肤模板</a> </span>
+      </a-empty>
+    </div>
   </div>
 </template>
 
@@ -120,9 +132,7 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_BASE_URL + "/",
     };
   },
   methods: {

base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue

 <template>
-  <div>
+  <div class="skin-box">
     <!-- 呼叫器 横板皮肤 -->
     <div
       :id="conponentsId"
       class="call-out-skin-across"
+      v-if="imageResolution === '1'"
       :style="{
         background: filterItem('1', 0),
       }"
@@ -122,6 +123,17 @@
         </div>
       </div>
     </div>
+    <!-- 空数据显示 -->
+    <div class="empty flex aic jcc" v-else>
+      <a-empty
+        :image="require('../../../../assets/img/original.png')"
+        :image-style="{
+          height: '80px',
+        }"
+      >
+        <span slot="description"> <a href="#API">暂无皮肤模板</a> </span>
+      </a-empty>
+    </div>
   </div>
 </template>
 
@@ -146,9 +158,7 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_BASE_URL + "/",
     };
   },
   methods: {

base-manager-ui/admin/src/pages/basicset/surface/centralizeskin/CentralizeSkin.vue

 <template>
-  <div>
+  <div class="skin-box">
     <!-- 集中显示屏 横板 -->
     <div
       class="centralize-across"
       :id="conponentsId"
+      v-if="imageResolution === '1'"
       :style="{
         background: filterItem('1', 0),
       }"
@@ -156,6 +157,17 @@
         </div>
       </div>
     </div>
+    <!-- 空数据显示 -->
+    <div class="empty flex aic jcc" v-else>
+      <a-empty
+        :image="require('../../../../assets/img/original.png')"
+        :image-style="{
+          height: '80px',
+        }"
+      >
+        <span slot="description"> <a href="#API">暂无皮肤模板</a> </span>
+      </a-empty>
+    </div>
   </div>
 </template>
 
@@ -180,9 +192,7 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_BASE_URL + "/",
     };
   },
   methods: {

base-manager-ui/admin/src/pages/basicset/surface/components/ShowBox.vue

@@ -54,6 +54,8 @@ import CallOutSkin from "../calloutskin/CallOutSkin.vue";
 import WindowSkin from "../windowskin/WindowSkin.vue";
 import CentralizeSkin from "../centralizeskin/CentralizeSkin.vue";
 import AppraiseSkin from "../appraiseskin/AppraiseSkin.vue";
+import SampleFormSkin from "../sampleFormSkin/SampleFormSkin.vue";
+import WriteFormSkin from "../writeFormSkin/WriteFormSkin.vue";
 export default {
   components: {
     LandscapeMode,
@@ -61,6 +63,8 @@ export default {
     WindowSkin,
     CentralizeSkin,
     AppraiseSkin,
+    SampleFormSkin,
+    WriteFormSkin,
   },
   props: {},
   data() {
@@ -98,6 +102,15 @@ export default {
         case 6:
           str = "AppraiseSkin";
           break;
+        case 7:
+          // str = "AppraiseSkin";
+          break;
+        case 8:
+          str = "WriteFormSkin";
+          break;
+        case 9:
+          str = "SampleFormSkin";
+          break;
       }
       return str;
     },

base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue

@@ -98,6 +98,7 @@
                 </a-form-model-item>
               </a-col>
             </a-row>
+            <a-spin :spinning="formLoading">
               <a-row v-if="formData.skinFieldList.length">
                 <!-- 背景图 -->
                 <a-col
@@ -162,6 +163,7 @@
                 description="暂无皮肤字段属性"
                 :image="simpleImage"
               />
+            </a-spin>
           </a-form-model>
         </div>
         <div class="btn-box">
@@ -191,6 +193,8 @@ import CallOutSkin from "../calloutskin/CallOutSkin.vue";
 import WindowSkin from "../windowskin/WindowSkin.vue";
 import CentralizeSkin from "../centralizeskin/CentralizeSkin.vue";
 import AppraiseSkin from "../appraiseskin/AppraiseSkin.vue";
+import SampleFormSkin from "../sampleFormSkin/SampleFormSkin.vue";
+import WriteFormSkin from "../writeFormSkin/WriteFormSkin.vue";
 import { uploadFile, skinSave, getTemplateList } from "@/services/surface";
 import html2canvas from "html2canvas";
 import { Empty } from "ant-design-vue";
@@ -202,6 +206,8 @@ export default {
     WindowSkin,
     CentralizeSkin,
     AppraiseSkin,
+    SampleFormSkin,
+    WriteFormSkin,
   },
   props: {
     isShow: {
@@ -220,10 +226,11 @@ export default {
   data() {
     return {
       loading: false,
+      formLoading: false,
       simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
       facilityInfo: {}, // 设备信息
       skinTemplate: [], // 皮肤模板列表
-      curSkinTemplate: "", //当前选择皮肤模板
+      curSkinTemplate: undefined, //当前选择皮肤模板
       isEdit: false, // 是否编辑状态
       formData: {
         categoryId: undefined, // 所属种类
@@ -280,6 +287,15 @@ export default {
         case 6:
           str = "AppraiseSkin";
           break;
+        case 7:
+          // str = "AppraiseSkin";
+          break;
+        case 8:
+          str = "WriteFormSkin";
+          break;
+        case 9:
+          str = "SampleFormSkin";
+          break;
       }
       return str;
     },
@@ -303,6 +319,8 @@ export default {
       this.$refs.formData && this.$refs.formData.resetFields();
       this.isEdit = false;
       this.show = false;
+      this.skinTemplate = [];
+      this.curSkinTemplate = undefined;
     },
     // 获取设备信息
     getFacilityInfo(info) {
@@ -310,6 +328,7 @@ export default {
     },
     // 获取皮肤模板
     async getTemplateList(search = {}) {
+      this.formLoading = true;
       let res = await getTemplateList({
         page: 1,
         size: -1,
@@ -317,7 +336,7 @@ export default {
         ...search,
       });
       let { data } = res.data.data;
-      console.log(data);
+      this.formLoading = false;
       if (data.length) {
         data.forEach((v) => {
           for (let item of v.skinFieldList) {
@@ -406,15 +425,13 @@ export default {
                 ...this.facilityInfo,
                 ...this.formData,
               });
+              this.loading = false;
               let { code, msg } = res.data;
               if (code === 1) {
                 this.$message.success(msg);
                 this.$emit("addSkinSuccess");
                 this.$refs.formData.resetFields();
-                this.loading = false;
                 this.show = false;
-              } else {
-                this.loading = false;
               }
             });
         }
@@ -479,7 +496,7 @@ export default {
       }
       &::-webkit-scrollbar-thumb {
         border-radius: 5px;
-        background: #939392;
+        background: rgba(144, 147, 153, 0.5);
       }
       &::-webkit-scrollbar-track {
         box-shadow: 0;

base-manager-ui/admin/src/pages/basicset/surface/queuingSkin/LandscapeMode.vue

 <template>
-  <div>
+  <div class="skin-box">
     <!-- 排号机 1920*1080 -->
     <div
       :id="conponentsId"
@@ -67,8 +67,8 @@
       </div>
     </div>
     <!-- 空数据显示 -->
+    <div class="empty flex aic jcc" v-else>
       <a-empty
-      v-else
         :image="require('../../../../assets/img/original.png')"
         :image-style="{
           height: '80px',
@@ -77,6 +77,7 @@
         <span slot="description"> <a href="#API">暂无皮肤模板</a> </span>
       </a-empty>
     </div>
+  </div>
 </template>
 
 <script>
@@ -107,40 +108,10 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_BASE_URL + "/",
     };
   },
   methods: {
-    // 过滤图片
-    // filterImg(val) {
-    //   let url = "";
-    //   this.skinFieldList
-    //     .filter((v) => {
-    //       return v.fieldType === "2";
-    //     })
-    //     .forEach((v) => {
-    //       if (v.fieldName !== "" && v.fieldName === val) {
-    //         url = v.fieldValue;
-    //       }
-    //     });
-    //   return url;
-    // },
-    // // 过滤颜色
-    // filterColor(val) {
-    //   let str = "";
-    //   this.skinFieldList
-    //     .filter((v) => {
-    //       return v.fieldType === "1";
-    //     })
-    //     .forEach((v) => {
-    //       if (v.fieldName !== "" && v.fieldName === val) {
-    //         str = v.fieldValue;
-    //       }
-    //     });
-    //   return str;
-    // },
     // 过滤属性类型
     filterItem(type, index) {
       let arr = this.skinFieldList.filter((v) => {

base-manager-ui/admin/src/pages/basicset/surface/sampleFormSkin/SampleFormSkin.vue

+<template>
+  <div class="skin-box">
+    <!-- 样表机 横板 -->
+    <div
+      :id="conponentsId"
+      v-if="imageResolution === '1'"
+      class="sample_form_skin flex flexc aic"
+      :style="{
+        background: filterItem('1', 0),
+      }"
+    >
+      <!-- 头部 -->
+      <div class="header flex aic jcb">
+        <div class="left flex aic">
+          <img class="mr20" src="../../../../assets/img/logo.png" />
+          <div
+            class="title"
+            :style="{
+              color: filterItem('2', 0),
+            }"
+          >
+            政务服务中心
+          </div>
+        </div>
+        <div class="right flex aic">
+          <div class="flex aic mr10">
+            <span
+              :style="{
+                color: filterItem('2', 0),
+              }"
+              >今日节约能量：</span
+            >
+            <div class="count">66g</div>
+          </div>
+          <div class="flex aic">
+            <span
+              :style="{
+                color: filterItem('2', 0),
+              }"
+              >累计节约能量：</span
+            >
+            <div class="count">666kg</div>
+          </div>
+        </div>
+      </div>
+      <!-- 标题 -->
+      <img class="title-img" src="../../../../assets/img/yangbiao.png" alt="" />
+      <!-- 搜索框 -->
+      <div class="search-box">
+        <div
+          class="search-box-btn flex aic jcc"
+          :style="{
+            background: `linear-gradient(90deg, ${filterItem(
+              '7',
+              0
+            )}, ${filterItem('8', 0)})`,
+          }"
+        >
+          <img src="../../../../assets/img/sousuo.png" />
+          搜索
+        </div>
+      </div>
+      <!-- 热门词汇 -->
+      <div class="hot-text">
+        <span>热门词汇：</span>
+      </div>
+      <!-- 主体内容 -->
+      <div class="main flex aic jcb">
+        <div class="left">热门表单区域</div>
+        <div class="right flex flexc jcb">
+          <div
+            class="top flex aic jcc"
+            :style="{
+              background: filterItem('4', 0),
+            }"
+            :class="{ border: !filterItem('4', 0) }"
+          >
+            btn1
+          </div>
+          <div class="bottom flex aic jcc">热门事项</div>
+        </div>
+      </div>
+      <!-- 底部 -->
+      <div class="footer flex aic mt20">
+        <div class="flex1 tac">
+          <span
+            :style="{
+              color: filterItem('5', 0),
+            }"
+            >入驻表单量：</span
+          >
+          <span
+            :style="{
+              color: filterItem('7', 0),
+            }"
+            >20份</span
+          >
+        </div>
+        <div class="flex1 tac">
+          <span
+            :style="{
+              color: filterItem('5', 0),
+            }"
+            >入驻事项量：</span
+          >
+          <span
+            :style="{
+              color: filterItem('7', 0),
+            }"
+            >20件</span
+          >
+        </div>
+      </div>
+    </div>
+    <!-- 空数据显示 -->
+    <div class="empty flex aic jcc" v-else>
+      <a-empty
+        :image="require('../../../../assets/img/original.png')"
+        :image-style="{
+          height: '80px',
+        }"
+      >
+        <span slot="description"> <a href="#API">暂无皮肤模板</a> </span>
+      </a-empty>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    skinFieldList: {
+      type: Array,
+      required: true,
+      default: () => {
+        return [];
+      },
+    },
+    imageResolution: {
+      required: true,
+      default: "1",
+    },
+    conponentsId: {
+      required: true,
+      type: String,
+    },
+  },
+  data() {
+    return {
+      api: process.env.VUE_APP_API_BASE_URL + "/",
+    };
+  },
+  methods: {
+    // 过滤属性类型
+    filterItem(type, index) {
+      let arr = this.skinFieldList.filter((v) => {
+        return v.remark == type;
+      });
+      if (arr.length) {
+        return this.filterValueType(arr[index]);
+      } else {
+        return "";
+      }
+    },
+    // 过滤属性值类型
+    filterValueType(info = {}) {
+      let value = "";
+      if (info.fieldType !== "" && info.fieldType === "1" && info.fieldValue) {
+        value = info.fieldValue;
+      } else if (
+        info.fieldType !== "" &&
+        info.fieldType === "2" &&
+        info.fieldValue
+      ) {
+        value = `url(${this.api + info.fieldValue})`;
+      }
+      return value;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.sample_form_skin {
+  width: 1000px;
+  height: 562.5px;
+  padding: 20px;
+  background-image: linear-gradient(#26c5ff, #2c66ff);
+  background-repeat: no-repeat !important ;
+  background-position: center !important ;
+  background-size: cover !important ;
+  .header {
+    width: 100%;
+    color: #fff;
+    .title {
+      font-size: 30px;
+      font-weight: 600;
+    }
+    .right {
+      .count {
+        width: 50px;
+        height: 50px;
+        background: url("../../../../assets/img/pic_png_nengliang.png")
+          no-repeat center;
+        background-size: 100% 100%;
+        color: #317054;
+        text-align: center;
+        line-height: 50px;
+      }
+    }
+  }
+  .title-img {
+    width: 600px;
+    margin-top: 20px;
+  }
+  .search-box {
+    width: 600px;
+    height: 38px;
+    margin-top: 20px;
+    background: #ffffff;
+    box-shadow: 0px 7px 13px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 8px;
+    position: relative;
+    .search-box-btn {
+      width: 70px;
+      height: 30px;
+      background: linear-gradient(90deg, #0857e8, #59d1fe);
+      border-radius: 4px;
+      color: #fff;
+      position: absolute;
+      right: 4px;
+      top: 4px;
+      img {
+        width: 18px;
+        margin-right: 6px;
+      }
+    }
+  }
+  .hot-text {
+    width: 600px;
+    margin-top: 10px;
+    color: #fff;
+  }
+  .main {
+    width: 800px;
+    height: 250px;
+    margin-top: 10px;
+    color: #fff;
+    .left {
+      width: 54%;
+      height: 100%;
+      border: 1px dashed #ececec;
+      border-radius: 4px;
+      text-align: center;
+      line-height: 200px;
+    }
+    .right {
+      width: 44%;
+      height: 100%;
+      border-radius: 4px;
+      .top {
+        height: 40%;
+        width: 100%;
+        border-radius: 4px;
+        background-size: 100% 100% !important;
+      }
+      .border {
+        border: 1px dashed #ececec;
+      }
+      .bottom {
+        height: 58%;
+        width: 100%;
+        border: 1px dashed #ececec;
+        border-radius: 4px;
+      }
+    }
+  }
+  .footer {
+    width: 800px;
+    color: #fff;
+  }
+}
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/surface/windowskin/WindowSkin.vue

 <template>
-  <div>
+  <div class="skin-box">
     <!-- 窗口屏 横板 -->
     <div
       :id="conponentsId"
       class="window-skin-across flex jcb aic"
+      v-if="imageResolution === '1'"
       :style="{
         background: filterItem('1', 0),
       }"
@@ -58,6 +59,17 @@
         <div class="footer-banner">Banner展示区</div>
       </div>
     </div>
+    <!-- 空数据显示 -->
+    <div class="empty flex aic jcc" v-else>
+      <a-empty
+        :image="require('../../../../assets/img/original.png')"
+        :image-style="{
+          height: '80px',
+        }"
+      >
+        <span slot="description"> <a href="#API">暂无皮肤模板</a> </span>
+      </a-empty>
+    </div>
   </div>
 </template>
 
@@ -82,41 +94,10 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_BASE_URL + "/",
     };
   },
   methods: {
-    // 过滤图片
-    // filterImg(val) {
-    //   let url = "";
-    //   this.skinFieldList
-    //     .filter((v) => {
-    //       return v.fieldType === "2";
-    //     })
-    //     .forEach((v) => {
-    //       if (v.fieldName !== "" && v.fieldName === val) {
-    //         url = v.fieldValue;
-    //       }
-    //     });
-    //   return url;
-    // },
-    // // 过滤颜色
-    // filterColor(val) {
-    //   let str = "";
-    //   this.skinFieldList
-    //     .filter((v) => {
-    //       return v.fieldType === "1";
-    //     })
-    //     .forEach((v) => {
-    //       if (v.fieldName !== "" && v.fieldName === val) {
-    //         str = v.fieldValue;
-    //       }
-    //     });
-    //   return str;
-    // },
-
     // 过滤属性类型
     filterItem(type, index) {
       let arr = this.skinFieldList.filter((v) => {

base-manager-ui/admin/src/pages/basicset/surface/writeFormSkin/WriteFormSkin.vue

+<template>
+  <div class="skin-box">
+    <!-- 样表机 横板 -->
+    <div
+      :id="conponentsId"
+      v-if="imageResolution === '1'"
+      class="sample_form_skin flex flexc aic"
+      :style="{
+        background: filterItem('1', 0),
+      }"
+    >
+      <!-- 头部 -->
+      <div class="header flex aic jcb">
+        <div class="left flex aic">
+          <img class="mr20" src="../../../../assets/img/logo.png" />
+          <div
+            class="title"
+            :style="{
+              color: filterItem('2', 0),
+            }"
+          >
+            政务服务中心
+          </div>
+        </div>
+        <div class="right flex aic">
+          <div class="flex aic mr10">
+            <span
+              :style="{
+                color: filterItem('2', 0),
+              }"
+              >今日节约能量：</span
+            >
+            <div class="count">66g</div>
+          </div>
+          <div class="flex aic">
+            <span
+              :style="{
+                color: filterItem('2', 0),
+              }"
+              >累计节约能量：</span
+            >
+            <div class="count">666kg</div>
+          </div>
+        </div>
+      </div>
+      <!-- 标题 -->
+      <img class="title-img" src="../../../../assets/img/tiandan.png" alt="" />
+      <!-- 搜索框 -->
+      <div class="search-box">
+        <div
+          class="search-box-btn flex aic jcc"
+          :style="{
+            background: `linear-gradient(90deg, ${filterItem(
+              '7',
+              0
+            )}, ${filterItem('8', 0)})`,
+          }"
+        >
+          <img src="../../../../assets/img/sousuo.png" />
+          搜索
+        </div>
+      </div>
+      <!-- 热门词汇 -->
+      <div class="hot-text">
+        <span>热门词汇：</span>
+      </div>
+      <!-- 主体内容 -->
+      <div class="main flex aic jcb">
+        <div class="left">热门排行区域</div>
+        <div class="right flex flexc jcb">
+          <div class="top flex aic jcb">
+            <div
+              class="btn1 flex jcc aic"
+              :style="{
+                background: filterItem('4', 0),
+              }"
+              :class="{ border: !filterItem('4', 0) }"
+            >
+              btn1
+            </div>
+            <div
+              class="btn2 flex jcc aic"
+              :style="{
+                background: filterItem('4', 1),
+              }"
+              :class="{ border: !filterItem('4', 1) }"
+            >
+              btn2
+            </div>
+          </div>
+          <div class="bottom flex aic jcc">应用区域</div>
+        </div>
+      </div>
+      <!-- 底部 -->
+      <div class="footer flex aic jca mt20">
+        <div class="flex flexc aic">
+          <span
+            :style="{
+              color: filterItem('5', 0),
+            }"
+            >入驻表单量</span
+          >
+          <span
+            :style="{
+              color: filterItem('7', 0),
+            }"
+            >20份</span
+          >
+        </div>
+        <div class="flex flexc aic">
+          <span
+            :style="{
+              color: filterItem('5', 0),
+            }"
+            >入驻事项量</span
+          >
+          <span
+            :style="{
+              color: filterItem('7', 0),
+            }"
+            >20件</span
+          >
+        </div>
+        <div class="flex flexc aic">
+          <span
+            :style="{
+              color: filterItem('5', 0),
+            }"
+            >本地打印量</span
+          >
+          <span
+            :style="{
+              color: filterItem('7', 0),
+            }"
+            >20次</span
+          >
+        </div>
+        <div class="flex flexc aic">
+          <span
+            :style="{
+              color: filterItem('5', 0),
+            }"
+            >在线提交量</span
+          >
+          <span
+            :style="{
+              color: filterItem('7', 0),
+            }"
+            >20次</span
+          >
+        </div>
+      </div>
+    </div>
+    <!-- 空数据显示 -->
+    <div class="empty flex aic jcc" v-else>
+      <a-empty
+        :image="require('../../../../assets/img/original.png')"
+        :image-style="{
+          height: '80px',
+        }"
+      >
+        <span slot="description"> <a href="#API">暂无皮肤模板</a> </span>
+      </a-empty>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    skinFieldList: {
+      type: Array,
+      required: true,
+      default: () => {
+        return [];
+      },
+    },
+    imageResolution: {
+      required: true,
+      default: "1",
+    },
+    conponentsId: {
+      required: true,
+      type: String,
+    },
+  },
+  data() {
+    return {
+      api: process.env.VUE_APP_API_BASE_URL + "/",
+    };
+  },
+  methods: {
+    // 过滤属性类型
+    filterItem(type, index) {
+      let arr = this.skinFieldList.filter((v) => {
+        return v.remark == type;
+      });
+      if (arr.length) {
+        return this.filterValueType(arr[index]);
+      } else {
+        return "";
+      }
+    },
+    // 过滤属性值类型
+    filterValueType(info = {}) {
+      let value = "";
+      if (info.fieldType !== "" && info.fieldType === "1" && info.fieldValue) {
+        value = info.fieldValue;
+      } else if (
+        info.fieldType !== "" &&
+        info.fieldType === "2" &&
+        info.fieldValue
+      ) {
+        value = `url(${this.api + info.fieldValue})`;
+      }
+      return value;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.sample_form_skin {
+  width: 1000px;
+  height: 562.5px;
+  padding: 20px;
+  background-image: linear-gradient(#26c5ff, #2c66ff);
+  background-repeat: no-repeat !important ;
+  background-position: center !important ;
+  background-size: cover !important ;
+  .header {
+    width: 100%;
+    color: #fff;
+    .title {
+      font-size: 30px;
+      font-weight: 600;
+    }
+    .right {
+      .count {
+        width: 50px;
+        height: 50px;
+        background: url("../../../../assets/img/pic_png_nengliang.png")
+          no-repeat center;
+        background-size: 100% 100%;
+        color: #317054;
+        text-align: center;
+        line-height: 50px;
+      }
+    }
+  }
+  .title-img {
+    width: 600px;
+    margin-top: 20px;
+  }
+  .search-box {
+    width: 600px;
+    height: 38px;
+    margin-top: 20px;
+    background: #ffffff;
+    box-shadow: 0px 7px 13px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 8px;
+    position: relative;
+    .search-box-btn {
+      width: 70px;
+      height: 30px;
+      background: linear-gradient(90deg, #0857e8, #59d1fe);
+      border-radius: 4px;
+      color: #fff;
+      position: absolute;
+      right: 4px;
+      top: 4px;
+      img {
+        width: 18px;
+        margin-right: 6px;
+      }
+    }
+  }
+  .hot-text {
+    width: 600px;
+    margin-top: 10px;
+    color: #fff;
+  }
+  .main {
+    width: 800px;
+    height: 250px;
+    margin-top: 10px;
+    color: #fff;
+    .left {
+      width: 49%;
+      height: 100%;
+      border: 1px dashed #ececec;
+      border-radius: 4px;
+      text-align: center;
+      line-height: 200px;
+    }
+    .right {
+      width: 49%;
+      height: 100%;
+      border-radius: 4px;
+      .top {
+        height: 49%;
+        width: 100%;
+        .btn1 {
+          height: 100%;
+          width: 54%;
+          border-radius: 4px;
+          background-size: 100% 100% !important;
+        }
+        .btn2 {
+          height: 100%;
+          width: 44%;
+          border-radius: 4px;
+          background-size: 100% 100% !important;
+        }
+      }
+      .border {
+        border: 1px dashed #ececec;
+      }
+      .bottom {
+        height: 49%;
+        width: 100%;
+        border: 1px dashed #ececec;
+        border-radius: 4px;
+      }
+    }
+  }
+  .footer {
+    width: 800px;
+    color: #fff;
+  }
+}
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue

@@ -180,7 +180,6 @@
                 list-type="picture-card"
                 class="avatar-uploader"
                 :show-upload-list="false"
-                :action="api + '/file/commonupload'"
                 :customRequest="uploadImg"
                 :before-upload="beforeUpload"
               >
@@ -322,9 +321,7 @@ export default {
       }
     };
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       loading: false,
       imageUrl: "",
       labelCol: { span: 5 },

base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue

@@ -185,7 +185,6 @@
                 list-type="picture-card"
                 class="avatar-uploader"
                 :show-upload-list="false"
-                :action="api + '/file/commonupload'"
                 :customRequest="uploadImg"
                 :before-upload="beforeUpload"
               >
@@ -384,9 +383,7 @@ export default {
       }
     };
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       loading: false,
       imageUrl: "",
       labelCol: { span: 5 },

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -326,9 +326,7 @@ export default {
       loading: false,
       visibleEditPwd: false,
       editVisible: false,
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       siteId: local.getLocal("siteId"),
       deptData: [], // 部门数据
       windowData: [], // 窗口数据

base-manager-ui/admin/src/services/api.js

 //跨域代理前缀
 // const API_PROXY_PREFIX='/api'
 // const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
-const BASE_URL = process.env.VUE_APP_API_BASE_URL
+const BASE_URL = process.env.VUE_APP_API_BASE_URL;
 module.exports = {
-  // LOGIN: `${BASE_URL}/login`,
-  LOGIN: `${BASE_URL}/admin/waited/login`,
-  // ROUTES: `${BASE_URL}/routes`
-  user:{
-    listdata:`${BASE_URL}/admin/user/listdata`,
-    save:`${BASE_URL}/admin/user/save`,
-    dl:`${BASE_URL}/admin/user/dl`,
-    usersite:`${BASE_URL}/admin/user/usersite`,
-  },
-  section:{
-    listdata:`${BASE_URL}/admin/section/listdata`,//部门列表
-    allupload:`${BASE_URL}/admin/section/allupload`,//部门-导入
-  },
-  kqset:{
-    save:`${BASE_URL}/admin/kqset/save`,//统一监测时间-修改提交
-    info:`${BASE_URL}/admin/kqset/info`,//统一监测时间-详情
-  },
-  window:{
-    save:`${BASE_URL}/admin/window/save`,//添加修改窗口
-    info:`${BASE_URL}/admin/window/info`,//窗口-详情
-    listdata:`${BASE_URL}/admin/window/listdata`,//窗口-列表
-    dl:`${BASE_URL}/admin/window/dl`,//窗口-删除
-    allupload:`${BASE_URL}/admin/window/allupload`,//窗口-导入
-    download:`${BASE_URL}/admin/window/download`,//窗口-导出
-    windowtree:`${BASE_URL}/admin/window/windowtree`,//部门窗口树
-  },
-  api:{
-    modelfile:`${BASE_URL}/api/model_file/modelfile`,//模板下载
-    file:`${BASE_URL}/api/upload/file`,//单/多文件上传
-    dlfile:`${BASE_URL}/api/upload/dlfile`,//模板下载
-    dictionary:`${BASE_URL}/api/dictionary/index`,//字典
-  },
-  device:{
-    save:`${BASE_URL}/admin/device/save`,//摄像头添加修改窗口
-    info:`${BASE_URL}/admin/device/info`,//摄像头-详情
-    listdata:`${BASE_URL}/admin/device/listdata`,//摄像头-列表
-    dl:`${BASE_URL}/admin/device/dl`,//摄像头-删除
-  },
-  area:{
-    save:`${BASE_URL}/admin/device/saveArea`,//摄像头-设置摄像头规则
-    info:`${BASE_URL}/admin/device/areainfo`,//摄像头-查询摄像头规则
-    dl:`${BASE_URL}/admin/device/dlarea`,//摄像头-清除规则
-  },
-  servers:{
-    save:`${BASE_URL}/admin/device/serversave`,//服务器添加修改窗口
-    info:`${BASE_URL}/admin/device/serversinfo`,//服务器-详情
-    listdata:`${BASE_URL}/admin/device/serverslist`,//服务器-列表
-    dl:`${BASE_URL}/admin/device/serversdl`,//服务器-删除
-  },
-  aimodel:{
-    save:`${BASE_URL}/admin/aimodel/save`,//摄像头添加修改窗口
-    info:`${BASE_URL}/admin/aimodel/info`,//摄像头-详情
-    listdata:`${BASE_URL}/admin/aimodel/listdata`,//摄像头-列表
-    dl:`${BASE_URL}/admin/aimodel/dl`,//摄像头-删除
-  },
-  windowinfo:{
-    info:`${BASE_URL}/admin/video/windowinfo`,//视频回放-详情
-    listdata:`${BASE_URL}/admin/video/windowtype`,//视频回放-列表
-  },
-  queue:{
-    listdata:`${BASE_URL}/admin/video/queue`,//按办件回放-列表
-  },
-  alert:{
-    listdata:`${BASE_URL}/admin/alert/listdata`,//监察记录-报警记录
-    info:`${BASE_URL}/admin/alert/info`,//监察记录-报警记录详情
-  },
-  appeal:{
-    listdata:`${BASE_URL}/admin/appeal/listdata`,//申诉-列表
-    info:`${BASE_URL}/admin/appeal/info`,//申诉-详情
-    appealsh:`${BASE_URL}/admin/appeal/appealsh`,//申诉-审批
-  },
-  position:{
-    save:`${BASE_URL}/admin/position/save`,//角色添加修改
-    info:`${BASE_URL}/admin/position/info`,//角色-详情
-    listdata:`${BASE_URL}/admin/position/listdata`,//角色-列表
-    dl:`${BASE_URL}/admin/position/dl`,//角色-删除
-    positionauth:`${BASE_URL}/admin/position/positionauth`,//角色-角色授权 功能授权
-  },
-  auth:{
-    listdata:`${BASE_URL}/admin/position/authlist`,//权限菜单列表
-  },
-  log:{
-    listdata:`${BASE_URL}/admin/log/listdata`,//日志列表
-  },
-  waited:{
-    listdata:`${BASE_URL}/admin/waited/sitelist`,//站点列表
-    savesite:`${BASE_URL}/admin/waited/savesite`,//切换站点-已登陆用户
-  },
-  edition:{
-    listdata:`${BASE_URL}/admin/edition/listdata`,//系统版本列表
-    save:`${BASE_URL}/admin/edition/save`,//系统版本添加修改
-  },
-  index:{
-    index:`${BASE_URL}/admin/index/index`,//首页-banner下方的今日统计情况汇总
-    anomaly:`${BASE_URL}/admin/index/anomaly`,//首页-数据分析
-    analysisfrom:`${BASE_URL}/admin/index/analysisfrom`,//分析报表-准确率
-    sectiontop:`${BASE_URL}/admin/index/sectiontop`,//分析报表-部门扣分 top5
-    ycdata:`${BASE_URL}/admin/index/ycdata`,//分析报表-异常行为情况展示
-    windowtop:`${BASE_URL}/admin/index/windowtop`,//分析报表-窗口扣分 top10
-  },
-  employee:{
-    save:`${BASE_URL}/admin/employee/save`,//监察组添加修改
-    info:`${BASE_URL}/admin/employee/info`,//监察组-详情
-    listdata:`${BASE_URL}/admin/employee/listdata`,//监察组-列表
-    dl:`${BASE_URL}/admin/employee/dl`,//监察组-删除
-  },
-  role:{
-    save:`${BASE_URL}/admin/role/save`,//指标管理-指标修改
-    listrole:`${BASE_URL}/admin/role/listdata`,//指标管理-分类列表
-    listdata:`${BASE_URL}/admin/role/standardlist`,//指标管理-指标列表 根据分类名查询
-  },
-}
+  // LOGIN: `${BASE_URL}/base/login`,
+  LOGIN: `${BASE_URL}/base/admin/waited/login`,
+  // ROUTES: `${BASE_URL}/base/routes`
+  user: {
+    listdata: `${BASE_URL}/base/admin/user/listdata`,
+    save: `${BASE_URL}/base/admin/user/save`,
+    dl: `${BASE_URL}/base/admin/user/dl`,
+    usersite: `${BASE_URL}/base/admin/user/usersite`,
+  },
+  section: {
+    listdata: `${BASE_URL}/base/admin/section/listdata`, //部门列表
+    allupload: `${BASE_URL}/base/admin/section/allupload`, //部门-导入
+  },
+  kqset: {
+    save: `${BASE_URL}/base/admin/kqset/save`, //统一监测时间-修改提交
+    info: `${BASE_URL}/base/admin/kqset/info`, //统一监测时间-详情
+  },
+  window: {
+    save: `${BASE_URL}/base/admin/window/save`, //添加修改窗口
+    info: `${BASE_URL}/base/admin/window/info`, //窗口-详情
+    listdata: `${BASE_URL}/base/admin/window/listdata`, //窗口-列表
+    dl: `${BASE_URL}/base/admin/window/dl`, //窗口-删除
+    allupload: `${BASE_URL}/base/admin/window/allupload`, //窗口-导入
+    download: `${BASE_URL}/base/admin/window/download`, //窗口-导出
+    windowtree: `${BASE_URL}/base/admin/window/windowtree`, //部门窗口树
+  },
+  api: {
+    modelfile: `${BASE_URL}/base/api/model_file/modelfile`, //模板下载
+    file: `${BASE_URL}/base/api/upload/file`, //单/多文件上传
+    dlfile: `${BASE_URL}/base/api/upload/dlfile`, //模板下载
+    dictionary: `${BASE_URL}/base/api/dictionary/index`, //字典
+  },
+  device: {
+    save: `${BASE_URL}/base/admin/device/save`, //摄像头添加修改窗口
+    info: `${BASE_URL}/base/admin/device/info`, //摄像头-详情
+    listdata: `${BASE_URL}/base/admin/device/listdata`, //摄像头-列表
+    dl: `${BASE_URL}/base/admin/device/dl`, //摄像头-删除
+  },
+  area: {
+    save: `${BASE_URL}/base/admin/device/saveArea`, //摄像头-设置摄像头规则
+    info: `${BASE_URL}/base/admin/device/areainfo`, //摄像头-查询摄像头规则
+    dl: `${BASE_URL}/base/admin/device/dlarea`, //摄像头-清除规则
+  },
+  servers: {
+    save: `${BASE_URL}/base/admin/device/serversave`, //服务器添加修改窗口
+    info: `${BASE_URL}/base/admin/device/serversinfo`, //服务器-详情
+    listdata: `${BASE_URL}/base/admin/device/serverslist`, //服务器-列表
+    dl: `${BASE_URL}/base/admin/device/serversdl`, //服务器-删除
+  },
+  aimodel: {
+    save: `${BASE_URL}/base/admin/aimodel/save`, //摄像头添加修改窗口
+    info: `${BASE_URL}/base/admin/aimodel/info`, //摄像头-详情
+    listdata: `${BASE_URL}/base/admin/aimodel/listdata`, //摄像头-列表
+    dl: `${BASE_URL}/base/admin/aimodel/dl`, //摄像头-删除
+  },
+  windowinfo: {
+    info: `${BASE_URL}/base/admin/video/windowinfo`, //视频回放-详情
+    listdata: `${BASE_URL}/base/admin/video/windowtype`, //视频回放-列表
+  },
+  queue: {
+    listdata: `${BASE_URL}/base/admin/video/queue`, //按办件回放-列表
+  },
+  alert: {
+    listdata: `${BASE_URL}/base/admin/alert/listdata`, //监察记录-报警记录
+    info: `${BASE_URL}/base/admin/alert/info`, //监察记录-报警记录详情
+  },
+  appeal: {
+    listdata: `${BASE_URL}/base/admin/appeal/listdata`, //申诉-列表
+    info: `${BASE_URL}/base/admin/appeal/info`, //申诉-详情
+    appealsh: `${BASE_URL}/base/admin/appeal/appealsh`, //申诉-审批
+  },
+  position: {
+    save: `${BASE_URL}/base/admin/position/save`, //角色添加修改
+    info: `${BASE_URL}/base/admin/position/info`, //角色-详情
+    listdata: `${BASE_URL}/base/admin/position/listdata`, //角色-列表
+    dl: `${BASE_URL}/base/admin/position/dl`, //角色-删除
+    positionauth: `${BASE_URL}/base/admin/position/positionauth`, //角色-角色授权 功能授权
+  },
+  auth: {
+    listdata: `${BASE_URL}/base/admin/position/authlist`, //权限菜单列表
+  },
+  log: {
+    listdata: `${BASE_URL}/base/admin/log/listdata`, //日志列表
+  },
+  waited: {
+    listdata: `${BASE_URL}/base/admin/waited/sitelist`, //站点列表
+    savesite: `${BASE_URL}/base/admin/waited/savesite`, //切换站点-已登陆用户
+  },
+  edition: {
+    listdata: `${BASE_URL}/base/admin/edition/listdata`, //系统版本列表
+    save: `${BASE_URL}/base/admin/edition/save`, //系统版本添加修改
+  },
+  index: {
+    index: `${BASE_URL}/base/admin/index/index`, //首页-banner下方的今日统计情况汇总
+    anomaly: `${BASE_URL}/base/admin/index/anomaly`, //首页-数据分析
+    analysisfrom: `${BASE_URL}/base/admin/index/analysisfrom`, //分析报表-准确率
+    sectiontop: `${BASE_URL}/base/admin/index/sectiontop`, //分析报表-部门扣分 top5
+    ycdata: `${BASE_URL}/base/admin/index/ycdata`, //分析报表-异常行为情况展示
+    windowtop: `${BASE_URL}/base/admin/index/windowtop`, //分析报表-窗口扣分 top10
+  },
+  employee: {
+    save: `${BASE_URL}/base/admin/employee/save`, //监察组添加修改
+    info: `${BASE_URL}/base/admin/employee/info`, //监察组-详情
+    listdata: `${BASE_URL}/base/admin/employee/listdata`, //监察组-列表
+    dl: `${BASE_URL}/base/admin/employee/dl`, //监察组-删除
+  },
+  role: {
+    save: `${BASE_URL}/base/admin/role/save`, //指标管理-指标修改
+    listrole: `${BASE_URL}/base/admin/role/listdata`, //指标管理-分类列表
+    listdata: `${BASE_URL}/base/admin/role/standardlist`, //指标管理-指标列表 根据分类名查询
+  },
+};

base-manager-ui/admin/src/services/basicsetApi.js

@@ -4,310 +4,310 @@ const BASE_URL =
     : process.env.VUE_APP_API_BASE_URL;
 module.exports = {
   loginapi: {
-    login: `${BASE_URL}/login/login`,
-    logout: `${BASE_URL}/login/logout`,
+    login: `${BASE_URL}/base/login/login`,
+    logout: `${BASE_URL}/base/login/logout`,
   },
   upload: {
-    file: `${BASE_URL}/file/commonupload`,
+    file: `${BASE_URL}/base/file/commonupload`,
   },
   // 模块
   model: {
-    list: `${BASE_URL}/model/list`,
-    edit: `${BASE_URL}/model/edit`,
-    info: `${BASE_URL}/model/info`,
-    save: `${BASE_URL}/model/save`,
-    delete: `${BASE_URL}/model/delete`,
+    list: `${BASE_URL}/base/model/list`,
+    edit: `${BASE_URL}/base/model/edit`,
+    info: `${BASE_URL}/base/model/info`,
+    save: `${BASE_URL}/base/model/save`,
+    delete: `${BASE_URL}/base/model/delete`,
   },
   // 区域
   area: {
-    list: `${BASE_URL}/area/list`,
-    edit: `${BASE_URL}/area/edit`,
-    info: `${BASE_URL}/area/info`,
-    getListByParentId: `${BASE_URL}/area/getListByParentId`,
-    treeselect: `${BASE_URL}/area/treeselect`,
-    save: `${BASE_URL}/area/save`,
-    delete: `${BASE_URL}/area/delete`,
-    init: `${BASE_URL}/base/area/genSubAreaByAreaName  `,
+    list: `${BASE_URL}/base/area/list`,
+    edit: `${BASE_URL}/base/area/edit`,
+    info: `${BASE_URL}/base/area/info`,
+    getListByParentId: `${BASE_URL}/base/area/getListByParentId`,
+    treeselect: `${BASE_URL}/base/area/treeselect`,
+    save: `${BASE_URL}/base/area/save`,
+    delete: `${BASE_URL}/base/area/delete`,
+    init: `${BASE_URL}/base/base/area/genSubAreaByAreaName  `,
   },
   // 站点
   site: {
-    list: `${BASE_URL}/site/list`,
-    edit: `${BASE_URL}/site/edit`,
-    info: `${BASE_URL}/site/info`,
-    save: `${BASE_URL}/site/save`,
-    delete: `${BASE_URL}/site/delete`,
-    exportExcel: `${BASE_URL}/site/exportExcel`,
-    siteTree: `${BASE_URL}/site/siteTree`,
-    syncData: `${BASE_URL}/site/syncGovMatterBySiteId `,
+    list: `${BASE_URL}/base/site/list`,
+    edit: `${BASE_URL}/base/site/edit`,
+    info: `${BASE_URL}/base/site/info`,
+    save: `${BASE_URL}/base/site/save`,
+    delete: `${BASE_URL}/base/site/delete`,
+    exportExcel: `${BASE_URL}/base/site/exportExcel`,
+    siteTree: `${BASE_URL}/base/site/siteTree`,
+    syncData: `${BASE_URL}/base/site/syncGovMatterBySiteId `,
   },
   // 站点事项
   sitematter: {
-    list: `${BASE_URL}/site/matter/list`,
-    edit: `${BASE_URL}/site/matter/edit`,
-    info: `${BASE_URL}/site/matter/info`,
-    save: `${BASE_URL}/site/matter/save`,
-    delete: `${BASE_URL}/site/matter/delete`,
+    list: `${BASE_URL}/base/site/matter/list`,
+    edit: `${BASE_URL}/base/site/matter/edit`,
+    info: `${BASE_URL}/base/site/matter/info`,
+    save: `${BASE_URL}/base/site/matter/save`,
+    delete: `${BASE_URL}/base/site/matter/delete`,
   },
   // 业务
   business: {
-    list: `${BASE_URL}/business/list`,
-    edit: `${BASE_URL}/business/edit`,
-    info: `${BASE_URL}/business/info`,
-    save: `${BASE_URL}/business/save`,
-    delete: `${BASE_URL}/business/delete`,
-    addBusinessToSite: `${BASE_URL}/business/addBusinessToSite`,
+    list: `${BASE_URL}/base/business/list`,
+    edit: `${BASE_URL}/base/business/edit`,
+    info: `${BASE_URL}/base/business/info`,
+    save: `${BASE_URL}/base/business/save`,
+    delete: `${BASE_URL}/base/business/delete`,
+    addBusinessToSite: `${BASE_URL}/base/business/addBusinessToSite`,
   },
   // 基础事项
   matter: {
-    list: `${BASE_URL}/matter/list`,
-    edit: `${BASE_URL}/matter/edit`,
-    info: `${BASE_URL}/matter/info`,
-    save: `${BASE_URL}/matter/save`,
-    delete: `${BASE_URL}/matter/delete`,
-    addMatterToSite: `${BASE_URL}/matter/addMatterToSite`,
-    exportExcel: `${BASE_URL}/matter/exportExcel`,
-    matterList: `${BASE_URL}/matter/sublist`,
+    list: `${BASE_URL}/base/matter/list`,
+    edit: `${BASE_URL}/base/matter/edit`,
+    info: `${BASE_URL}/base/matter/info`,
+    save: `${BASE_URL}/base/matter/save`,
+    delete: `${BASE_URL}/base/matter/delete`,
+    addMatterToSite: `${BASE_URL}/base/matter/addMatterToSite`,
+    exportExcel: `${BASE_URL}/base/matter/exportExcel`,
+    matterList: `${BASE_URL}/base/matter/sublist`,
   },
   //  事项申请材料
   matterdatum: {
-    list: `${BASE_URL}/matter/datum/list`,
-    edit: `${BASE_URL}/matter/datum/edit`,
-    info: `${BASE_URL}/matter/datum/info`,
-    save: `${BASE_URL}/matter/datum/save`,
-    delete: `${BASE_URL}/matter/datum/delete`,
-    exportExcel: `${BASE_URL}/matter/datum/exportExcel`,
+    list: `${BASE_URL}/base/matter/datum/list`,
+    edit: `${BASE_URL}/base/matter/datum/edit`,
+    info: `${BASE_URL}/base/matter/datum/info`,
+    save: `${BASE_URL}/base/matter/datum/save`,
+    delete: `${BASE_URL}/base/matter/datum/delete`,
+    exportExcel: `${BASE_URL}/base/matter/datum/exportExcel`,
   },
   // 事项受理条件
   matteraccept: {
-    list: `${BASE_URL}/matter/accept/list`,
-    edit: `${BASE_URL}/matter/accept/edit`,
-    info: `${BASE_URL}/matter/accept/info`,
-    save: `${BASE_URL}/matter/accept/save`,
-    delete: `${BASE_URL}/matter/accept/delete`,
-    exportExcel: `${BASE_URL}/matter/accept/exportExcel`,
+    list: `${BASE_URL}/base/matter/accept/list`,
+    edit: `${BASE_URL}/base/matter/accept/edit`,
+    info: `${BASE_URL}/base/matter/accept/info`,
+    save: `${BASE_URL}/base/matter/accept/save`,
+    delete: `${BASE_URL}/base/matter/accept/delete`,
+    exportExcel: `${BASE_URL}/base/matter/accept/exportExcel`,
   },
   // 事项收费标准
   mattercharges: {
-    list: `${BASE_URL}/matter/charges/list`,
-    edit: `${BASE_URL}/matter/charges/edit`,
-    info: `${BASE_URL}/matter/charges/info`,
-    save: `${BASE_URL}/matter/charges/save`,
-    delete: `${BASE_URL}/matter/charges/delete`,
-    exportExcel: `${BASE_URL}/matter/charges/exportExcel`,
+    list: `${BASE_URL}/base/matter/charges/list`,
+    edit: `${BASE_URL}/base/matter/charges/edit`,
+    info: `${BASE_URL}/base/matter/charges/info`,
+    save: `${BASE_URL}/base/matter/charges/save`,
+    delete: `${BASE_URL}/base/matter/charges/delete`,
+    exportExcel: `${BASE_URL}/base/matter/charges/exportExcel`,
   },
   // 材料附件
   matterdatumfile: {
-    list: `${BASE_URL}/matter/datum/file/list`,
-    edit: `${BASE_URL}/matter/datum/file/edit`,
-    info: `${BASE_URL}/matter/datum/file/info`,
-    save: `${BASE_URL}/matter/datum/file/save`,
-    delete: `${BASE_URL}/matter/datum/file/delete`,
-    exportExcel: `${BASE_URL}/matter/datum/file/exportExcel`,
+    list: `${BASE_URL}/base/matter/datum/file/list`,
+    edit: `${BASE_URL}/base/matter/datum/file/edit`,
+    info: `${BASE_URL}/base/matter/datum/file/info`,
+    save: `${BASE_URL}/base/matter/datum/file/save`,
+    delete: `${BASE_URL}/base/matter/datum/file/delete`,
+    exportExcel: `${BASE_URL}/base/matter/datum/file/exportExcel`,
   },
   // 事项办理流程
   matterflowlimit: {
-    list: `${BASE_URL}/matter/flowlimit/list`,
-    edit: `${BASE_URL}/matter/flowlimit/edit`,
-    info: `${BASE_URL}/matter/flowlimit/info`,
-    save: `${BASE_URL}/matter/flowlimit/save`,
-    delete: `${BASE_URL}/matter/flowlimit/delete`,
-    exportExcel: `${BASE_URL}/matter/flowlimit/exportExcel`,
+    list: `${BASE_URL}/base/matter/flowlimit/list`,
+    edit: `${BASE_URL}/base/matter/flowlimit/edit`,
+    info: `${BASE_URL}/base/matter/flowlimit/info`,
+    save: `${BASE_URL}/base/matter/flowlimit/save`,
+    delete: `${BASE_URL}/base/matter/flowlimit/delete`,
+    exportExcel: `${BASE_URL}/base/matter/flowlimit/exportExcel`,
   },
   // 事项中介服务
   matterintermediary: {
-    list: `${BASE_URL}/matter/intermediary/list`,
-    edit: `${BASE_URL}/matter/intermediary/edit`,
-    info: `${BASE_URL}/matter/intermediary/info`,
-    save: `${BASE_URL}/matter/intermediary/save`,
-    delete: `${BASE_URL}/matter/intermediary/delete`,
-    exportExcel: `${BASE_URL}/matter/intermediary/exportExcel`,
+    list: `${BASE_URL}/base/matter/intermediary/list`,
+    edit: `${BASE_URL}/base/matter/intermediary/edit`,
+    info: `${BASE_URL}/base/matter/intermediary/info`,
+    save: `${BASE_URL}/base/matter/intermediary/save`,
+    delete: `${BASE_URL}/base/matter/intermediary/delete`,
+    exportExcel: `${BASE_URL}/base/matter/intermediary/exportExcel`,
   },
   // 事项常见问题
   matterquestion: {
-    list: `${BASE_URL}/matter/question/list`,
-    edit: `${BASE_URL}/matter/question/edit`,
-    info: `${BASE_URL}/matter/question/info`,
-    save: `${BASE_URL}/matter/question/save`,
-    delete: `${BASE_URL}/matter/question/delete`,
-    exportExcel: `${BASE_URL}/matter/question/exportExcel`,
+    list: `${BASE_URL}/base/matter/question/list`,
+    edit: `${BASE_URL}/base/matter/question/edit`,
+    info: `${BASE_URL}/base/matter/question/info`,
+    save: `${BASE_URL}/base/matter/question/save`,
+    delete: `${BASE_URL}/base/matter/question/delete`,
+    exportExcel: `${BASE_URL}/base/matter/question/exportExcel`,
   },
   // 事项设定依据
   mattersetbase: {
-    list: `${BASE_URL}/matter/setbase/list`,
-    edit: `${BASE_URL}/matter/setbase/edit`,
-    info: `${BASE_URL}/matter/setbase/info`,
-    save: `${BASE_URL}/matter/setbase/save`,
-    delete: `${BASE_URL}/matter/setbase/delete`,
-    exportExcel: `${BASE_URL}/matter/setbase/exportExcel`,
+    list: `${BASE_URL}/base/matter/setbase/list`,
+    edit: `${BASE_URL}/base/matter/setbase/edit`,
+    info: `${BASE_URL}/base/matter/setbase/info`,
+    save: `${BASE_URL}/base/matter/setbase/save`,
+    delete: `${BASE_URL}/base/matter/setbase/delete`,
+    exportExcel: `${BASE_URL}/base/matter/setbase/exportExcel`,
   },
   // 部门
   dept: {
-    list: `${BASE_URL}/dept/list`,
-    edit: `${BASE_URL}/dept/edit`,
-    info: `${BASE_URL}/dept/info`,
-    save: `${BASE_URL}/dept/save`,
-    delete: `${BASE_URL}/dept/delete`,
+    list: `${BASE_URL}/base/dept/list`,
+    edit: `${BASE_URL}/base/dept/edit`,
+    info: `${BASE_URL}/base/dept/info`,
+    save: `${BASE_URL}/base/dept/save`,
+    delete: `${BASE_URL}/base/dept/delete`,
   },
   // 站点部门窗口
   window: {
-    list: `${BASE_URL}/window/list`,
-    edit: `${BASE_URL}/window/edit`,
-    info: `${BASE_URL}/window/info`,
-    save: `${BASE_URL}/window/save`,
-    delete: `${BASE_URL}/window/delete`,
-    exportExcel: `${BASE_URL}/window/exportExcel`,
+    list: `${BASE_URL}/base/window/list`,
+    edit: `${BASE_URL}/base/window/edit`,
+    info: `${BASE_URL}/base/window/info`,
+    save: `${BASE_URL}/base/window/save`,
+    delete: `${BASE_URL}/base/window/delete`,
+    exportExcel: `${BASE_URL}/base/window/exportExcel`,
   },
   // 工作人员
   workman: {
-    list: `${BASE_URL}/workman/list`,
-    edit: `${BASE_URL}/workman/edit`,
-    info: `${BASE_URL}/workman/info`,
-    save: `${BASE_URL}/workman/save`,
-    delete: `${BASE_URL}/workman/delete`,
-    downloadTemplate: `${BASE_URL}/workman/downloadTemplate`,
-    importData: `${BASE_URL}/workman/importData`,
-    exportExcel: `${BASE_URL}/workman/exportExcel`,
-    changePwd: `${BASE_URL}/workman/change/password`,
+    list: `${BASE_URL}/base/workman/list`,
+    edit: `${BASE_URL}/base/workman/edit`,
+    info: `${BASE_URL}/base/workman/info`,
+    save: `${BASE_URL}/base/workman/save`,
+    delete: `${BASE_URL}/base/workman/delete`,
+    downloadTemplate: `${BASE_URL}/base/workman/downloadTemplate`,
+    importData: `${BASE_URL}/base/workman/importData`,
+    exportExcel: `${BASE_URL}/base/workman/exportExcel`,
+    changePwd: `${BASE_URL}/base/workman/change/password`,
   },
   // 站点业务
   sitebusiness: {
-    list: `${BASE_URL}/site/business/list`,
-    edit: `${BASE_URL}/site/business/edit`,
-    info: `${BASE_URL}/site/business/info`,
-    save: `${BASE_URL}/site/business/save`,
-    delete: `${BASE_URL}/site/business/delete`,
-    exportExcel: `${BASE_URL}/site/business/exportExcel`,
+    list: `${BASE_URL}/base/site/business/list`,
+    edit: `${BASE_URL}/base/site/business/edit`,
+    info: `${BASE_URL}/base/site/business/info`,
+    save: `${BASE_URL}/base/site/business/save`,
+    delete: `${BASE_URL}/base/site/business/delete`,
+    exportExcel: `${BASE_URL}/base/site/business/exportExcel`,
   },
   // 业务事项关联
   businessmatter: {
-    list: `${BASE_URL}/business/matter/list`,
-    edit: `${BASE_URL}/business/matter/edit`,
-    info: `${BASE_URL}/business/matter/info`,
-    save: `${BASE_URL}/business/matter/save`,
-    delete: `${BASE_URL}/business/matter/delete`,
-    businesslist: `${BASE_URL}/business/matter/businesslist`,
-    matterlist: `${BASE_URL}/business/matter/matterlist`,
-    batchSave: `${BASE_URL}/business/matter/batchSave`,
+    list: `${BASE_URL}/base/business/matter/list`,
+    edit: `${BASE_URL}/base/business/matter/edit`,
+    info: `${BASE_URL}/base/business/matter/info`,
+    save: `${BASE_URL}/base/business/matter/save`,
+    delete: `${BASE_URL}/base/business/matter/delete`,
+    businesslist: `${BASE_URL}/base/business/matter/businesslist`,
+    matterlist: `${BASE_URL}/base/business/matter/matterlist`,
+    batchSave: `${BASE_URL}/base/business/matter/batchSave`,
   },
   // 窗口业务
   windowbusiness: {
-    list: `${BASE_URL}/window/business/list`,
-    edit: `${BASE_URL}/window/business/edit`,
-    info: `${BASE_URL}/window/business/info`,
-    addBusinessToWindow: `${BASE_URL}/window/addBusinessToWindow `,
-    save: `${BASE_URL}/window/business/save`,
-    delete: `${BASE_URL}/window/business/delete`,
+    list: `${BASE_URL}/base/window/business/list`,
+    edit: `${BASE_URL}/base/window/business/edit`,
+    info: `${BASE_URL}/base/window/business/info`,
+    addBusinessToWindow: `${BASE_URL}/base/window/addBusinessToWindow `,
+    save: `${BASE_URL}/base/window/business/save`,
+    delete: `${BASE_URL}/base/window/business/delete`,
   },
   // 窗口事项
   windowmatter: {
-    list: `${BASE_URL}/window/matter/list`,
-    edit: `${BASE_URL}/window/matter/edit`,
-    info: `${BASE_URL}/window/matter/info`,
-    save: `${BASE_URL}/window/matter/save`,
-    delete: `${BASE_URL}/window/matter/delete`,
+    list: `${BASE_URL}/base/window/matter/list`,
+    edit: `${BASE_URL}/base/window/matter/edit`,
+    info: `${BASE_URL}/base/window/matter/info`,
+    save: `${BASE_URL}/base/window/matter/save`,
+    delete: `${BASE_URL}/base/window/matter/delete`,
   },
   // 短信设置
   smsset: {
-    list: `${BASE_URL}/sms/set/list`,
-    edit: `${BASE_URL}/sms/set/edit`,
-    info: `${BASE_URL}/sms/set/info`,
-    save: `${BASE_URL}/sms/set/save`,
-    delete: `${BASE_URL}/sms/set/delete`,
+    list: `${BASE_URL}/base/sms/set/list`,
+    edit: `${BASE_URL}/base/sms/set/edit`,
+    info: `${BASE_URL}/base/sms/set/info`,
+    save: `${BASE_URL}/base/sms/set/save`,
+    delete: `${BASE_URL}/base/sms/set/delete`,
   },
   // 短信模板
   smsssmstemplateet: {
-    list: `${BASE_URL}/sms/template/list`,
-    edit: `${BASE_URL}/sms/template/edit`,
-    info: `${BASE_URL}/sms/template/info`,
-    save: `${BASE_URL}/sms/template/save`,
-    delete: `${BASE_URL}/sms/template/delete`,
-    exportExcel: `${BASE_URL}/sms/template/exportExcel`,
+    list: `${BASE_URL}/base/sms/template/list`,
+    edit: `${BASE_URL}/base/sms/template/edit`,
+    info: `${BASE_URL}/base/sms/template/info`,
+    save: `${BASE_URL}/base/sms/template/save`,
+    delete: `${BASE_URL}/base/sms/template/delete`,
+    exportExcel: `${BASE_URL}/base/sms/template/exportExcel`,
   },
   // 站点短信设置
   siteSmsset: {
-    list: `${BASE_URL}/sms/set/list`,
-    save: `${BASE_URL}/sms/set/save`,
+    list: `${BASE_URL}/base/sms/set/list`,
+    save: `${BASE_URL}/base/sms/set/save`,
   },
   // 节假日
   holiday: {
-    list: `${BASE_URL}/holiday/list`,
-    edit: `${BASE_URL}/holiday/edit`,
-    info: `${BASE_URL}/holiday/info`,
-    save: `${BASE_URL}/holiday/save`,
-    delete: `${BASE_URL}/holiday/delete`,
-    exportExcel: `${BASE_URL}/holiday/exportExcel`,
+    list: `${BASE_URL}/base/holiday/list`,
+    edit: `${BASE_URL}/base/holiday/edit`,
+    info: `${BASE_URL}/base/holiday/info`,
+    save: `${BASE_URL}/base/holiday/save`,
+    delete: `${BASE_URL}/base/holiday/delete`,
+    exportExcel: `${BASE_URL}/base/holiday/exportExcel`,
   },
   // 系统皮肤
   skin: {
-    list: `${BASE_URL}/skin/base/list`,
-    info: `${BASE_URL}/skin/base/info`,
-    save: `${BASE_URL}/skin/base/save`,
-    delete: `${BASE_URL}/skin/base/delete`,
+    list: `${BASE_URL}/base/skin/base/list`,
+    info: `${BASE_URL}/base/skin/base/info`,
+    save: `${BASE_URL}/base/skin/base/save`,
+    delete: `${BASE_URL}/base/skin/base/delete`,
   },
   // 皮肤分类
   category: {
-    list: `${BASE_URL}/skin/category/list`,
-    info: `${BASE_URL}/skin/category/info`,
-    save: `${BASE_URL}/skin/category/save`,
-    delete: `${BASE_URL}/skin/category/delete`,
+    list: `${BASE_URL}/base/skin/category/list`,
+    info: `${BASE_URL}/base/skin/category/info`,
+    save: `${BASE_URL}/base/skin/category/save`,
+    delete: `${BASE_URL}/base/skin/category/delete`,
   },
   // 产品
   product: {
-    list: `${BASE_URL}/product/list`,
-    info: `${BASE_URL}/product/info`,
-    save: `${BASE_URL}/product/save`,
-    delete: `${BASE_URL}/product/delete`,
+    list: `${BASE_URL}/base/product/list`,
+    info: `${BASE_URL}/base/product/info`,
+    save: `${BASE_URL}/base/product/save`,
+    delete: `${BASE_URL}/base/product/delete`,
   },
   // 系统皮肤模块
   template: {
-    list: `${BASE_URL}/skin/template/list`,
-    info: `${BASE_URL}/skin/template/info`,
-    save: `${BASE_URL}/skin/template/save`,
-    delete: `${BASE_URL}/skin/template/delete`,
+    list: `${BASE_URL}/base/skin/template/list`,
+    info: `${BASE_URL}/base/skin/template/info`,
+    save: `${BASE_URL}/base/skin/template/save`,
+    delete: `${BASE_URL}/base/skin/template/delete`,
   },
   // 皮肤属性字段
   field: {
-    list: `${BASE_URL}/skin/field/list`,
-    info: `${BASE_URL}/skin/field/info`,
-    save: `${BASE_URL}/skin/field/save`,
-    delete: `${BASE_URL}/skin/field/delete`,
+    list: `${BASE_URL}/base/skin/field/list`,
+    info: `${BASE_URL}/base/skin/field/info`,
+    save: `${BASE_URL}/base/skin/field/save`,
+    delete: `${BASE_URL}/base/skin/field/delete`,
   },
   // 应用集市
   App: {
-    list: `${BASE_URL}/app/list`,
-    info: `${BASE_URL}/app/info`,
-    save: `${BASE_URL}/app/save`,
-    delete: `${BASE_URL}/app/delete`,
-    distribute: `${BASE_URL}/app/appDistribute`,
-    clone: `${BASE_URL}/app/cloneAppsBySites`,
+    list: `${BASE_URL}/base/app/list`,
+    info: `${BASE_URL}/base/app/info`,
+    save: `${BASE_URL}/base/app/save`,
+    delete: `${BASE_URL}/base/app/delete`,
+    distribute: `${BASE_URL}/base/app/appDistribute`,
+    clone: `${BASE_URL}/base/app/cloneAppsBySites`,
   },
   // 应用数据
   dataset: {
-    list: `${BASE_URL}/app/dataset/list`,
-    info: `${BASE_URL}/app/dataset/info`,
-    save: `${BASE_URL}/app/dataset/save`,
-    delete: `${BASE_URL}/app/dataset/delete`,
+    list: `${BASE_URL}/base/app/dataset/list`,
+    info: `${BASE_URL}/base/app/dataset/info`,
+    save: `${BASE_URL}/base/app/dataset/save`,
+    delete: `${BASE_URL}/base/app/dataset/delete`,
   },
   // 应用信息字段配置
   appField: {
-    list: `${BASE_URL}/app/info/field/list`,
-    info: `${BASE_URL}/app/info/field/info`,
-    save: `${BASE_URL}/app/info/field/save`,
-    delete: `${BASE_URL}/app/info/field/delete`,
+    list: `${BASE_URL}/base/app/info/field/list`,
+    info: `${BASE_URL}/base/app/info/field/info`,
+    save: `${BASE_URL}/base/app/info/field/save`,
+    delete: `${BASE_URL}/base/app/info/field/delete`,
   },
   // 应用信息模板
   templete: {
-    list: `${BASE_URL}/app/info/templete/field/list`,
-    info: `${BASE_URL}/app/info/templete/field/info`,
-    save: `${BASE_URL}/app/info/templete/field/save`,
-    delete: `${BASE_URL}/app/info/templete/field/delete`,
+    list: `${BASE_URL}/base/app/info/templete/field/list`,
+    info: `${BASE_URL}/base/app/info/templete/field/info`,
+    save: `${BASE_URL}/base/app/info/templete/field/save`,
+    delete: `${BASE_URL}/base/app/info/templete/field/delete`,
   },
   // 应用历史版本
   version: {
-    list: `${BASE_URL}/app/version/list`,
-    info: `${BASE_URL}/app/version/info`,
-    delete: `${BASE_URL}/app/version/delete`,
-    used: `${BASE_URL}/app/version/used`,
-    preview: `${BASE_URL}/app/version/preview`,
+    list: `${BASE_URL}/base/app/version/list`,
+    info: `${BASE_URL}/base/app/version/info`,
+    delete: `${BASE_URL}/base/app/version/delete`,
+    used: `${BASE_URL}/base/app/version/used`,
+    preview: `${BASE_URL}/base/app/version/preview`,
   },
 };

base-manager-ui/admin/src/utils/axios-interceptors.js

 // import Cookie from 'js-cookie'
-import local from '@/utils/local'
-import {message} from 'ant-design-vue'
+import local from "@/utils/local";
+import { message } from "ant-design-vue";
 
 // 401拦截
 // const resp401 = {
@@ -33,25 +33,24 @@ import {message} from 'ant-design-vue'
 //   }
 // }
 
-
 const resMsg = {
   onFulfilled(response) {
-   let {code,msg} = response.data
-   if(code === 9001 || code === 9002){
+    let { code, msg } = response.data;
+    if (code === 9001 || code === 9002) {
       message.error({
-      content:msg,
-      maxCount:1,
-    })
-    setTimeout(()=>{
-      location.href = process.env.VUE_APP_API_portal_URL + "/#/"
-    },2000)
-   }else if(code === -1){
+        content: msg,
+        maxCount: 1,
+      });
+      setTimeout(() => {
+        location.href = process.env.VUE_APP_API_portal_URL + "/#/";
+      }, 2000);
+    } else if (code === -1) {
       message.error({
-      content:msg,
-      maxCount:1,
-    })
+        content: msg,
+        maxCount: 1,
+      });
     }
-    return response
+    return response;
   },
   onRejected(error) {
     // const {message} = options
@@ -59,9 +58,9 @@ const resMsg = {
     // if (response.code === 403) {
     //   message.error('请求被拒绝')
     // }
-    return Promise.reject(error)
-  }
-}
+    return Promise.reject(error);
+  },
+};
 
 const reqCommon = {
   /**
@@ -72,11 +71,11 @@ const reqCommon = {
    */
   onFulfilled(config) {
     // 携带token
-    let token = local.getLocal('token')
-    if(token){
-      config.headers.Authorization=token
+    let token = local.getLocal("token");
+    if (token) {
+      config.headers.Authorization = token;
     }
-    return config
+    return config;
   },
   /**
    * 请求出错时做点什么
@@ -87,12 +86,12 @@ const reqCommon = {
   onRejected(error) {
     // const {message} = options
     // message.error(error.message)
-    return Promise.reject(error)
-  }
-}
+    return Promise.reject(error);
+  },
+};
 
 export default {
   request: [reqCommon], // 请求拦截
   // response: [resp401, resp403] // 响应拦截
-  response: [resMsg] // 响应拦截
-}
+  response: [resMsg], // 响应拦截
+};