Merge branch 'master' into ming

src/pages.json

@@ -387,26 +387,26 @@
     "list": [
       {
         "pagePath": "pages/index",
-        "iconPath": "static/images/tabBar/home.png",
-        "selectedIconPath": "static/images/tabBar/home-selected.png",
-        "text": "主页"
+        "iconPath": "static/icons/tabBar/home.svg",
+        "selectedIconPath": "static/icons/tabBar/home-selected.svg",
+        "text": "工作台"
       },
       // {
       //   "pagePath": "pages/analyse/analyse",
-      //   "iconPath": "static/images/tabBar/analyse.png",
-      //   "selectedIconPath": "static/images/tabBar/analyse-selected.png",
+      //   "iconPath": "static/icons/tabBar/analyse.svg",
+      //   "selectedIconPath": "static/icons/tabBar/analyse-selected.svg",
       //   "text": "分析"
       // },
       {
         "pagePath": "pages/info/info",
-        "iconPath": "static/images/tabBar/info.png",
-        "selectedIconPath": "static/images/tabBar/info-selected.png",
+        "iconPath": "static/icons/tabBar/info.svg",
+        "selectedIconPath": "static/icons/tabBar/info-selected.svg",
         "text": "消息"
       },
       {
         "pagePath": "pages/mine/index",
-        "iconPath": "static/images/tabBar/setting.png",
-        "selectedIconPath": "static/images/tabBar/setting-selected.png",
+        "iconPath": "static/icons/tabBar/setting.svg",
+        "selectedIconPath": "static/icons/tabBar/setting-selected.svg",
         "text": "我的"
       }
     ]

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

@@ -11,11 +11,11 @@
             <u-input style="border-radius: 50px" v-model="dataInput" @blur="blur" prefixIcon="search" prefixIconStyle="color: #0c7bf9" placeholder="请输入设备编号"> </u-input>
           </view>
 
-          <view style="text-align: center; padding: 10px; color: rgb(189, 189, 189); font-size: 14px" v-if="!dataRes">暂无数据</view>
+          <u-empty v-if="!dataRes" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
 
           <u-collapse @change="change" @close="close" @open="open" accordion v-else>
             <u-collapse-item class="uCollapseItem" v-for="da in dataList" :key="da">
-              <template v-slot:title>
+              <template #title>
                 <view style="display: flex">
                   <view class="cu-avatar lg" style="margin: 0 10px auto 0; background-color: rgba(0, 0, 0, 0)">
                     <image class="image-bg" style="width: 80rpx; height: 80rpx" src="@/static/images/deviceManage/1.png"></image>

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

@@ -1,6 +1,6 @@
 <template>
   <view class="fireReport" style="background-color: #f7f7f7">
-    <u-empty v-if="!dataRes" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+    <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
     <view class="reportContent" v-else>
       <view class="contentDom" v-for="(li, index) in dataList" :key="index">
         <view style="margin: auto 10px auto 0" @click="handleSelect()">

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

@@ -9,7 +9,7 @@
         <!-- 各类查询 start -->
         <view class="content">
           <u-input style="border-radius: 50px; margin-bottom: 10px" @blur="blur" v-model="dataInput" prefixIcon="search" prefixIconStyle="color: #0c7bf9" :placeholder="placeholderText"> </u-input>
-          <view style="text-align: center; color: rgb(189, 189, 189); font-size: 14px" v-if="!dataRes">暂无数据</view>
+          <u-empty v-if="!dataRes" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
           <view v-if="current == 8">
             <view class="con">
               <view class="time">{{ newTime }}</view>

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

@@ -4,18 +4,70 @@
   </u-sticky>
 
   <view class="needMatter" @touchstart="fingerstart" @touchend="fingerend" style="background-color: #f7f7f7">
