Przeglądaj źródła

store功能优化

fanghuisheng 1 rok temu
rodzic
commit
63a9e7f788
64 zmienionych plików z 129 dodań i 129 usunięć
  1. 1 1
      src/pages/business/fireIot/alarmManage/alarmDetails/index.vue
  2. 2 2
      src/pages/business/fireIot/alarmManage/alarmDetailsList/index.vue
  3. 1 1
      src/pages/business/fireIot/alarmManage/index.vue
  4. 14 14
      src/pages/business/fireIot/deviceManage/components/deviceDetails.vue
  5. 4 4
      src/pages/business/fireIot/deviceManage/components/deviceDetailsList.vue
  6. 1 1
      src/pages/business/fireIot/deviceManage/index.vue
  7. 6 6
      src/pages/business/fireIot/facilitiesGather/index.vue
  8. 6 6
      src/pages/business/fireIot/facilitiesGather/mapGather.vue
  9. 1 1
      src/pages/business/fireIot/facilitiesManage/facilitiesDetails.vue
  10. 1 1
      src/pages/business/fireIot/facilitiesManage/facilitiesDetailsList.vue
  11. 2 2
      src/pages/business/fireIot/facilitiesManage/index.vue
  12. 2 2
      src/pages/business/fireIot/facilitiesManage/mapFacilitiesView.vue
  13. 1 1
      src/pages/business/fireIot/repairManage/index.vue
  14. 1 1
      src/pages/business/fireIot/repairManage/repairDetails.vue
  15. 2 2
      src/pages/business/fireIot/repairManage/repairDetailsList.vue
  16. 2 2
      src/pages/business/mhxf/coordination/index.vue
  17. 2 2
      src/pages/business/mhxf/deviceManage/index.vue
  18. 2 2
      src/pages/business/mhxf/fireReport/components/detailed.vue
  19. 2 2
      src/pages/business/mhxf/fireReport/components/detailedPath.vue
  20. 2 2
      src/pages/business/mhxf/fireReport/index.vue
  21. 2 2
      src/pages/business/mhxf/informationSelect/index.vue
  22. 2 2
      src/pages/business/mhxf/needMatter/index.vue
  23. 3 3
      src/pages/business/mhxf/unitInfoCollection/index.vue
  24. 3 3
      src/pages/business/mhxf/xunJian/collect/components/collectDetail.vue
  25. 1 1
      src/pages/business/mhxf/xunJian/plan/components/content.vue
  26. 1 1
      src/pages/business/mhxf/xunJian/plan/components/drawer.vue
  27. 1 1
      src/pages/business/mhxf/xunJian/plan/components/report.vue
  28. 1 1
      src/pages/business/mhxf/xunJian/plan/components/siteDetails.vue
  29. 3 3
      src/pages/business/mhxf/xunJian/plan/index.vue
  30. 1 1
      src/pages/business/mhxf/xunJian/record/recordDetail/index.vue
  31. 3 3
      src/pages/business/mhxf/xunJian/xunJian.vue
  32. 1 1
      src/pages/business/zhxf/building/index.vue
  33. 1 1
      src/pages/business/zhxf/funReport/funcAdd/index.vue
  34. 1 1
      src/pages/business/zhxf/funReport/index.vue
  35. 1 1
      src/pages/business/zhxf/messagePush/index.vue
  36. 1 1
      src/pages/common/alarmMessage/index.vue
  37. 1 1
      src/pages/common/appMessage/index.vue
  38. 1 1
      src/pages/common/customManage/index.vue
  39. 2 2
      src/pages/common/evaluate/index.vue
  40. 4 4
      src/pages/common/invoicing/index.vue
  41. 1 1
      src/pages/common/phoneVerify/index.vue
  42. 2 2
      src/pages/common/repairReport/index.vue
  43. 2 2
      src/pages/common/repairReport/record.vue
  44. 1 1
      src/pages/common/square/index.vue
  45. 2 2
      src/pages/common/success/index.vue
  46. 1 1
      src/pages/common/textview/index.vue
  47. 1 1
      src/pages/common/textview/index1.vue
  48. 1 1
      src/pages/common/webview/index.vue
  49. 3 3
      src/pages/index.vue
  50. 4 4
      src/pages/login.vue
  51. 1 1
      src/pages/mine.vue
  52. 1 1
      src/pages/mine/about/index.vue
  53. 1 1
      src/pages/mine/avatar/index.vue
  54. 1 1
      src/pages/mine/help/index.vue
  55. 1 1
      src/pages/mine/info/index.vue
  56. 1 1
      src/pages/mine/secure/fingerprint/index.vue
  57. 1 1
      src/pages/mine/secure/index.vue
  58. 1 1
      src/pages/mine/secure/loginLog/index.vue
  59. 1 1
      src/pages/mine/setting/index.vue
  60. 2 2
      src/pages/register.vue
  61. 4 4
      src/pages/serveConfig.vue
  62. 3 3
      src/pages/serveConfigSelect.vue
  63. 2 2
      src/store/modules/common.js
  64. 2 2
      src/store/modules/index.js

