Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/src/App.vue

@@ -45,7 +45,7 @@ export default {
         },
         serviceInfo: {
           homeUrl: "http://192.168.0.24:8080/#/",
-          serverUrl: "http://10.12.185.213:11098",
+          serverUrl: "http://192.168.0.98:11078/",
         },
       };
       this.WebSocketMq(obj);
@@ -120,7 +120,6 @@ export default {
   width: 100%;
   height: 100%;
   background-color: #f5f5f5;
-  font-family: Source Han Sans CN;
   // display: flex;
   // overflow: auto;
   // &::-webkit-scrollbar {

sample-form-client-ui/admin/src/api/index.js

 // 事项api
 import local from "@/utils/local";
 import request from "@/utils/request";
-let baseUrl = local.getLocal("serverUrl");
-let siteId = local.getLocal("siteId");
-let devicenum = local.getLocal("devicenum");
 // 首页数据展示
 export const getHomeInfo = (data) => {
+  let baseUrl = local.getLocal("serverUrl");
+  let siteId = local.getLocal("siteId");
+  let devicenum = local.getLocal("devicenum");
   return request({
-    url: `${baseUrl}/sampleform/home/info`,
+    url: `${baseUrl}sampleform/home/info`,
     method: "post",
     data: {
       siteId,
@@ -19,8 +19,10 @@ export const getHomeInfo = (data) => {
 
 // 获取部门列表
 export const getdeptList = (data) => {
+  let baseUrl = local.getLocal("serverUrl");
+  let siteId = local.getLocal("siteId");
   return request({
-    url: `${baseUrl}/sampleform/home/depts`,
+    url: `${baseUrl}sampleform/home/depts`,
     method: "post",
     data: {
       siteId,
@@ -31,8 +33,10 @@ export const getdeptList = (data) => {
 
 // 查询事项列表
 export const getWriteMatterList = (data) => {
+  let baseUrl = local.getLocal("serverUrl");
+  let siteId = local.getLocal("siteId");
   return request({
-    url: `${baseUrl}/sampleform/matter/list`,
+    url: `${baseUrl}sampleform/matter/list`,
     method: "post",
     data: {
       siteId,
@@ -43,8 +47,10 @@ export const getWriteMatterList = (data) => {
 
 //   查询材料列表
 export const getMaterialsList = (data) => {
+  let baseUrl = local.getLocal("serverUrl");
+  let siteId = local.getLocal("siteId");
   return request({
-    url: `${baseUrl}/sampleform/matter/datum/list`,
+    url: `${baseUrl}sampleform/matter/datum/list`,
     method: "post",
     data: {
       siteId,
@@ -55,8 +61,10 @@ export const getMaterialsList = (data) => {
 
 // 表单合成
 export const mergeFormToDocx = (data) => {
+  let baseUrl = local.getLocal("serverUrl");
+  let siteId = local.getLocal("siteId");
   return request({
-    url: `${baseUrl}/sampleform/home/mergeFormToDocx`,
+    url: `${baseUrl}sampleform/home/mergeFormToDocx`,
     method: "post",
     data: {
       siteId,

sample-form-client-ui/admin/src/components/MateralsList.vue

@@ -69,7 +69,7 @@ export default {
   },
   data() {
     return {
-      api: local.getLocal("baseUrl") + "/",
+      api: local.getLocal("serverUrl") + "/",
       row: 4,
     };
   },

sample-form-client-ui/admin/src/mixin/mq.js

@@ -192,9 +192,12 @@ export default {
     WebSocketMq(objc) {
       var obj = objc.rabbmitInfo; //mq信息
       var serviceInfo = objc.serviceInfo; //服务器信息
+      var deviceInfo = objc.deviceInfo; //设备信息
       var serverUrl = serviceInfo.serverUrl; //系统地址
+      var siteId = deviceInfo.siteId; //站点id
       // 保存地址
       local.setLocal("serverUrl", serverUrl);
+      local.setLocal("siteId", siteId);
       // 初始化接口
       setTimeout(() => {
         // 查询站点信息

sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue

@@ -109,9 +109,7 @@ export default {
   },
   data() {
     return {
-      api: local.getLocal("baseUrl")
-        ? local.getLocal("baseUrl") + "/"
-        : "http://192.168.0.98:11078/",
+      api: local.getLocal("serverUrl") + "/",
       matterInfo: this.$route.query,
       materailsList: [],
       active: 0,

sample-form-client-ui/admin/vue.config.js

@@ -2,13 +2,13 @@ const { defineConfig } = require("@vue/cli-service");
 const FileManagerPlugin = require("filemanager-webpack-plugin"); // 压缩文件夹
 const isDev = process.env.NODE_ENV === "development";
 let plugins = [];
-// 避免打本地启项目时自动打zip包
+// 避免本地启项目时自动打zip包
 if (!isDev) {
   plugins.push(
     new FileManagerPlugin({
       events: {
         onEnd: {
-          mkdir: ["./dist"],
+          // mkdir: ["./dist"],
           delete: ["./样表终端系统.zip"],
           archive: [{ source: "./dist", destination: "./样表终端系统.zip" }],
         },