-    <view class="content">
-      <!-- <view style="text-align: center; color: rgb(189, 189, 189); font-size: 14px" v-if="!dataRes">暂无数据</view>
-      <view v-else>
-        <u-row v-for="po in classifyData" :key="po">
-          <u-col span="4">
-            <view style="text-align: right; padding: 0px 5px 0px 5px">{{ po.title }}</view>
-          </u-col>
-          <u-col span="8">
-            <view style="text-align: left; padding: 0px 5px 0px 5px">{{ po.value }}</view>
-          </u-col>
-        </u-row>
-      </view> -->
+    <u-empty v-if="classifyData.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+
+    <view class="content" v-else>
+      <u-collapse>
+        <u-collapse-item>
+          <template #title>
+            <view style="display: flex; line-height: 25px">
+              <view style="padding-top: 4px">
+                <u--image src="/static/images/needMatter/icon1.png" width="14px" height="15px"></u--image>
+              </view>
+              <view style="padding: 0 10px; white-space: nowrap; font-size: 16px">
+                <view>整改通知</view>
+                <view>整改期限：</view>
+                <view style="font-size: 14px; color: #666666">234234569</view>
+              </view>
+              <view style="width: 100%; text-align: center; font-size: 16px">
+                <view :style="{ color: '#0887f8' }">已接收</view>
+                <view style="text-align: left">2023-07-15</view>
+                <view style="font-size: 14px; color: #666666">2023-02-23 15:15:12</view>
+              </view>
+            </view>
+          </template>
+          <view class="u-collapse-content">
+            <view class="tableType1" style="margin-bottom: 10px">
+              <u-row>
+                <u-col span="2">
+                  <view>序号</view>
+                </u-col>
+                <u-col span="5.5">
+                  <view>整改项</view>
+                </u-col>
+                <u-col span="4.5">
+                  <view>原因</view>
+                </u-col>
+              </u-row>
+              <u-row v-for="(co, index) in content4" :key="index">
+                <u-col span="2">
+                  <view>{{ co.name1 }}</view>
+                </u-col>
+                <u-col span="5.5">
+                  <view>{{ co.name2 }}</view>
+                </u-col>
+                <u-col span="4.5">
+                  <view>{{ co.name3 }}</view>
+                </u-col>
+              </u-row>
+            </view>
+            <view style="margin-bottom: 10px">
+              <u-steps current="2" dot>
+                <u-steps-item style="text-align: center" title="已接收" :desc="`2023-07-15 \n 14:00:00`"> </u-steps-item>
+                <u-steps-item style="text-align: center" title="整改中" :desc="`2023-07-15 \n 14:00:00`"></u-steps-item>
+                <u-steps-item style="text-align: center" title="审核通过" :desc="`2023-07-15 \n 14:00:00`"></u-steps-item>
+              </u-steps>
+            </view>
+            <view style="margin-bottom: 10px">
+              <u-steps current="2" dot>
+                <u-steps-item style="text-align: center" title="已接收" :desc="`2023-07-15 \n 14:00:00`"> </u-steps-item>
+                <u-steps-item style="text-align: center" title="整改中" :desc="`2023-07-15 \n 14:00:00`"></u-steps-item>
+                <u-steps-item style="text-align: center" title="审核不通过" :desc="`2023-07-15 \n 14:00:00`" error></u-steps-item>
+              </u-steps>
+            </view>
+          </view>
+        </u-collapse-item>
+      </u-collapse>
     </view>
   </view>
 </template>
@@ -34,6 +86,24 @@ const publicStores = publicStore(); //全局公共Store
 const current = ref(0);
 const classifyUrl = ref("");
 const dataRes = ref(1);