+ 1 - 1
src/pages/business/fireIot/alarmManage/alarmDetails/index.vue

@@ -82,7 +82,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { baseAlarmList, baseAlarm } from "@/api/business/fireIot/alarmManage.js";
 

+ 2 - 2
src/pages/business/fireIot/alarmManage/alarmDetailsList/index.vue

@@ -40,12 +40,12 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { baseAlarmList } from "@/api/business/fireIot/alarmManage.js";
 
 const { proxy } = getCurrentInstance();
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const tabsList = ref([
   {

+ 1 - 1
src/pages/business/fireIot/alarmManage/index.vue

@@ -30,7 +30,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance } from "vue";
-import { useStores, publicStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { dmpProductInfo, baseAlarmTypeList } from "@/api/business/fireIot/alarmManage.js";
 

+ 14 - 14
src/pages/business/fireIot/deviceManage/components/deviceDetails.vue

@@ -5,12 +5,12 @@
         <image style="width: 40px; height: 40px; margin: auto 15px auto 0" :src="'/static/images/404.png'" mode="aspectFill"></image>
 
         <view style="margin: auto auto auto 0">
-          <view style="font-size: 15px"> {{ publicStore.$state.deviceDetailsArray.deviceName }} </view>
+          <view style="font-size: 15px"> {{ commonStore.$state.deviceDetailsArray.deviceName }} </view>
         </view>
 
         <view style="margin: auto 0 auto 0">
-          <view :style="{ fontSize: '15px', color: publicStore.$state.deviceDetailsArray.deviceStatus == 1 ? '#16bf00' : 'red' }">
-            {{ publicStore.$state.deviceDetailsArray.deviceStatus == 1 ? "在线" : "离线" }}
+          <view :style="{ fontSize: '15px', color: commonStore.$state.deviceDetailsArray.deviceStatus == 1 ? '#16bf00' : 'red' }">
+            {{ commonStore.$state.deviceDetailsArray.deviceStatus == 1 ? "在线" : "离线" }}
           </view>
         </view>
       </view>
@@ -95,35 +95,35 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import chart from "./chart.vue";
 
 import { dmpProductAttribute, historyMetrics, last } from "@/api/business/fireIot/deviceManage.js";
 
 const { proxy } = getCurrentInstance();
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const dataList = ref([
   {
     title: "设备类型",
-    value: publicStore.$state.deviceDetailsArray.productName,
+    value: commonStore.$state.deviceDetailsArray.productName,
   },
   {
     title: "设备编号",
-    value: publicStore.$state.deviceDetailsArray.deviceId,
+    value: commonStore.$state.deviceDetailsArray.deviceId,
   },
   {
     title: "物联网卡号",
-    value: publicStore.$state.deviceDetailsArray.simCode,
+    value: commonStore.$state.deviceDetailsArray.simCode,
   },
   {
     title: "安装位置",
-    value: publicStore.$state.deviceDetailsArray.installAddress,
+    value: commonStore.$state.deviceDetailsArray.installAddress,
   },
   {
     title: "添加时间",
-    value: publicStore.$state.deviceDetailsArray.createdTime ? publicStore.$state.deviceDetailsArray.createdTime.replace("T", " ") : "",
+    value: commonStore.$state.deviceDetailsArray.createdTime ? commonStore.$state.deviceDetailsArray.createdTime.replace("T", " ") : "",
   },
 ]);
 
@@ -151,7 +151,7 @@ function init() {
     current: 1,
     size: 100,
     attributeName: "",
-    productId: publicStore.$state.deviceDetailsArray.productId,
+    productId: commonStore.$state.deviceDetailsArray.productId,
   }).then((requset) => {
     if (requset.status === "SUCCESS") {
       checkboxDataList.value = requset.data.records;
@@ -164,7 +164,7 @@ function init() {
       });
 
       last({
-        deviceId: publicStore.$state.deviceDetailsArray.deviceId,
+        deviceId: commonStore.$state.deviceDetailsArray.deviceId,
         metrics: array,
       }).then((requsets) => {
         if (requsets.status === "SUCCESS") {
@@ -217,8 +217,8 @@ function historyMetricsApi() {
   historyMetrics({
     startTime: calendarStartTime.value,
     endTime: calendarEndTime.value,
-    deviceId: publicStore.$state.deviceDetailsArray.deviceId,
-    deviceType: publicStore.$state.deviceDetailsArray.deviceType,
+    deviceId: commonStore.$state.deviceDetailsArray.deviceId,
+    deviceType: commonStore.$state.deviceDetailsArray.deviceType,
     metrics: checkboxValueList.value,
   }).then((requset) => {
     if (requset.status === "SUCCESS") {

+ 4 - 4
src/pages/business/fireIot/deviceManage/components/deviceDetailsList.vue

@@ -62,12 +62,12 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { dmpDeviceInfo } from "@/api/business/fireIot/deviceManage.js";
 
 const { proxy } = getCurrentInstance();
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const dataList = ref([]);
 const deviceName = ref("");
@@ -129,8 +129,8 @@ function dmpDeviceInfoApi() {
 function handleToDevice(array) {
   proxy.$tab.navigateTo("/pages/business/fireIot/deviceManage/components/deviceDetails");
 
-  publicStore.$state.deviceDetailsArray = array;
-  publicStore.$state.deviceDetailsArray.productName = productName.value;
+  commonStore.$state.deviceDetailsArray = array;
+  commonStore.$state.deviceDetailsArray.productName = productName.value;
 }
 
 /**

+ 1 - 1
src/pages/business/fireIot/deviceManage/index.vue

@@ -30,7 +30,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance } from "vue";
-import { useStores, publicStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { dmpProductInfo } from "@/api/business/fireIot/deviceManage.js";
 

+ 6 - 6
src/pages/business/fireIot/facilitiesGather/index.vue

@@ -117,13 +117,13 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { typeSelect, add, uploadAvatar, treeselect } from "@/api/business/fireIot/facilitiesGather.js";
 
 const { proxy } = getCurrentInstance();
 
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 //设施类型下拉数据存储
 const typeSelectList = ref([[]]);
@@ -147,7 +147,7 @@ const dataList = reactive({
     },
   ],
 
-  form: publicStore.$state.facilitiesGatherArray,
+  form: commonStore.$state.facilitiesGatherArray,
 
   rules: {
     department: [
@@ -426,16 +426,16 @@ function handleAction(value, array) {
   }
 
   if (value == "设施地址") {
-    publicStore.$state.facilitiesGatherType = "点";
+    commonStore.$state.facilitiesGatherType = "点";
     proxy.$tab.navigateTo("/pages/business/fireIot/facilitiesGather/mapGather");
     return;
   }
 
   if (value == "类型") {
     if (form.value.typeGuise === 2) {
-      publicStore.$state.facilitiesGatherType = "线";
+      commonStore.$state.facilitiesGatherType = "线";
     } else if (form.value.typeGuise === 3) {
-      publicStore.$state.facilitiesGatherType = "面";
+      commonStore.$state.facilitiesGatherType = "面";
     }
     proxy.$tab.navigateTo("/pages/business/fireIot/facilitiesGather/mapGather");
 

+ 6 - 6
src/pages/business/fireIot/facilitiesGather/mapGather.vue

@@ -14,16 +14,16 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs, nextTick } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 
 const { proxy } = getCurrentInstance();
 
 const pages = getCurrentPages();
 
-const dataArray = publicStore.$state.facilitiesGatherArray;
-const dataType = publicStore.$state.facilitiesGatherType;
+const dataArray = commonStore.$state.facilitiesGatherArray;
+const dataType = commonStore.$state.facilitiesGatherType;
 
 // #ifdef APP-PLUS
 setTimeout(() => {
@@ -35,7 +35,7 @@ setTimeout(() => {
 
 function onMessage(e) {
   console.log("父页面:", e.detail.data);
-  publicStore.$state.facilitiesGatherArray = JSON.parse(e.detail.data);
+  commonStore.$state.facilitiesGatherArray = JSON.parse(e.detail.data);
   uni.redirectTo({
     url: "/pages/business/fireIot/facilitiesGather/index",
   });
@@ -56,7 +56,7 @@ setTimeout(() => {
 window.onmessage = function (event) {
   if ("funcName" in event.data) {
     console.log("父页面:", event);
-    publicStore.$state.facilitiesGatherArray = JSON.parse(event.data.param);
+    commonStore.$state.facilitiesGatherArray = JSON.parse(event.data.param);
     uni.redirectTo({
       url: "/pages/business/fireIot/facilitiesGather/index",
     });

+ 1 - 1
src/pages/business/fireIot/facilitiesManage/facilitiesDetails.vue

@@ -118,7 +118,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { facilityInfo, deviceInfo, buildInfo } from "@/api/business/fireIot/facilitiesManage.js";
 

+ 1 - 1
src/pages/business/fireIot/facilitiesManage/facilitiesDetailsList.vue

@@ -43,7 +43,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { baseGgpFacility } from "@/api/business/fireIot/facilitiesManage.js";
 

+ 2 - 2
src/pages/business/fireIot/facilitiesManage/index.vue

@@ -51,11 +51,11 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, reactive, computed, onMounted, getCurrentInstance, toRefs, inject } from "vue";
-import { xunJianStores, publicStores } from "@/store/modules/index";
+import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 
 import { baseFacilityType } from "@/api/business/fireIot/facilitiesManage.js";
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();

+ 2 - 2
src/pages/business/fireIot/facilitiesManage/mapFacilitiesView.vue

@@ -14,11 +14,11 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs, nextTick } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { baseFacilityType, baseGgpFacilityList } from "@/api/business/fireIot/facilitiesManage.js";
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 
 const { proxy } = getCurrentInstance();
 const pages = getCurrentPages();

+ 1 - 1
src/pages/business/fireIot/repairManage/index.vue

@@ -30,7 +30,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance } from "vue";
-import { useStores, publicStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { dmpProductInfo, baseAlarmTypeList } from "@/api/business/fireIot/alarmManage.js";
 

+ 1 - 1
src/pages/business/fireIot/repairManage/repairDetails.vue

@@ -80,7 +80,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { page, fill } from "@/api/business/fireIot/repairManage.js";
 

+ 2 - 2
src/pages/business/fireIot/repairManage/repairDetailsList.vue

@@ -43,12 +43,12 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { page } from "@/api/business/fireIot/repairManage.js";
 
 const { proxy } = getCurrentInstance();
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const tabsList = ref([
   {

+ 2 - 2
src/pages/business/mhxf/coordination/index.vue

@@ -12,9 +12,9 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs, nextTick } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 
 const { proxy } = getCurrentInstance();
 

+ 2 - 2
src/pages/business/mhxf/deviceManage/index.vue

@@ -77,11 +77,11 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance, toRefs } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { dataRtList } from "@/api/business/mhxf/deviceManage";
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 
 const { proxy } = getCurrentInstance();
 

+ 2 - 2
src/pages/business/mhxf/fireReport/components/detailed.vue

@@ -378,7 +378,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance, toRefs } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import lineEcharts from "./echarts.vue";
 
@@ -386,7 +386,7 @@ import {} from "@/api/business/mhxf/informationSelect";
 
 const { proxy } = getCurrentInstance();
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 
 const dataList = reactive({
   content1: [],

+ 2 - 2
src/pages/business/mhxf/fireReport/components/detailedPath.vue

@@ -9,7 +9,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance, toRefs } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import lineEcharts from "./echarts.vue";
 
@@ -17,7 +17,7 @@ import {} from "@/api/business/mhxf/informationSelect";
 
 const { proxy } = getCurrentInstance();
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 
 const dataList = reactive({
   pathUrl: "",

+ 2 - 2
src/pages/business/mhxf/fireReport/index.vue

@@ -35,11 +35,11 @@
 <script setup>
 import { onReady, onLoad, onShow, onReachBottom, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { reportInfoList } from "@/api/business/mhxf/fireReport";
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 
 const { proxy } = getCurrentInstance();
 

+ 2 - 2
src/pages/business/mhxf/informationSelect/index.vue

@@ -36,13 +36,13 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { dataList } from "@/api/business/mhxf/informationSelect";
 
 const { proxy } = getCurrentInstance();
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 
 const dataInput = ref("");
 const current = ref(0);

+ 2 - 2
src/pages/business/mhxf/needMatter/index.vue

@@ -188,14 +188,14 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { mobileScheduleList, updateMobileReformStatus, uploadAvatar, addReformMaterial } from "@/api/business/mhxf/needMatter";
 
 const { proxy } = getCurrentInstance();
 
 const useStore = useStores();
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 
 const current = ref(0);
 const classifyData = ref([]);

+ 3 - 3
src/pages/business/mhxf/unitInfoCollection/index.vue

@@ -307,14 +307,14 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 import { getToken } from "@/utils/auth";
 
 import { companyByNameSelect, addBaseCompany, delBaseBuild, delBaseBuildExtinguish } from "@/api/business/mhxf/unitInfoCollection";
 
 const { proxy } = getCurrentInstance();
 
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const checkboxValue = ref([]);
 
@@ -1194,7 +1194,7 @@ function handleDateTime(value, index, time) {
  * @确定按钮事件
  */
 function timeSubmit(data) {
-  let time = publicStore.formatterDateTime(data.value);
+  let time = commonStore.formatterDateTime(data.value);
   let timeData = time.split(" ")[0];
   if (timeTitle.value == "成立时间") {
     form.value.foundTime = timeData;

+ 3 - 3
src/pages/business/mhxf/xunJian/collect/components/collectDetail.vue

@@ -28,9 +28,9 @@ import {
   onNavigationBarButtonTap,
 } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
-import { publicStores, xunJianStores } from "@/store/modules/index";
+import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
@@ -65,7 +65,7 @@ function handleInsert() {
     .validate()
     .then((res) => {
       let endTime = new Date();
-      model.siteTime = publicStore.formatterDate(endTime, "yyyy-MM-dd hh:mm:ss");
+      model.siteTime = commonStore.formatterDate(endTime, "yyyy-MM-dd hh:mm:ss");
 
       xunJianStore.collectDataList.push(model);
 

+ 1 - 1
src/pages/business/mhxf/xunJian/plan/components/content.vue

@@ -74,7 +74,7 @@
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
-import { publicStores, xunJianStores } from "@/store/modules/index";
+import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 
 import { updatePlan } from "@/api/business/mhxf/xunJian/plan.js";
 

+ 1 - 1
src/pages/business/mhxf/xunJian/plan/components/drawer.vue

@@ -28,7 +28,7 @@
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, watchEffect } from "vue";
-import { publicStores, xunJianStores } from "@/store/modules/index";
+import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 
 const xunJianStore = xunJianStores(); //全局变量值Store
 

+ 1 - 1
src/pages/business/mhxf/xunJian/plan/components/report.vue

@@ -61,7 +61,7 @@
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
-import { publicStores, xunJianStores } from "@/store/modules/index";
+import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 
 import { recordList, recordOption, siteDetails, planSonSiteDetails } from "@/api/business/mhxf/xunJian/plan.js";
 

+ 1 - 1
src/pages/business/mhxf/xunJian/plan/components/siteDetails.vue

@@ -62,7 +62,7 @@
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
-import { publicStores, xunJianStores } from "@/store/modules/index";
+import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 
 import { siteDetails } from "@/api/business/mhxf/xunJian/plan.js";
 

+ 3 - 3
src/pages/business/mhxf/xunJian/plan/index.vue

@@ -106,11 +106,11 @@ import drawer from "./components/drawer.vue";
 
 import { onLoad, onShow, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
-import { publicStores, xunJianStores } from "@/store/modules/index";
+import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 
 import { recordList, recordOption, planList, patrolInspectionPlan, appPlanStatistics } from "@/api/business/mhxf/xunJian/plan.js";
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
@@ -295,7 +295,7 @@ function activitiesApi() {
  * @统计
  * @api接口请求
  */
-const currentDate = ref(publicStore.getDate().year + "-" + publicStore.getDate().month + "-" + publicStore.getDate().dates); //统计时间数据存储
+const currentDate = ref(commonStore.getDate().year + "-" + commonStore.getDate().month + "-" + commonStore.getDate().dates); //统计时间数据存储
 const currentDatevalue = ref(new Date());
 const currentDateList = ref({}); //统计list数据存储
 function currentApi() {

+ 1 - 1
src/pages/business/mhxf/xunJian/record/recordDetail/index.vue

@@ -87,7 +87,7 @@
 <script setup>
 import { onLoad, onShow, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
-import { publicStores, xunJianStores } from "@/store/modules/index";
+import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 
 import { getInspectionRecordDetails } from "@/api/business/mhxf/xunJian/record.js";
 

+ 3 - 3
src/pages/business/mhxf/xunJian/xunJian.vue

@@ -44,20 +44,20 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, reactive, computed, onMounted, getCurrentInstance, toRefs, inject } from "vue";
-import { xunJianStores, publicStores } from "@/store/modules/index";
+import { xunJianStores, commonStores } from "@/store/modules/index";
 
 import chart from "./components/chart.vue";
 
 import { appPlanStatistics } from "@/api/business/mhxf/xunJian/index.js";
 
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
 
 const inspectList = proxy.$grid.xunJianList; //九宫格json数据
 
-const currentDate = publicStore.getDate().year + "-" + publicStore.getDate().month + "-" + publicStore.getDate().dates;
+const currentDate = commonStore.getDate().year + "-" + commonStore.getDate().month + "-" + commonStore.getDate().dates;
 const currentDateList = ref([]);
 
 function navItemClick(url, id) {

+ 1 - 1
src/pages/business/zhxf/building/index.vue

@@ -98,7 +98,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { getBuildingManagement } from "@/api/business/zhxf/building/index.js";
 

+ 1 - 1
src/pages/business/zhxf/funReport/funcAdd/index.vue

@@ -49,7 +49,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onReachBottom, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, watchEffect, getCurrentInstance, watch } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { del, index } from "@/api/business/zhxf/funReport/index.js";
 

+ 1 - 1
src/pages/business/zhxf/funReport/index.vue

@@ -65,7 +65,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onReachBottom, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, watchEffect, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { del, index } from "@/api/business/zhxf/funReport/index.js";
 

+ 1 - 1
src/pages/business/zhxf/messagePush/index.vue

@@ -20,7 +20,7 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { setperm } from "@/api/business/zhxf/messagePush/index.js";
 

+ 1 - 1
src/pages/common/alarmMessage/index.vue

@@ -42,7 +42,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { infoList } from "@/api/common/message.js";
 import { baseAlarmList, getTypePage } from "@/api/business/fireIot/alarmManage.js";

+ 1 - 1
src/pages/common/appMessage/index.vue

@@ -34,7 +34,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { infoList } from "@/api/common/message.js";
 

+ 1 - 1
src/pages/common/customManage/index.vue

@@ -68,7 +68,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { crmCustomInfo } from "@/api/common/customManage.js";
 

+ 2 - 2
src/pages/common/evaluate/index.vue

@@ -54,12 +54,12 @@ import config from "@/config";
 import storage from "@/utils/storage";
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { score } from "@/api/common/index.js";
 
 const { proxy } = getCurrentInstance();
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const data = reactive({
   rateCount: 5,

+ 4 - 4
src/pages/common/invoicing/index.vue

@@ -171,12 +171,12 @@ import config from "@/config";
 import storage from "@/utils/storage";
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { crmInvoiceInfo, page } from "@/api/common/invoicing.js";
 
 const { proxy } = getCurrentInstance();
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const uForm = ref(null);
 const data = reactive({
@@ -313,8 +313,8 @@ function handleSubmit(value) {
         current: 1,
         size: 10,
         invoiceTitle: form.value.invoiceTitle,
-        startTime: publicStore.getYearLast(new Date()),
-        endTime: publicStore.formatterDateTime(new Date()),
+        startTime: commonStore.getYearLast(new Date()),
+        endTime: commonStore.formatterDateTime(new Date()),
       }).then((requset) => {
         if (requset.status === "SUCCESS") {
           proxy.$modal.closeLoading();

+ 1 - 1
src/pages/common/phoneVerify/index.vue

@@ -27,7 +27,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll, onBackPress, onUnload } from "@dcloudio/uni-app";
 import { reactive, getCurrentInstance, toRefs, inject } from "vue";
-import { useStores, publicStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 const useStore = useStores();
 const { proxy } = getCurrentInstance();

+ 2 - 2
src/pages/common/repairReport/index.vue

@@ -75,12 +75,12 @@ import config from "@/config";
 import storage from "@/utils/storage";
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { add, getAddHistoryInfo } from "@/api/common/repairReport.js";
 
 const { proxy } = getCurrentInstance();
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const uForm = ref(null);
 const data = reactive({

+ 2 - 2
src/pages/common/repairReport/record.vue

@@ -40,13 +40,13 @@
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll, onBackPress, onUnload } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 import { getToken, setToken, removeToken } from "@/utils/auth";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { getHistory } from "@/api/common/repairReport.js";
 
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const dataList = ref([]);
 const dataStatus = ref(false);

+ 1 - 1
src/pages/common/square/index.vue

@@ -17,7 +17,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll, onBackPress, onUnload } from "@dcloudio/uni-app";
 import { reactive, getCurrentInstance, toRefs, inject } from "vue";
-import { useStores, publicStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 const useStore = useStores();
 const { proxy } = getCurrentInstance();

+ 2 - 2
src/pages/common/success/index.vue

@@ -17,10 +17,10 @@
 import config from "@/config";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 import { getToken, setToken, removeToken } from "@/utils/auth";
 
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const { proxy } = getCurrentInstance();
 const showNow = ref(true);

+ 1 - 1
src/pages/common/textview/index.vue

@@ -9,7 +9,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 const useStore = useStores();
 

+ 1 - 1
src/pages/common/textview/index1.vue

@@ -9,7 +9,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 const useStore = useStores();
 

+ 1 - 1
src/pages/common/webview/index.vue

@@ -7,7 +7,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 const useStore = useStores();
 

+ 3 - 3
src/pages/index.vue

@@ -112,14 +112,14 @@
 import { onReady, onLoad, onShow, onNavigationBarButtonTap, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
 import { getToken } from "@/utils/auth";
-import { useStores, publicStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { scan_push, getHomePageData, getFunctionalModuleStatistics, getAppRouters, qrCodeSend, getMobileBanner } from "@/api/index";
 import searchSelect from "@/components/searchSelect/searchSelect.vue";
 import * as jwx from "@/utils/jssdk.js"; //引入js sdk的封装
 
 const useStore = useStores();
-const publicStore = publicStores(); //全局公共Store
+const commonStore = commonStores(); //全局公共Store
 const { proxy } = getCurrentInstance();
 
 const arrayList = reactive({
@@ -295,7 +295,7 @@ function navItemClick(item) {
         el.sort++;
       }
     });
-    recentlyUsed.value = publicStore.sortEvent(recentlyUsed.value, 1);
+    recentlyUsed.value = commonStore.sortEvent(recentlyUsed.value, 1);
 
     uni.setStorageSync(useStore.$state.nickName + useStore.$state.tenantId, recentlyUsed.value);
 

+ 4 - 4
src/pages/login.vue

@@ -69,10 +69,10 @@
 import config from "@/config";
 import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { reactive, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 const useStore = useStores();
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const { proxy } = getCurrentInstance();
 
@@ -146,7 +146,7 @@ function init() {
   //#ifdef H5
   if (window.location.host) {
     linkUrl.value = window.location.host;
-    // linkUrl.value = "172.16.120.165:13200";
+    linkUrl.value = "172.16.120.165:13200";
     // linkUrl.value = "localhost:81";
 
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
@@ -159,7 +159,7 @@ function init() {
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   } else {
     uni.setStorageSync("serveUrl", "manager.usky.cn");
-    publicStore.setServeList("manager.usky.cn", "");
+    commonStore.setServeList("manager.usky.cn", "");
     linkUrl.value = uni.getStorageSync("serveUrl");
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   }

+ 1 - 1
src/pages/mine.vue

@@ -182,7 +182,7 @@ import config from "@/config";
 import storage from "@/utils/storage";
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { uploadAvatar, updateUserProfile } from "@/api/system/user";
 import { getAuthorization } from "@/api/business/zhxf/messagePush/index.js";

+ 1 - 1
src/pages/mine/about/index.vue

@@ -57,7 +57,7 @@
 import config from "@/config";
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 const useStore = useStores();
 

+ 1 - 1
src/pages/mine/avatar/index.vue

@@ -51,7 +51,7 @@
 import config from "@/config";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 import { onReady, onShow } from "@dcloudio/uni-app";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { uploadAvatar, updateUserProfile } from "@/api/system/user";
 

+ 1 - 1
src/pages/mine/help/index.vue

@@ -29,7 +29,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, computed, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 const useStore = useStores();
 const { proxy } = getCurrentInstance();

+ 1 - 1
src/pages/mine/info/index.vue

@@ -123,7 +123,7 @@ import config from "@/config";
 import storage from "@/utils/storage";
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { updateUserProfile, getUserProfile } from "@/api/system/user";
 

+ 1 - 1
src/pages/mine/secure/fingerprint/index.vue

@@ -27,7 +27,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { loginLogList } from "@/api/mine/secure/loginLog.js";
 

+ 1 - 1
src/pages/mine/secure/index.vue

@@ -93,7 +93,7 @@ import config from "@/config";
 import storage from "@/utils/storage";
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { updateUserProfile, updateUserPwd } from "@/api/system/user";
 

+ 1 - 1
src/pages/mine/secure/loginLog/index.vue

@@ -42,7 +42,7 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 import { loginLogList } from "@/api/mine/secure/loginLog.js";
 

+ 1 - 1
src/pages/mine/setting/index.vue

@@ -50,7 +50,7 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
 const useStore = useStores();
 

+ 2 - 2
src/pages/register.vue

@@ -49,10 +49,10 @@
 import config from "@/config";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 import { getToken, setToken, removeToken } from "@/utils/auth";
 
-const publicStore = publicStores();
+const commonStore = commonStores();
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

+ 4 - 4
src/pages/serveConfig.vue

@@ -37,10 +37,10 @@
 import config from "@/config";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 import { getToken, setToken, removeToken } from "@/utils/auth";
 
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const { proxy } = getCurrentInstance();
 
@@ -116,10 +116,10 @@ function handleSubmit() {
   } else {
     if (!port.value) {
       uni.setStorageSync("serveUrl", linkUrl.value);
-      publicStore.setServeList(linkUrl.value, content.value);
+      commonStore.setServeList(linkUrl.value, content.value);
     } else {
       uni.setStorageSync("serveUrl", linkUrl.value + ":" + port.value);
-      publicStore.setServeList(linkUrl.value + ":" + port.value, content.value);
+      commonStore.setServeList(linkUrl.value + ":" + port.value, content.value);
     }
   }
 

+ 3 - 3
src/pages/serveConfigSelect.vue

@@ -56,9 +56,9 @@ import config from "@/config";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance, watchEffect } from "vue";
 import { getToken, setToken, removeToken } from "@/utils/auth";
-import { publicStores, useStores } from "@/store/modules/index";
+import { useStores, commonStores } from "@/store/modules/index";
 
-const publicStore = publicStores();
+const commonStore = commonStores();
 
 const { proxy } = getCurrentInstance();
 
@@ -117,7 +117,7 @@ function serveClick(type) {
           icon: "none",
         });
 
-        publicStore.setServeList(e.result, "");
+        commonStore.setServeList(e.result, "");
 
         init();
 

+ 2 - 2
src/store/modules/public.js → src/store/modules/common.js

@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 
-const publicStore = defineStore("common", {
+const commonStore = defineStore("common", {
   state: () => ({
     mapBool: 1, //1.高德 2.测绘院
     streetTownList: [
@@ -338,4 +338,4 @@ const publicStore = defineStore("common", {
   },
 });
 
-export default publicStore;
+export default commonStore;

+ 2 - 2
src/store/modules/index.js

@@ -1,11 +1,11 @@
 import useStores from "@/store/modules/user.js";
-import publicStores from "@/store/modules/public.js";
+import commonStores from "@/store/modules/common.js";
 import settingStores from "@/store/modules/setting.js";
 import xunJianStores from "@/store/modules/xunJian.js";
 
 export {
     useStores,
-    publicStores,
+    commonStores,
     settingStores,
     xunJianStores
 };