巡检模块功能优化/BUG修复

src/components/oa-movable/index.vue

@@ -2,7 +2,7 @@
   <movable-area class="fixed-box">
     <movable-view class="fixed-button" direction="all" :inertia="true" y="100px">
       <view class="menuBox">
-        <view class="mainMenu iconfont ucicon-jiahao menu-item-icon" :style="{ background: themesColor }" @click="declick"></view>
+        <view class="mainMenu iconfont oaIcon-jiahao menu-item-icon" :style="{ background: themesColor }" @click="declick"></view>
         <view class="posi" :animation="animationData">
           <slot name="content"> </slot>
         </view>

src/components/oa-upgrade/index.vue

@@ -2,7 +2,7 @@
   <view class="upgrade-popup" v-if="isModalShow">
     <image class="header-bg" src="@/static/images/common/oa-upgrade.png" mode="widthFix"></image>
     <view
-      class="iconfont ucicon-oa-upgrade header-bg"
+      class="iconfont oaIcon-upgrade header-bg"
       style="font-size: 110px; margin-top: -110px"
       :style="{
         color: themesColor,

src/pages.json

@@ -406,8 +406,6 @@
         //人员签到 签退
       ]
     },
-    // 智慧安防
-
     // 闵行消防
     {
       "root": "pages/business/mhxf/",

src/pages/business/fireIot/deviceManage/components/deviceDetailsList.vue

@@ -79,18 +79,9 @@ const total = ref(0);
 
 const data = reactive({
   radioList: [
-    {
-      label: "全部",
-      value: "",
-    },
-    {
-      label: "在线",
-      value: "1",
-    },
-    {
-      label: "离线",
-      value: "2",
-    },
+    { label: "全部", value: "" },
+    { label: "在线", value: "1" },
+    { label: "离线", value: "2" },
   ],
   radioValue: "",
   dropdownShow: false,
@@ -179,9 +170,6 @@ onLoad((options) => {
 
 <style lang="scss" scoped>
 .deviceDetailsList-container {
-  .menu-item {
-  }
-
   .deviceHeader {
     min-width: 100%;
     font-size: 15px;

src/pages/business/fireIot/facilitiesGather/index.vue

@@ -133,101 +133,27 @@ const childrenList1 = ref([[]]);
 
 const dataList = reactive({
   sexList: [
-    {
-      text: "正常",
-      value: "0",
-    },
-    {
-      text: "维修",
-      value: "1",
-    },
-    {
-      text: "关闭",
-      value: "2",
-    },
+    { text: "正常", value: "0" },
+    { text: "维修", value: "1" },
+    { text: "关闭", value: "2" },
   ],
 
   form: commonStore.$state.facilitiesGatherArray,
 
   rules: {
-    department: [
-      {
-        required: false,
-        message: "请选择所属部门",
-        trigger: ["blur", "change"],
-      },
-    ],
-    facilityTypeName: [
-      {
-        required: true,
-        message: "请选择设施类型",
-        trigger: ["blur", "change"],
-      },
-    ],
-    facilityName: [
-      {
-        required: true,
-        message: "请输入设施名称",
-        trigger: ["blur", "change"],
-      },
-    ],
-    status: [
-      {
-        required: true,
-        message: "请选择设施状态",
-        trigger: ["blur", "change"],
-      },
-    ],
-    address: [
-      {
-        required: false,
-        message: "请选择设施地址",
-        trigger: ["blur", "change"],
-      },
-    ],
-    facilityAddress: [
-      {
-        required: true,
-        message: "请输入详细地址",
-        trigger: ["blur", "change"],
-      },
-    ],
-    // contact: [
-    //   {
-    //     required: true,
-    //     message: "请输入联系人",
-    //     trigger: ["blur", "change"],
-    //   },
-    // ],
+    department: [{ required: false, message: "请选择所属部门", trigger: ["blur", "change"] }],
+    facilityTypeName: [{ required: true, message: "请选择设施类型", trigger: ["blur", "change"] }],
+    facilityName: [{ required: true, message: "请输入设施名称", trigger: ["blur", "change"] }],
+    status: [{ required: true, message: "请选择设施状态", trigger: ["blur", "change"] }],
+    address: [{ required: false, message: "请选择设施地址", trigger: ["blur", "change"] }],
+    facilityAddress: [{ required: true, message: "请输入详细地址", trigger: ["blur", "change"] }],
+    // contact: [{ required: true, message: "请输入联系人", trigger: ["blur", "change"] }],
     // contactPhone: [
-    //   {
-    //     required: true,
-    //     message: "请输入联系人电话",
-    //     trigger: ["blur", "change"],
-    //   },
-    //   {
-    //     type: "string",
-    //     min: 11,
-    //     required: true,
-    //     message: "请输入正确11位联系人电话",
-    //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-    //     trigger: ["blur", "change"],
-    //   },
-    // ],
-    // imagesUrl: [
-    //   {
-    //     required: true,
-    //     message: "请选择图片",
-    //     trigger: ["blur", "change"],
-    //   },
-    // ],
-    // facilityDesc: [
-    //   {
-    //     required: true,
-    //     message: "请输入备注",
-    //     trigger: ["blur", "change"],
-    //   },
+    //   { required: true, message: "请输入联系人电话", trigger: ["blur", "change"] },
+    //   { type: "string", min: 11, required: true, message: "请输入正确11位联系人电话", pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, trigger: ["blur", "change"] },
     // ],
+    // imagesUrl: [{ required: true, message: "请选择图片", trigger: ["blur", "change"] }],
+    // facilityDesc: [{ required: true, message: "请输入备注", trigger: ["blur", "change"] }],
   },
 
   actionIndex: 0,
@@ -261,54 +187,9 @@ function init() {
       });
 
       var data = [
-        {
-          id: 124,
-          label: "公司",
-          children: [
-            {
-              id: 125,
-              label: "it",
-              children: [
-                {
-                  id: 126,
-                  label: "二组",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          id: 124,
-          label: "公司",
-          children: [
-            {
-              id: 125,
-              label: "it1",
-              children: [
-                {
-                  id: 126,
-                  label: "1组",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          id: 124,
-          label: "公司",
-          children: [
-            {
-              id: 125,
-              label: "it2",
-              children: [
-                {
-                  id: 126,
-                  label: "3组",
-                },
-              ],
-            },
-          ],
-        },
+        { id: 124, label: "公司", children: [{ id: 125, label: "it", children: [{ id: 126, label: "二组" }] }] },
+        { id: 124, label: "公司", children: [{ id: 125, label: "it1", children: [{ id: 126, label: "1组" }] }] },
+        { id: 124, label: "公司", children: [{ id: 125, label: "it2", children: [{ id: 126, label: "3组" }] }] },
       ];
 
       data.forEach((el) => {

src/pages/business/mhxf/informationSelect/index.vue

@@ -52,58 +52,14 @@ const dataRes = ref(1);
 const classifyData = ref([]); //警情查询数据存储
 
 const list = ref([
-  {
-    id: 1,
-    name: "警情查询",
-  },
-  {
-    id: 2,
-    name: "火灾查询",
-  },
-  {
-    id: 3,
-    name: "人员查询",
-    badge: {
-      // isDot: true,
-      // value: 5,
-    },
-  },
-  {
-    id: 4,
-    name: "车辆查询",
-    badge: {
-      // value: 5,
-    },
-  },
-  {
-    id: 5,
-    name: "站点查询",
-    badge: {
-      // value: 5,
-    },
-  },
-  {
-    id: 6,
-    name: "消火栓",
-    badge: {
-      // value: 5,
-    },
-  },
-
-  {
-    id: 7,
-    name: "重点单位",
-    badge: {
-      // value: 5,
-    },
-  },
-  {
-    id: 8,
-    name: "消防检查信息",
-    badge: {
-      // value: 5,
-    },
-  },
+  { id: 1, name: "警情查询" },
+  { id: 2, name: "火灾查询" },
+  { id: 3, name: "人员查询" },
+  { id: 4, name: "车辆查询" },
+  { id: 5, name: "站点查询" },
+  { id: 6, name: "消火栓" },
+  { id: 7, name: "重点单位" },
+  { id: 8, name: "消防检查信息" },
   {
     id: 9,
     name: "视频监控",

src/pages/business/zhaf/xunJian/plan/components/content.vue

@@ -184,6 +184,10 @@ async function buttonClick(type) {
         content.value = "提交成功，确定后返回！";
         show.value = true;
       } else {
+        xunJianStore.planDataList.push(array);
+        title.value = "消息";
+        content.value = "提交成功，确定后返回！";
+        show.value = true;
       }
     });
   }

src/pages/business/zhaf/xunJian/plan/components/siteDetails.vue

@@ -54,7 +54,6 @@
     </view>
     <view class="app-button-fixed">
       <u-button v-if="xunJianStore.inspectionStatus == 1" class="app-buttom" type="primary" @click="buttonClick()" shape="circle"> 下一步 </u-button>
-
       <u-button v-if="xunJianStore.inspectionStatus == 2" class="app-buttom" type="primary" @click="buttonClick()" shape="circle"> 查看巡检项 </u-button>
     </view>
   </scroll-view>

src/pages/business/zhaf/xunJian/plan/index.vue

@@ -333,6 +333,7 @@ onLoad((options) => {
 
   currentApi();
   activitiesApi();
+  xunJianStore.planForSubmit(); //调用巡检计划循环提交
 
   // 从详情页返回该页面的获取数据
   uni.$on("planSelect", () => {

src/pages/business/zhaf/xunJian/record/index.vue

@@ -31,14 +31,7 @@ import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni
 import { getInspectionRecordList } from "@/api/business/mhxf/xunJian/record.js";
 
 const modalName = ref(null);
-const getData = ref([
-  {
-    plan_name: "计划咦",
-    spot_name: "点位1",
-    wc_time: "2023-10-22 14:14:14",
-    spot_abnormal: 0,
-  },
-]);
+const getData = ref([]);
 
 const { proxy } = getCurrentInstance();
 

src/pages/business/zhaf/xunJian/xunJian.vue

@@ -25,7 +25,7 @@
 			</view> -->
 
       <!-- 宫格列表 -->
-      <view class=" section bg-white margin-top-sm">
+      <view class="section bg-white margin-top-sm">
         <view class="cu-list grid col-4 no-border" style="padding-top: 0.3125rem">
           <view class="cu-item justify-center align-center" v-for="(item, index) in inspectList" :key="index" @tap="navItemClick(item.redirectUrl, item.id)">
             <image :src="item.imgUrl" style="width: 40px; height: 40px"></image>

src/pages/mine/avatar/index.vue

@@ -37,8 +37,7 @@
 
       <view class="app-button-fixed">
         <view class="app-flex">
-          <u-button class="app-buttom" style="margin-right: 15px" @click="getImage" shape="circle"> 选择头像 </u-button>
-
+          <u-button class="app-buttom" @click="getImage" shape="circle"> 选择头像 </u-button>
           <u-button class="app-buttom" type="primary" @click="getImageInfo" shape="circle"> 提交 </u-button>
         </view>
       </view>

src/static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 3620854 */
-  src: url('https://at.alicdn.com/t/c/font_3620854_4sfa1zx2v1n.woff2?t=1713168752839') format('woff2'),
-       url('https://at.alicdn.com/t/c/font_3620854_4sfa1zx2v1n.woff?t=1713168752839') format('woff'),
-       url('https://at.alicdn.com/t/c/font_3620854_4sfa1zx2v1n.ttf?t=1713168752839') format('truetype');
+  font-family: "iconfont"; /* Project id 4510027 */
+  src: url('https://at.alicdn.com/t/c/font_4510027_28caqyvnm8n.woff2?t=1713348331486') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_4510027_28caqyvnm8n.woff?t=1713348331486') format('woff'),
+       url('https://at.alicdn.com/t/c/font_4510027_28caqyvnm8n.ttf?t=1713348331486') format('truetype');
 }
 
 .iconfont {
@@ -13,271 +13,127 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.ucicon-tongzhi:before {
-  content: "\e86b";
-}
-
-.ucicon-oa-upgrade:before {
-  content: "\e61b";
-}
-
-.ucicon-nfc:before {
-  content: "\e61a";
-}
-
-.ucicon-jiahao:before {
-  content: "\e727";
-}
-
-.ucicon-skin:before {
-  content: "\e636";
-}
-
-.ucicon-ziti:before {
-  content: "\e7b1";
-}
-
-.ucicon-fullscreen:before {
-  content: "\e625";
-}
-
-.ucicon-zaosheng:before {
-  content: "\e61c";
-}
-
-.ucicon-diannao:before {
-  content: "\e623";
-}
-
-.ucicon-siweidaotu:before {
-  content: "\e619";
-}
-
-.ucicon-yanzhengshoujihao:before {
-  content: "\e633";
-}
-
-.ucicon-zhiwen:before {
-  content: "\e74f";
-}
-
-.ucicon-position:before {
-  content: "\e618";
-}
-
-.ucicon-branch:before {
-  content: "\e617";
-}
-
-.ucicon-satellite:before {
+.oaIcon-phone:before {
   content: "\e614";
 }
 
-.ucicon-full:before {
+.oaIcon-map:before {
   content: "\e615";
 }
 
-.ucicon-facilityType:before {
+.oaIcon-Help:before {
   content: "\e616";
 }
 
-.ucicon-address:before {
-  content: "\e60f";
-}
-
-.ucicon-guanbi1:before {
-  content: "\e695";
-}
-
-.ucicon-lable:before {
-  content: "\e60e";
-}
-
-.ucicon-search:before {
-  content: "\e60d";
-}
-
-.ucicon-dial:before {
-  content: "\e60b";
-}
-
-.ucicon-app-map:before {
-  content: "\e60a";
-}
-
-.ucicon-chenggong:before {
-  content: "\e609";
-}
-
-.ucicon-a-shangchuan:before {
-  content: "\e605";
-}
-
-.ucicon-a-copy:before {
-  content: "\e604";
-}
-
-.ucicon-bianji1:before {
-  content: "\e602";
-}
-
-.ucicon-user:before {
-  content: "\e632";
-}
-
-.ucicon-people:before {
-  content: "\e736";
-}
-
-.ucicon-Help:before {
-  content: "\e603";
-}
-
-.ucicon-logout:before {
-  content: "\e6f7";
-}
-
-.ucicon-password:before {
-  content: "\e65d";
-}
-
-.ucicon-friendfill:before {
-  content: "\e657";
-}
-
-.ucicon-rengongkefu:before {
-  content: "\e87c";
-}
-
-.ucicon-bianji:before {
-  content: "\e601";
-}
-
-.ucicon-fenxiang1:before {
-  content: "\e86e";
-}
-
-.ucicon-jianchagengxin:before {
-  content: "\e624";
-}
-
-.ucicon-aixin:before {
-  content: "\e622";
+.oaIcon-eye-close:before {
+  content: "\e617";
 }
 
-.ucicon-qinglihuancun:before {
-  content: "\e608";
+.oaIcon-eye:before {
+  content: "\e618";
 }
 
-.ucicon-yanzheng:before {
-  content: "\e86a";
+.oaIcon-colorlens:before {
+  content: "\e619";
 }
 
-.ucicon-phone:before {
-  content: "\e64f";
+.oaIcon-qinglihuancun:before {
+  content: "\e60e";
 }
 
-.ucicon-guanbi:before {
+.oaIcon-jianchagengxin:before {
   content: "\e610";
 }
 
-.ucicon-zhuye:before {
-  content: "\e64e";
-}
-
-.ucicon-shezhi1:before {
+.oaIcon-fenxiang:before {
   content: "\e611";
 }
 
-.ucicon-xiaoxi:before {
-  content: "\e606";
-}
-
-.ucicon-circulation-full:before {
-  content: "\e858";
+.oaIcon-aixin:before {
+  content: "\e612";
 }
 
-.ucicon-youjiantou:before {
-  content: "\e629";
+.oaIcon-user:before {
+  content: "\e613";
 }
 
-.ucicon-daohang:before {
-  content: "\e612";
+.oaIcon-yanzheng:before {
+  content: "\e601";
 }
 
-.ucicon-dianhua1:before {
-  content: "\e61d";
+.oaIcon-tongzhi:before {
+  content: "\e606";
 }
 
-.ucicon-saoyisao:before {
-  content: "\e607";
+.oaIcon-filter:before {
+  content: "\e60c";
 }
 
-.ucicon-xiajiantou_huaban:before {
-  content: "\e63d";
+.oaIcon-appstore:before {
+  content: "\e600";
 }
 
-.ucicon-daochu:before {
-  content: "\e613";
+.oaIcon-people:before {
+  content: "\e736";
 }
 
-.ucicon-xingzhuang8:before {
-  content: "\e66b";
+.oaIcon-user1:before {
+  content: "\e632";
 }
 
-.ucicon-dianzan:before {
-  content: "\e600";
+.oaIcon-shezhi:before {
+  content: "\e70f";
 }
 
-.ucicon-fenxiang:before {
-  content: "\e60c";
+.oaIcon-saoyisao:before {
+  content: "\e607";
 }
 
-.ucicon-shoucang1:before {
-  content: "\e62a";
+.oaIcon-zhiwen:before {
+  content: "\e74f";
 }
 
-.ucicon-shanchu:before {
-  content: "\e66c";
+.oaIcon-bianji:before {
+  content: "\e602";
 }
 
-.ucicon-xingzhuang12:before {
-  content: "\e66d";
+.oaIcon-copy:before {
+  content: "\e604";
 }
 
-.ucicon-shangchuan:before {
-  content: "\e66e";
+.oaIcon-shangchuan:before {
+  content: "\e605";
 }
 
-.ucicon-colorlens:before {
-  content: "\e64b";
+.oaIcon-app-map:before {
+  content: "\e60a";
 }
 
-.ucicon-shezhi:before {
-  content: "\e70f";
+.oaIcon-dial:before {
+  content: "\e60b";
 }
 
-.ucicon-filter:before {
-  content: "\e7c7";
+.oaIcon-address:before {
+  content: "\e60f";
 }
 
-.ucicon-appstore:before {
-  content: "\e792";
+.oaIcon-nfc:before {
+  content: "\e61a";
 }
 
-.ucicon-map:before {
-  content: "\e719";
+.oaIcon-upgrade:before {
+  content: "\e61b";
 }
 
-.ucicon-info-circle-fill:before {
-  content: "\e844";
+.oaIcon-jiahao:before {
+  content: "\e620";
 }
 
-.ucicon-eye:before {
-  content: "\e78f";
+.oaIcon-qingchu:before {
+  content: "\e61f";
 }
 
-.ucicon-eye-close:before {
-  content: "\e8ff";
+.oaIcon-sousuo:before {
+  content: "\e61e";
 }
 

src/static/scss/global.scss

@@ -85,7 +85,7 @@
     &-icon {
       color: $uni-color-primary;
       font-size: 16px;
-      margin-right: 5px;
+      margin: auto 5px auto 0;
     }
 
     &-image {

src/static/scss/public.scss

@@ -249,10 +249,14 @@ uni-input {
       display: flex;
 
       .app-buttom {
-        width: 50%;
+        width: calc(50% - 7.5px);
         height: 40px;
         font-size: 14px;
       }
+
+      .u-button+.u-button {
+        margin-left: 15px;
+      }
     }
   }
 }
@@ -320,7 +324,7 @@ uni-input {
       margin-bottom: 10px;
       font-size: 14px;
 
-      .ucicon-address {
+      .iconfont {
         margin: auto 5px auto 0;
         color: #0c83fa;
       }

src/store/modules/user.js

@@ -35,7 +35,6 @@ const useStores = defineStore("useStores", {
   actions: {
     // 登录
     Login(data) {
-      // const modal = inject("$modal");
       return new Promise((resolve, reject) => {
         login(data)
           .then((res) => {
@@ -57,7 +56,7 @@ const useStores = defineStore("useStores", {
       getMobileTenantConfig(params).then((res) => {
         if (res.data.length > 0) {
           let data = res.data[0];
-          this.SET_LOGINMOBILELIST({
+          this.SET_STORAGE_OBJECT_KEYS({
             loginTitle: data.loginTitle,
             loginBottomTitle: data.loginFooter,
             loginBg: data.loginBackUrl,
@@ -71,8 +70,8 @@ const useStores = defineStore("useStores", {
     // 获取用户信息
     getUser() {
       getUserProfile().then((response) => {
-        this.user = response.data.user;
-        this.user.phonenumber = response.data.user.phonenumber.substr(0, 3) + "******" + response.data.user.phonenumber.substr(9);
+        this.user = JSON.parse(JSON.stringify(response.data.user));
+        this.user.phonenumber = this.user.phonenumber ? this.user.phonenumber.substr(0, 3) + "******" + this.user.phonenumber.substr(9) : "";
         this.userArr = JSON.parse(JSON.stringify(response.data.user));
         this.postGroup = response.postGroup;
         this.roleGroup = response.roleGroup;
@@ -93,10 +92,12 @@ const useStores = defineStore("useStores", {
               this.SET_ROLES(["ROLE_DEFAULT"]);
             }
 
-            this.SET_NAME(data.user.userName);
-            this.SET_NICKNAME(data.user.nickName);
-            this.SET_PHONE(data.user.phonenumber.substr(0, 3) + "******" + data.user.phonenumber.substr(9));
-            this.SET_AVATAR(data.user.avatar);
+            this.SET_STORAGE_OBJECT_KEYS({
+              name: data.user.userName,//用户名称
+              nickName: data.user.nickName,//用户昵称
+              phonenumber: data.user.phonenumber ? data.user.phonenumber.substr(0, 3) + "******" + data.user.phonenumber.substr(9) : "",//手机号码
+              avatar: data.user.avatar,//头像
+            })
 
             resolve(res);
           })
@@ -242,6 +243,12 @@ const useStores = defineStore("useStores", {
       })
     },
 
+    /**
+     * @用户注销
+     * @param { 数据 } data
+     * @param { 成功 } success 
+     * @param { 失败 } error 
+     */
     UserDel({ data, success, error }) {
       modal.loading("加载中");
       appDel(data).then((res) => {
@@ -260,7 +267,7 @@ const useStores = defineStore("useStores", {
             this.SET_TOKEN("");//清空token
             this.SET_ROLES([]);
             this.SET_PERMISSIONS([]);
-            this.SET_LOGINMOBILELIST({
+            this.SET_STORAGE_OBJECT_KEYS({
               loginTitle: "",
               loginBottomTitle: "",
               loginBg: "",
@@ -281,22 +288,6 @@ const useStores = defineStore("useStores", {
     SET_TOKEN(token) {
       this.token = token;
     },
-    SET_NAME(name) {
-      this.name = name;
-      storage.set("name", name);
-    },
-    SET_NICKNAME(nickName) {
-      this.nickName = nickName;
-      storage.set("nickName", nickName);
-    },
-    SET_PHONE(phonenumber) {
-      this.phonenumber = phonenumber;
-      storage.set("phonenumber", phonenumber);
-    },
-    SET_AVATAR(avatar) {
-      this.avatar = avatar;
-      storage.set("avatar", avatar);
-    },
     SET_ROLES(roles) {
       this.roles = roles;
       storage.set("roles", roles);
@@ -305,23 +296,12 @@ const useStores = defineStore("useStores", {
       this.permissions = permissions;
       storage.set("permissions", permissions);
     },
-    SET_LOGINMOBILELIST(loginMobileList) {
-      //title
-      this.loginTitle = loginMobileList.loginTitle
-      storage.set("loginTitle", loginMobileList.loginTitle);
-      //bottomTitle
-      this.loginBottomTitle = loginMobileList.loginBottomTitle
-      storage.set("loginBottomTitle", loginMobileList.loginBottomTitle);
-      //bg
-      this.loginBg = loginMobileList.loginBg
-      storage.set("loginBg", loginMobileList.loginBg);
-      //logo
-      this.loginLogo = loginMobileList.loginLogo
-      storage.set("loginLogo", loginMobileList.loginLogo);
-      //tenantId
-      this.tenantId = loginMobileList.tenantId
-      storage.set("tenantId", loginMobileList.tenantId);
-    }
+    SET_STORAGE_OBJECT_KEYS(LIST) {
+      Object.keys(LIST).forEach(function (key) {
+        useStores().$state[key] = LIST[key];
+        storage.set(key, LIST[key]);
+      });
+    },
   },
 });
 

src/store/modules/xunJian.js

@@ -1,6 +1,11 @@
+// 组件引用
 import { defineStore } from "pinia";
+// 接口引用
+import { updatePlan } from "@/api/business/mhxf/xunJian/plan.js";
+// 公共方法引用
+import storage from "@/utils/storage";
 
-const xunJianStore = defineStore("storage-xunJian", {
+const xunJianStore = defineStore(`${storage.get("nickName") + storage.get("tenantId")}_storage-xunJian`, {
   state: () => ({
     planTabs: 0, //巡检计划页 tabs切换值
     siteId: null, //巡检计划页 站点id
@@ -12,9 +17,32 @@ const xunJianStore = defineStore("storage-xunJian", {
     contentArray: {},
 
     collectDataList: [], //巡检点位采集数据存储
+    planDataList: [],//巡检计划采集数据存储
   }),
   unistorage: true,
-  actions: {},
+  actions: {
+    //巡检计划循环提交
+    planForSubmit() {
+      var _this = this
+      uni.getNetworkType({
+        success: function (res) {
+          if (_this.planDataList.length > 0 && res.networkType != 'none') {
+            _this.planDataList.forEach((e) => {
+              setTimeout(() => {
+                updatePlan(e).then((res) => {
+                  if (res.status == "SUCCESS") {
+                    _this.planDataList.splice(_this.planDataList.indexOf(e), 1);
+                  } else {
+                    throw new Error('提交终止！')
+                  }
+                });
+              }, 1000);
+            });
+          }
+        },
+      });
+    }
+  },
 });
 
 export default xunJianStore;

src/uni_modules/uview-plus/libs/css/mixin.scss

@@ -5,4 +5,5 @@
 	display: flex;
 	/* #endif */
 	flex-direction: $direction;
-}
+	flex-shrink: 0;
+}