+const classifyData = ref([]); //警情查询数据存储
+const content4 = ref([
+  {
+    name1: "1",
+    name2: "火灾报警系统",
+    name3: "存在报警未处置",
+  },
+  {
+    name1: "2",
+    name2: "消防水系统",
+    name3: "存在报警未处置",
+  },
+  {
+    name1: "3",
+    name2: "燃气、电气系统监测",
+    name3: "存在报警未处置",
+  },
+]);
 
 const list = ref([
   {
@@ -78,7 +148,6 @@ const topMed = ref("");
 const bottomMed = ref("");
 const leftMed = ref("");
 const rightMed = ref("");
-const classifyData = ref([]); //警情查询数据存储
 
 /**
  * @当按下去的时候
@@ -470,35 +539,11 @@ onMounted(() => {});
   height: calc(100vh - 88px);
   background-color: #ffffff;
   .content {
-    padding: 10px;
-    .u-row {
-      height: 36px;
-      line-height: 36px;
-      .u-col {
-        border: 1px #e4e3e3 solid;
-        border-right: 0px;
-        border-bottom: 0px;
-        text-align: center;
-
-        view {
-          padding: 0 10px;
-          min-height: 36px;
-          overflow: hidden; //超出的文本隐藏
-          // text-overflow: ellipsis; //溢出用省略号显示
-          overflow: auto;
-          white-space: nowrap; // 默认不换行；
-          font-size: 14px;
-        }
-      }
-
-      .u-col:last-child {
-        border-right: 1px #e4e3e3 solid;
-      }
-    }
-
-    .u-row:last-child {
-      .u-col {
-        border-bottom: 1px #e4e3e3 solid;
+    // padding: 10px;
+    .u-collapse {
+      .u-collapse-item {
+        background: #ffffff;
+        margin-bottom: 10px;
       }
     }
   }

src/pages/index.vue

@@ -376,7 +376,7 @@ function getAppRoutersData() {
 
     res.data.forEach((el) => {
       //  const modules = import.meta.glob("@/static/icons/*.svg");
-      el.meta.icon = `/static/icons/${el.meta.icon}.svg`;
+      el.meta.icon = `/static/icons/index/${el.meta.icon}.svg`;
     });
 
     arrayList.cuIconList = res.data;

src/pages/mine/index.vue

@@ -172,7 +172,7 @@ page {
     top: -50px;
 
     .mine-actions {
-      margin: 15px 15px;
+      margin: 0.625rem 0.625rem;
       padding: 20px 0px;
       border-radius: 8px;
       background-color: white;

src/pages/mine/info/edit.vue

@@ -20,7 +20,7 @@
   </view>
 </template>
 
-<script>
+<script setup>
 import { getUserProfile } from "@/api/system/user";
 import { updateUserProfile } from "@/api/system/user";
 
@@ -88,13 +88,15 @@ const form = ref(null);
 
 function getUser() {
   getUserProfile().then((response) => {
-    user.value = response.data;
+    console.log(response);
+    user.value = response.data.user;
   });
 }
 function submit(ref) {
   form.value.validate().then((res) => {
     updateUserProfile(user.value).then((response) => {
-      proxy.$modal.msgSuccess("修改成功");
+      proxy.$modal.msgSuccess("修改成功，重新登录后生效!");
+      proxy.$tab.reLaunch("pages/mine/index");
     });
   });
 }

src/pages/mine/info/index.vue

@@ -32,7 +32,7 @@ const postGroup = ref("");
 
 function getUser() {
   getUserProfile().then((response) => {
-    user.value = response.data;
+    user.value = response.data.user;
     roleGroup.value = response.roleGroup;
     postGroup.value = response.postGroup;
   });

src/static/iconfont/font/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont";
-  src: url('@/static/iconfont/font/iconfont.ttf') format('truetype');
+  src: url("@/static/iconfont/font/iconfont.ttf") format("truetype");
 }
 
 .iconfont {
@@ -12,79 +12,97 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+/* 编辑资料 */
 .icon-user:before {
   content: "\e7ae";
 }
 
+/* 修改密码 */
 .icon-password:before {
   content: "\e8b2";
 }
 
+/* 安全icon */
 .icon-code:before {
   content: "\e699";
 }
 
+/* 应用设置 */
 .icon-setting:before {
   content: "\e6cc";
 }
 
+/* 分享icon */
 .icon-share:before {
   content: "\e739";
 }
 
+/* 编辑icon */
 .icon-edit:before {
   content: "\e60c";
 }
 
+/* 提示icon */
 .icon-version:before {
   content: "\e63f";
 }
 
+/* 在线客服 */
 .icon-service:before {
   content: "\e6ff";
 }
 
+/* 客服QQ */
 .icon-friendfill:before {
   content: "\e726";
 }
 
+/* 反馈社区 */
 .icon-community:before {
   content: "\e741";
 }
 
+/* 头像icon */
 .icon-people:before {
   content: "\e736";
 }
 
+/* 点赞我们 */
 .icon-dianzan:before {
   content: "\ec7f";
 }
 
+/* 右边箭头 */
 .icon-right:before {
   content: "\e7eb";
 }
 
+/* 退出登录 */
 .icon-logout:before {
   content: "\e61d";
 }
 
+/* 常见问题 */
 .icon-help:before {
   content: "\e616";
 }
 
+/* github */
 .icon-github:before {
   content: "\e628";
 }
 
+/* 关于我们 */
 .icon-aixin:before {
   content: "\e601";
 }
 
+/* 清理缓存 */
 .icon-clean:before {
   content: "\e607";
 }
 
+/* 检查更新 */
 .icon-refresh:before {
   content: "\e604";
 }
-

src/static/icons/tabBar/analyse-selected.png.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#252525;}
+</style>
+<path class="st0" d="M36.2,26.6c-0.5-2.1-1.8-3.8-3.6-4.8c-0.3-0.2-0.7-0.4-1.1-0.5v0c-0.3-3.9-2.3-7.4-5.4-9.6
+	c0-0.4,0.1-0.8,0.1-1.2c0-4.4-3.5-7.9-7.7-7.9c-4.3,0-7.7,3.5-7.7,7.9c0,0.4,0,0.8,0.1,1.2c-3.1,2.3-5.1,5.8-5.4,9.7
+	c-0.3,0.2-0.7,0.3-1,0.5c-3.6,2.2-4.9,7-2.8,10.8c1,1.8,2.7,3.2,4.6,3.7c0.7,0.2,1.3,0.3,2.1,0.3c1.3,0,2.7-0.4,3.9-1.1
+	c0.4-0.2,0.7-0.5,1-0.7l0,0c1.7,0.8,3.5,1.2,5.4,1.2c1.9,0,3.7-0.4,5.4-1.2c0.3,0.2,0.6,0.5,1,0.7c1.2,0.7,2.5,1.1,3.9,1.1
+	c0.8,0,1.4-0.1,2-0.3c1.9-0.5,3.6-1.8,4.7-3.7C36.5,30.8,36.8,28.6,36.2,26.6z M18.5,4.9c2.9,0,5.3,2.4,5.3,5.4c0,3-2.4,5.4-5.3,5.4
+	c-2.9,0-5.3-2.4-5.3-5.4C13.2,7.4,15.5,4.9,18.5,4.9z M10.9,33.3C10.1,33.8,9.1,34,8.2,34c-0.5,0-0.9-0.1-1.4-0.2
+	c-1.4-0.4-2.5-1.3-3.2-2.5c-1.4-2.6-0.6-6,2-7.4c0.8-0.5,1.7-0.7,2.6-0.7c0.5,0,0.9,0.1,1.4,0.2c1.4,0.4,2.6,1.3,3.3,2.5
+	c0.7,1.2,0.9,2.7,0.5,4.1C13,31.4,12.1,32.6,10.9,33.3z M14.7,32.8c0.4-0.7,0.7-1.4,0.9-2.1c0.6-2,0.3-4.2-0.8-6
+	c-1-1.8-2.7-3.1-4.7-3.7c-0.8-0.2-1.5-0.3-2.3-0.3c0.4-2.6,1.8-5,3.7-6.7c1.3,2.5,3.9,4.3,6.9,4.3c3,0,5.6-1.7,6.9-4.3
+	c2,1.7,3.3,4.1,3.7,6.7c-0.8,0-1.5,0.1-2.2,0.3c-1.9,0.5-3.6,1.8-4.7,3.7c-1,1.7-1.3,3.8-0.8,6c0.2,0.8,0.5,1.5,0.9,2.2
+	C19.8,33.7,17.1,33.7,14.7,32.8z M33.4,31.3c-0.8,1.3-1.9,2.2-3.2,2.5l-0.1,0C29.7,34,29.3,34,28.8,34c-0.9,0-1.8-0.2-2.7-0.7
+	c-0.9-0.6-2.1-1.6-2.5-3.3c-0.4-1.5-0.2-2.9,0.5-4.1c0.8-1.3,1.9-2.2,3.3-2.5c0.5-0.1,0.9-0.2,1.4-0.2c0.9,0,1.8,0.2,2.6,0.7
+	C34,25.4,34.9,28.7,33.4,31.3C33.4,31.3,33.4,31.3,33.4,31.3z"/>
+</svg>

src/static/icons/tabBar/analyse.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#898989;}
+</style>
+<path class="st0" d="M36.2,26.6c-0.5-2.1-1.8-3.8-3.6-4.8c-0.3-0.2-0.7-0.4-1.1-0.5v0c-0.3-3.9-2.3-7.4-5.4-9.6
+	c0-0.4,0.1-0.8,0.1-1.2c0-4.4-3.5-7.9-7.7-7.9c-4.3,0-7.7,3.5-7.7,7.9c0,0.4,0,0.8,0.1,1.2c-3.1,2.3-5.1,5.8-5.4,9.7
+	c-0.3,0.2-0.7,0.3-1,0.5c-3.6,2.2-4.9,7-2.8,10.8c1,1.8,2.7,3.2,4.6,3.7c0.7,0.2,1.3,0.3,2.1,0.3c1.3,0,2.7-0.4,3.9-1.1
+	c0.4-0.2,0.7-0.5,1-0.7l0,0c1.7,0.8,3.5,1.2,5.4,1.2c1.9,0,3.7-0.4,5.4-1.2c0.3,0.2,0.6,0.5,1,0.7c1.2,0.7,2.5,1.1,3.9,1.1
+	c0.8,0,1.4-0.1,2-0.3c1.9-0.5,3.6-1.8,4.7-3.7C36.5,30.8,36.8,28.6,36.2,26.6z M18.5,4.9c2.9,0,5.3,2.4,5.3,5.4c0,3-2.4,5.4-5.3,5.4
+	c-2.9,0-5.3-2.4-5.3-5.4C13.2,7.4,15.5,4.9,18.5,4.9z M10.9,33.3C10.1,33.8,9.1,34,8.2,34c-0.5,0-0.9-0.1-1.4-0.2
+	c-1.4-0.4-2.5-1.3-3.2-2.5c-1.4-2.6-0.6-6,2-7.4c0.8-0.5,1.7-0.7,2.6-0.7c0.5,0,0.9,0.1,1.4,0.2c1.4,0.4,2.6,1.3,3.3,2.5
+	c0.7,1.2,0.9,2.7,0.5,4.1C13,31.4,12.1,32.6,10.9,33.3z M14.7,32.8c0.4-0.7,0.7-1.4,0.9-2.1c0.6-2,0.3-4.2-0.8-6
+	c-1-1.8-2.7-3.1-4.7-3.7c-0.8-0.2-1.5-0.3-2.3-0.3c0.4-2.6,1.8-5,3.7-6.7c1.3,2.5,3.9,4.3,6.9,4.3c3,0,5.6-1.7,6.9-4.3
+	c2,1.7,3.3,4.1,3.7,6.7c-0.8,0-1.5,0.1-2.2,0.3c-1.9,0.5-3.6,1.8-4.7,3.7c-1,1.7-1.3,3.8-0.8,6c0.2,0.8,0.5,1.5,0.9,2.2
+	C19.8,33.7,17.1,33.7,14.7,32.8z M33.4,31.3c-0.8,1.3-1.9,2.2-3.2,2.5l-0.1,0C29.7,34,29.3,34,28.8,34c-0.9,0-1.8-0.2-2.7-0.7
+	c-0.9-0.6-2.1-1.6-2.5-3.3c-0.4-1.5-0.2-2.9,0.5-4.1c0.8-1.3,1.9-2.2,3.3-2.5c0.5-0.1,0.9-0.2,1.4-0.2c0.9,0,1.8,0.2,2.6,0.7
+	C34,25.4,34.9,28.7,33.4,31.3C33.4,31.3,33.4,31.3,33.4,31.3z"/>
+</svg>

src/static/icons/tabBar/home-selected.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#252525;}
+</style>
+<path class="st0" d="M36,16.1L21.1,3.4c-1.4-1.2-3.5-1.2-4.9,0L1,16.1c-0.3,0.3-0.5,0.6-0.5,1c0,0.7,0.6,1.3,1.3,1.3
+	c0.3,0,0.6-0.1,0.8-0.3l0.4-0.4v14.4c0,2.9,2.2,5.3,5,5.3h21c2.7,0,4.9-2.4,4.9-5.3V17.7l0.4,0.3c0.3,0.2,0.5,0.3,0.9,0.3
+	c0.7,0,1.3-0.6,1.3-1.3C36.5,16.8,36.3,16.4,36,16.1z M15.9,34.9v-9.1c0-0.7,0.6-1.3,1.3-1.3h2.6c0.7,0,1.3,0.6,1.3,1.3v9.1H15.9z
+	 M31.4,32.2c0,1.5-1.1,2.7-2.4,2.7h-5.3v-9.1c0-2.1-1.7-3.9-3.9-3.9h-2.6c-2.1,0-3.9,1.7-3.9,3.9v9.1H8.1c-1.3,0-2.4-1.2-2.4-2.7
+	V15.6L17.7,5.4c0.4-0.4,1.2-0.4,1.7,0l12,10.1V32.2z"/>
+</svg>

src/static/icons/tabBar/home.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#898989;}
+</style>
+<path class="st0" d="M36,16.1L21.1,3.4c-1.4-1.2-3.5-1.2-4.9,0L1,16.1c-0.3,0.3-0.5,0.6-0.5,1c0,0.7,0.6,1.3,1.3,1.3
+	c0.3,0,0.6-0.1,0.8-0.3l0.4-0.4v14.4c0,2.9,2.2,5.3,5,5.3h21c2.7,0,4.9-2.4,4.9-5.3V17.7l0.4,0.3c0.3,0.2,0.5,0.3,0.9,0.3
+	c0.7,0,1.3-0.6,1.3-1.3C36.5,16.8,36.3,16.4,36,16.1z M15.9,34.9v-9.1c0-0.7,0.6-1.3,1.3-1.3h2.6c0.7,0,1.3,0.6,1.3,1.3v9.1H15.9z
+	 M31.4,32.2c0,1.5-1.1,2.7-2.4,2.7h-5.3v-9.1c0-2.1-1.7-3.9-3.9-3.9h-2.6c-2.1,0-3.9,1.7-3.9,3.9v9.1H8.1c-1.3,0-2.4-1.2-2.4-2.7
+	V15.6L17.7,5.4c0.4-0.4,1.2-0.4,1.7,0l12,10.1V32.2z"/>
+</svg>

src/static/icons/tabBar/info-selected.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#252525;}
+</style>
+<path class="st0" d="M8.1,5.5c0.5-0.3,0.7-1,0.4-1.5C8.2,3.4,7.6,3.3,7,3.6c0,0,0,0,0,0c-4,2.7-6.4,7.1-6.5,11.9
+	c0,0.6,0.4,1.1,1,1.2c0,0,0,0,0,0h0c0.6,0,1.1-0.5,1.1-1.1C2.8,11.6,4.8,7.8,8.1,5.5z M30,3.6c-0.5-0.3-1.2-0.1-1.5,0.4c0,0,0,0,0,0
+	c-0.3,0.5-0.1,1.2,0.4,1.5c0,0,0,0,0,0c3.3,2.3,5.3,6.1,5.4,10.1c0,0.6,0.5,1.1,1.1,1.1h0c0.6,0,1.1-0.6,1-1.2
+	C36.4,10.7,34,6.3,30,3.6L30,3.6z M15.4,34.7V35c0,0.1,0,0.1,0,0.3v0c0,0.1,0,0.2,0.1,0.2v0c0,0.1,0.1,0.1,0.1,0.2v0l0.1,0.2v0
+	c0,0.1,0.1,0.1,0.2,0.2c0,0,0,0,0,0c0,0.1,0.1,0.1,0.2,0.2c0,0,0,0,0,0c0,0.1,0.1,0.1,0.2,0.2c1.3,1.2,3.3,1.2,4.6,0
+	c0.1,0,0.1-0.1,0.1-0.2c0,0,0,0,0,0c0-0.1,0.1-0.1,0.1-0.2c0,0,0,0,0,0c0-0.1,0.1-0.1,0.1-0.2v0l0.1-0.2v0c0-0.1,0.1-0.1,0.1-0.2v0
+	c0-0.1,0.1-0.1,0.1-0.2v0c0-0.1,0-0.2,0-0.3v-0.3l-5.2,0L15.4,34.7L15.4,34.7z M30.6,26.8c-0.4-0.3-0.7-0.7-0.7-1.3V14.7
+	c0-1.3-0.3-2.7-0.9-3.9c-0.6-1.2-1.4-2.3-2.5-3.1c-1.1-0.9-2.3-1.6-3.7-2.2c-0.5-0.2-1-0.3-1.6-0.4V4c-0.3-1.6-1.8-2.8-3.4-2.5
+	c-1.3,0.2-2.3,1.2-2.5,2.5v1.1c-0.5,0.1-1,0.3-1.6,0.5c-1.4,0.5-2.6,1.2-3.7,2.2c-1,0.9-1.9,1.9-2.5,3.1c-0.6,1.2-0.9,2.5-0.9,3.9
+	v10.8c0,0.5-0.3,1-0.7,1.3l-2.5,1.7c-0.5,0.3-0.8,0.7-1,1.3c-0.3,1,0.1,2,1,2.5c0.5,0.3,1.1,0.5,1.7,0.5h26.1c0.6,0,1.2-0.2,1.7-0.5
+	c1-0.4,1.5-1.5,1.2-2.5c-0.2-0.5-0.5-1-1-1.3L30.6,26.8L30.6,26.8z M17.9,4.2C18.1,4,18.2,4,18.4,4C18.6,4,18.8,4,19,4.2v0.7h-1.1
+	C17.9,4.6,17.9,4.4,17.9,4.2z M17.9,3.6c-0.1,0.1-0.3,0.2-0.3,0.3C17.6,3.8,17.7,3.7,17.9,3.6z M17.6,3.9c-0.1,0-0.1,0.1-0.1,0.1
+	C17.5,4,17.5,4,17.6,3.9z M31.5,30.5H5.2l2.3-1.6c1.1-0.7,1.7-1.9,1.8-3.2V14.9c0-1,0.2-1.9,0.7-2.8c0.5-0.9,1.1-1.7,1.9-2.4
+	c0.9-0.7,1.9-1.3,2.9-1.7c0.4-0.1,0.9-0.3,1.3-0.4l1.6-0.4h1.6l1.7,0.4c0.4,0.1,0.8,0.2,1.2,0.4c1.1,0.4,2.1,1,2.9,1.7
+	c0.8,0.7,1.4,1.5,1.9,2.4c0.4,0.9,0.7,1.8,0.7,2.8v10.8c0,1.3,0.7,2.5,1.7,3.2l2.3,1.6H31.5z"/>
+</svg>

src/static/icons/tabBar/info.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#898989;}
+</style>
+<path class="st0" d="M8.1,5.5c0.5-0.3,0.7-1,0.4-1.5C8.2,3.4,7.6,3.3,7,3.6c0,0,0,0,0,0c-4,2.7-6.4,7.1-6.5,11.9
+	c0,0.6,0.4,1.1,1,1.2c0,0,0,0,0,0h0c0.6,0,1.1-0.5,1.1-1.1C2.8,11.6,4.8,7.8,8.1,5.5z M30,3.6c-0.5-0.3-1.2-0.1-1.5,0.4c0,0,0,0,0,0
+	c-0.3,0.5-0.1,1.2,0.4,1.5c0,0,0,0,0,0c3.3,2.3,5.3,6.1,5.4,10.1c0,0.6,0.5,1.1,1.1,1.1h0c0.6,0,1.1-0.6,1-1.2
+	C36.4,10.7,34,6.3,30,3.6L30,3.6z M15.4,34.7V35c0,0.1,0,0.2,0,0.3v0c0,0.1,0,0.2,0.1,0.2v0c0,0.1,0.1,0.1,0.1,0.2v0l0.1,0.2v0
+	c0,0.1,0.1,0.1,0.2,0.2c0,0,0,0,0,0c0,0.1,0.1,0.1,0.2,0.2c0,0,0,0,0,0c0,0.1,0.1,0.1,0.2,0.1c1.3,1.2,3.3,1.2,4.6,0
+	c0.1,0,0.1-0.1,0.1-0.2c0,0,0,0,0,0c0-0.1,0.1-0.1,0.1-0.2c0,0,0,0,0,0c0-0.1,0.1-0.1,0.1-0.2v0l0.1-0.2v0c0-0.1,0.1-0.1,0.1-0.2v0
+	c0-0.1,0.1-0.1,0.1-0.2v0c0-0.1,0-0.1,0-0.3v-0.3l-5.2,0L15.4,34.7L15.4,34.7z M30.6,26.8c-0.4-0.3-0.7-0.7-0.7-1.3V14.7
+	c0-1.3-0.3-2.7-0.9-3.9c-0.6-1.2-1.4-2.3-2.5-3.1c-1.1-0.9-2.3-1.6-3.7-2.2c-0.5-0.2-1-0.3-1.6-0.4V4c-0.3-1.6-1.8-2.8-3.4-2.5
+	c-1.3,0.2-2.3,1.2-2.5,2.5v1.1c-0.5,0.1-1,0.3-1.6,0.5c-1.4,0.5-2.6,1.2-3.7,2.2c-1,0.9-1.9,1.9-2.5,3.1c-0.6,1.2-0.9,2.5-0.9,3.9
+	v10.8c0,0.5-0.3,1-0.7,1.3l-2.5,1.7c-0.5,0.3-0.8,0.7-1,1.3c-0.3,1,0.1,2,1,2.5c0.5,0.3,1.1,0.5,1.7,0.5h26.1c0.6,0,1.2-0.2,1.7-0.5
+	c1-0.4,1.5-1.5,1.2-2.5c-0.2-0.5-0.5-1-1-1.3L30.6,26.8L30.6,26.8z M17.9,4.2C18.1,4,18.2,4,18.4,4C18.6,4,18.8,4,19,4.2v0.7h-1.1
+	C17.9,4.6,17.9,4.4,17.9,4.2z M17.9,3.6c-0.1,0.1-0.3,0.2-0.3,0.3C17.6,3.8,17.7,3.7,17.9,3.6z M17.6,3.9c-0.1,0-0.1,0.1-0.1,0.1
+	C17.5,4,17.5,4,17.6,3.9z M31.5,30.5H5.2l2.3-1.6c1.1-0.7,1.7-1.9,1.8-3.2V14.9c0-1,0.2-1.9,0.7-2.8c0.5-0.9,1.1-1.7,1.9-2.4
+	c0.9-0.7,1.9-1.3,2.9-1.7c0.4-0.1,0.9-0.3,1.3-0.4l1.6-0.4h1.6l1.7,0.4c0.4,0.1,0.8,0.2,1.2,0.4c1.1,0.4,2.1,1,2.9,1.7
+	c0.8,0.7,1.4,1.5,1.9,2.4c0.4,0.9,0.7,1.8,0.7,2.8v10.8c0,1.3,0.7,2.5,1.7,3.2l2.3,1.6H31.5z"/>
+</svg>

src/static/icons/tabBar/setting-selected.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#252525;}
+</style>
+<path class="st0" d="M35.5,33.7c-0.1-6.2-3.4-11.6-8.3-14.5c3.4-4.3,3.1-10.5-0.8-14.5c-2.1-2.1-4.8-3.2-7.6-3.2
+	c-2.7,0-5.5,1.1-7.6,3.2c-3.8,3.9-4.2,10-1,14.2c0,0,0,0,0,0c-5.2,2.9-8.7,8.4-8.8,14.8h0v1.7c0,1.1,0.9,2,2,2h30c1.1,0,2-0.9,2-2
+	L35.5,33.7L35.5,33.7L35.5,33.7z M12.7,6.1c1.6-1.7,3.8-2.6,6.2-2.6c2.3,0,4.5,0.9,6.2,2.6c1.6,1.7,2.6,3.9,2.6,6.3
+	c0,2.4-0.9,4.6-2.6,6.3c-1.6,1.7-3.8,2.6-6.2,2.6c-2.3,0-4.5-0.9-6.2-2.6C9.3,15.2,9.3,9.6,12.7,6.1z M31.5,35.5h-26h-2V34l0,0
+	c0-5.9,3.3-11,8.2-13.5c2,1.9,4.6,2.8,7.2,2.8c2.5,0,4.9-0.9,6.9-2.6c4.6,2.6,7.7,7.6,7.7,13.3v1.5H31.5z"/>
+</svg>

src/static/icons/tabBar/setting.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#898989;}
+</style>
+<path class="st0" d="M35.5,33.7c-0.1-6.2-3.4-11.6-8.3-14.5c3.4-4.3,3.1-10.5-0.8-14.5c-2.1-2.1-4.8-3.2-7.6-3.2
+	c-2.7,0-5.5,1.1-7.6,3.2c-3.8,3.9-4.2,10-1,14.2c0,0,0,0,0,0c-5.2,2.9-8.7,8.4-8.8,14.8h0v1.7c0,1.1,0.9,2,2,2h30c1.1,0,2-0.9,2-2
+	L35.5,33.7L35.5,33.7L35.5,33.7z M12.7,6.1c1.6-1.7,3.8-2.6,6.2-2.6c2.3,0,4.5,0.9,6.2,2.6c1.6,1.7,2.6,3.9,2.6,6.3
+	c0,2.4-0.9,4.6-2.6,6.3c-1.6,1.7-3.8,2.6-6.2,2.6c-2.3,0-4.5-0.9-6.2-2.6C9.3,15.2,9.3,9.6,12.7,6.1z M31.5,35.5h-26h-2V34l0,0
+	c0-5.9,3.3-11,8.2-13.5c2,1.9,4.6,2.8,7.2,2.8c2.5,0,4.9-0.9,6.9-2.6c4.6,2.6,7.7,7.6,7.7,13.3v1.5H31.5z"/>
+</svg>

src/static/js/json.js

@@ -2,43 +2,43 @@
 // 首页九宫格
 let cuIconList = [
   {
-    imgUrl: "/static/images/index/ge1.png",
+    imgUrl: "/static/icons/index/APP-xunjian.svg",
     badge: 0,
     name: "巡检",
     redirectUrl: "/pages/business/mhxf/xunJian/xunJian",
   },
   {
-    imgUrl: "/static/images/index/ge2.png",
+    imgUrl: "/static/icons/index/APP-xxcx.svg",
     badge: 0,
     name: "信息查询",
     redirectUrl: "/pages/business/mhxf/informationSelect/index",
   },
   {
-    imgUrl: "/static/images/index/ge3.png",
+    imgUrl: "/static/icons/index/APP-sbgl.svg",
     badge: 0,
     name: "设备管理",
     redirectUrl: "/pages/business/mhxf/deviceManage/index",
   },
   {
-    imgUrl: "/static/images/index/ge4.png",
+    imgUrl: "/static/icons/index/APP-zzdt.svg",
     badge: 0,
     name: "协同作战",
     redirectUrl: "/pages/business/mhxf/coordination/index",
   },
   {
-    imgUrl: "/static/images/index/ge5.png",
+    imgUrl: "/static/icons/index/APP-dwxxcj.svg",
     badge: 0,
     name: "单位采集",
     redirectUrl: "/pages/business/mhxf/unitInfoCollection/index",
   },
   {
-    imgUrl: "/static/images/index/ge6.png",
+    imgUrl: "/static/icons/index/APP-xfbg.svg",
     badge: 0,
     name: "消防报告",
     redirectUrl: "/pages/business/mhxf/fireReport/index",
   },
   {
-    imgUrl: "/static/images/index/ge7.png",
+    imgUrl: "/static/icons/index/APP-dbsx.svg",
     badge: 0,
     name: "待办事项",
     redirectUrl: "/pages/business/mhxf/needMatter/index",

src/static/scss/global.scss

@@ -68,7 +68,7 @@
   
   
   .menu-list {
-    margin: 15px 15px;
+    margin: 0.625rem 0.625rem;
   
     .menu-item-box {
       width: 100%;

src/static/scss/public.scss

@@ -203,6 +203,16 @@ uni-input {
 }
 //折叠面板样式 结束
 
+//步骤条样式 开始
+.u-steps {
+  .u-steps-item {
+    .u-text {
+      justify-content: center !important;
+    }
+  }
+}
+//步骤条样式 结束
+
 /*
  * 页面样式 开始
  * @/pages/xunJian/plan/components/siteDetails.vue

src/uni_modules/uview-plus/changelog.md

@@ -1,3 +1,7 @@
+## 3.1.28（2023-03-03）
+修复u-tabs标签缺失
+## 3.1.27（2023-02-28）
+修复日历组建对dayjs等依赖
 ## 3.1.26（2023-02-04）
 修复安卓Multiple conflicting contents for sourcemap
 ## 3.1.25（2023-02-04）

src/uni_modules/uview-plus/components/u-calendar/u-calendar.vue

@@ -68,9 +68,9 @@ import uHeader from './header.vue'
 import uMonth from './month.vue'
 import props from './props.js'
 import util from './util.js'
-import dayjs from '../../libs/util/dayjs.min.js'
-// import dayjs from 'dayjs'
-// import Calendar from '../../libs/util/calendar.js'
+// import dayjs from '../../libs/util/dayjs.min.js'
+import dayjs from 'dayjs'
+import Calendar from '../../libs/util/calendar.js'
 import mpMixin from '../../libs/mixin/mpMixin.js'
 import mixin from '../../libs/mixin/mixin.js'
 /**

src/uni_modules/uview-plus/components/u-form/u-form.vue

@@ -146,17 +146,15 @@
 							const propertyName =
 								propertyChain[propertyChain.length - 1];
 
-							//修改：将const改为let 
-							let rule = this.formRules[child.prop];
-							//修改：链式是无法通过上面的方式获取的，改为下面的方式
-							
+							const rule = this.formRules[child.prop];
+
 							if(!rule){
 								rule=uni.$u.getProperty(
 								this.formRules,
 								child.prop
 								);
 							}
-							
+
 							// 如果不存在对应的规则，直接返回，否则校验器会报错
 							if (!rule) return;
 							// rule规则可为数组形式，也可为对象形式，此处拼接成为数组

src/uni_modules/uview-plus/libs/config/config.js

@@ -1,9 +1,8 @@
-// 此版本发布于2022-08-07
-const version = '3.1.6'
+const version = '3'
 
 // 开发环境才提示，生产环境不会提示
 if (process.env.NODE_ENV === 'development') {
-	console.log(`\n %c uview-plus V${version} %c https://uiadmin.net/uview-plus \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
+	console.log(`\n %c uview-plus V${version} %c https://ijry.github.io/uview-plus/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
 }
 
 export default {

src/uni_modules/uview-plus/libs/util/calendar.js

@@ -12,7 +12,7 @@
 * @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
 */
 /* eslint-disable */
-var calendar = {
+var Calendar = {
 
     /**
         * 农历1900-2100的润大小信息表
@@ -543,4 +543,4 @@ var calendar = {
     }
 }
 
-export default calendar
+export default Calendar

src/uni_modules/uview-plus/package.json

@@ -2,7 +2,7 @@
 	"id": "uview-plus",
 	"name": "uview-plus",
 	"displayName": "uview-plus3.0重磅发布，全面的Vue3移动组件库。",
-	"version": "3.1.26",
+	"version": "3.1.28",
 	"description": "uview-plus已兼容vue3，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
 	"keywords": [
         "uview",
@@ -84,5 +84,8 @@
 	"dependencies": {
 		"clipboard": "^2.0.11",
 		"dayjs": "^1.11.3"
+	},
+	"publishConfig": {
+	    "registry": "https://registry.npmjs.org/"
 	}
 }

src/utils/request.js

@@ -51,8 +51,10 @@ const request = (config) => {
           reject("无效的会话，或者会话已过期，请重新登录。");
         } else if (code === 500 || res.statusCode === 500) {
           if (res.data.msg.indexOf(":") !== -1) {
+            modal.msg(res.data.msg.split(":")[1]);
             reject(res.data.msg.split(":")[1]);
           } else {
+            modal.msg(res.data.msg);
             reject(res.data.msg);
           }
         } else if (code !== 200 && code !== "0") {

src/utils/upload.js

@@ -43,8 +43,14 @@ const upload = (config) => {
             }
           });
           reject("无效的会话，或者会话已过期，请重新登录。");
-        } else if (code === 500) {
-          reject("500");
+        } else if (code === 500 || res.statusCode === 500) {
+          if (res.data.msg.indexOf(":") !== -1) {
+            modal.msg(res.data.msg.split(":")[1]);
+            reject(res.data.msg.split(":")[1]);
+          } else {
+            modal.msg(res.data.msg);
+            reject(res.data.msg);
+          }
         } else if (code !== 200 && code !== "0") {
           reject(code);
         }