修改单位信息采集信息

package.json

@@ -32,7 +32,8 @@
         "build:quickapp-webview": "uni build -p quickapp-webview",
         "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
         "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
-        "clear": "rimraf node_modules && cnpm install"
+        "clear": "rimraf node_modules && cnpm install",
+        "clean": "npm cache clean --force"
     },
     "dependencies": {
         "@amap/amap-jsapi-loader": "^1.0.1",
@@ -50,7 +51,7 @@
         "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3050320220729001",
         "echarts": "^5.3.3",
         "node-sass": "^7.0.1",
-        "pinia": "^2.0.17",
+        "pinia": "^2.0.34",
         "pinia-plugin-persistedstate": "^2.1.1",
         "vue": "^3.2.47",
         "vue-echarts": "^6.2.3",

src/manifest.json

@@ -110,9 +110,6 @@
                         "appkey_ios" : "ffc71dfd4e576596027f8f45a1b8fb2f",
                         "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f"
                     }
-                },
-                "push" : {
-                    "unipush" : null
                 }
             },
             "icons" : {

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

@@ -196,7 +196,7 @@
                 </u-checkbox-group>
               </u-form-item>
 
-              <u-form-item label="其他设施" :prop="`baseBuildList.${index}.baseBuild.otherSystem`" required :borderBottom="true">
+              <u-form-item label="其他设施" :prop="`li.baseBuildList.baseBuild.otherSystem`" :borderBottom="true">
                 <u-checkbox-group v-model="li.baseBuild.otherSystem" placement="column" @change="checkboxChange">
                   <u-checkbox :customStyle="{ marginBottom: '8px' }" label="泡沫灭火系统" :name="1"> </u-checkbox>
                   <u-checkbox :customStyle="{ marginBottom: '8px' }" label="水喷雾、细水雾灭火系统" :name="2"> </u-checkbox>
@@ -636,17 +636,10 @@ const dataList = reactive({
 
       fireFacilitySystem: [
         {
+          type: "array",
           required: true,
           message: "请选择消防设施设置",
-          trigger: ["blur", "change"],
-        },
-      ],
-
-      otherSystem: [
-        {
-          required: true,
-          message: "请选择其它设施",
-          trigger: ["blur", "change"],
+          trigger: ["change"],
         },
       ],
     },

src/plugins/constData.plugins.js

@@ -3,156 +3,147 @@ export default {
 	appName: '通用办公',
 
 	// 主题列表
-	themeList: [{
-		title: '官方',
-		name: 'rf',
-		color: '#149eff',
-		tabList: [
-			'/static/images/tabBar/tab-home-blue.png',
-			'/static/images/tabBar/tab-info-blue.png',
-			'/static/images/tabBar/tab-my-blue.png'
-		]
-	},
-	{
-		title: '嫣红',
-		name: 'red',
-		color: '#e54d42',
-		tabList: [
-			'/static/images/tabBar/tab-home-red.png',
-			'/static/images/tabBar/tab-info-red.png',
-			'/static/images/tabBar/tab-my-red.png'
-		]
-	},
-	{
-		title: '桔橙',
-		name: 'orange',
-		color: '#f37b1d',
-		tabList: [
-			'/static/images/tabBar/tab-home-orange.png',
-			'/static/images/tabBar/tab-info-orange.png',
-			'/static/images/tabBar/tab-my-orange.png'
-		]
-	},
-	{
-		title: '明黄',
-		name: 'yellow',
-		color: '#fbbd08',
-		tabList: [
-			'/static/images/tabBar/tab-home-yellow.png',
-			'/static/images/tabBar/tab-info-yellow.png',
-			'/static/images/tabBar/tab-my-yellow.png'
-		]
-	},
-	{
-		title: '橄榄',
-		name: 'olive',
-		color: '#8dc63f',
-		tabList: [
-			'/static/images/tabBar/tab-home-olive.png',
-			'/static/images/tabBar/tab-info-olive.png',
-			'/static/images/tabBar/tab-my-olive.png'
-		]
-	},
-	{
-		title: '森绿',
-		name: 'green',
-		color: '#39b54a',
-		tabList: [
-			'/static/images/tabBar/tab-home-green.png',
-			'/static/images/tabBar/tab-info-green.png',
-			'/static/images/tabBar/tab-my-green.png'
-		]
-	},
-	{
-		title: '天青',
-		name: 'cyan',
-		color: '#1cbbb4',
-		tabList: [
-			'/static/images/tabBar/tab-home-cyan.png',
-			'/static/images/tabBar/tab-info-cyan.png',
-			'/static/images/tabBar/tab-my-cyan.png'
-		]
-	},
-	{
-		title: '海蓝',
-		name: 'blue',
-		color: '#0081ff',
-		tabList: [
-			'/static/images/tabBar/tab-home-blue.png',
-			'/static/images/tabBar/tab-info-blue.png',
-			'/static/images/tabBar/tab-my-blue.png'
-		]
-	},
-	{
-		title: '姹紫',
-		name: 'purple',
-		color: '#6739b6',
-		tabList: [
-			'/static/images/tabBar/tab-home-purple.png',
-			'/static/images/tabBar/tab-info-purple.png',
-			'/static/images/tabBar/tab-my-purple.png'
-		]
-	},
-	{
-		title: '木槿',
-		name: 'mauve',
-		color: '#9c26b0',
-		tabList: [
-			'/static/images/tabBar/tab-home-mauve.png',
-			'/static/images/tabBar/tab-info-mauve.png',
-			'/static/images/tabBar/tab-my-mauve.png'
-		]
-	},
-	{
-		title: '桃粉',
-		name: 'pink',
-		color: '#e03997',
-		tabList: [
-			'/static/images/tabBar/tab-home-pink.png',
-			'/static/images/tabBar/tab-info-pink.png',
-			'/static/images/tabBar/tab-my-pink.png'
-		]
-	},
-	{
-		title: '棕褐',
-		name: 'brown',
-		color: '#a5673f',
-		tabList: [
-			'/static/images/tabBar/tab-home-brown.png',
-			'/static/images/tabBar/tab-info-brown.png',
-			'/static/images/tabBar/tab-my-brown.png'
-		]
-	},
-	{
-		title: '玄灰',
-		name: 'grey',
-		color: '#8799a3',
-		tabList: [
-			'/static/images/tabBar/tab-home-grey.png',
-			'/static/images/tabBar/tab-info-grey.png',
-			'/static/images/tabBar/tab-my-grey.png'
-		]
-	},
-	{
-		title: '草灰',
-		name: 'gray',
-		color: '#aaaaaa',
-		tabList: [
-			'/static/images/tabBar/tab-home-gray.png',
-			'/static/images/tabBar/tab-info-gray.png',
-			'/static/images/tabBar/tab-my-gray.png'
-		]
-	},
-	{
-		title: '墨黑',
-		name: 'black',
-		color: '#333333',
-		tabList: [
-			'/static/images/tabBar/tab-home-black.png',
-			'/static/images/tabBar/tab-info-black.png',
-			'/static/images/tabBar/tab-my-black.png'
-		]
-	}
+	themeList: [
+		{
+			title: '官方',
+			name: 'rf',
+			color: '#149eff',
+			tabList: [
+				'/static/images/tabBar/tab-home-blue.png',
+				'/static/images/tabBar/tab-info-blue.png',
+				'/static/images/tabBar/tab-my-blue.png'
+			]
+		},
+		{
+			title: '海蓝',
+			name: 'blue',
+			color: '#0081ff',
+			tabList: [
+				'/static/images/tabBar/tab-home-blue.png',
+				'/static/images/tabBar/tab-info-blue.png',
+				'/static/images/tabBar/tab-my-blue.png'
+			]
+		},
+		{
+			title: '嫣红',
+			name: 'red',
+			color: '#e54d42',
+			tabList: [
+				'/static/images/tabBar/tab-home-red.png',
+				'/static/images/tabBar/tab-info-red.png',
+				'/static/images/tabBar/tab-my-red.png'
+			]
+		},
+		{
+			title: '桔橙',
+			name: 'orange',
+			color: '#f37b1d',
+			tabList: [
+				'/static/images/tabBar/tab-home-orange.png',
+				'/static/images/tabBar/tab-info-orange.png',
+				'/static/images/tabBar/tab-my-orange.png'
+			]
+		},
+		{
+			title: '明黄',
+			name: 'yellow',
+			color: '#fbbd08',
+			tabList: [
+				'/static/images/tabBar/tab-home-yellow.png',
+				'/static/images/tabBar/tab-info-yellow.png',
+				'/static/images/tabBar/tab-my-yellow.png'
+			]
+		},
+		{
+			title: '橄榄',
+			name: 'olive',
+			color: '#8dc63f',
+			tabList: [
+				'/static/images/tabBar/tab-home-olive.png',
+				'/static/images/tabBar/tab-info-olive.png',
+				'/static/images/tabBar/tab-my-olive.png'
+			]
+		},
+		{
+			title: '森绿',
+			name: 'green',
+			color: '#39b54a',
+			tabList: [
+				'/static/images/tabBar/tab-home-green.png',
+				'/static/images/tabBar/tab-info-green.png',
+				'/static/images/tabBar/tab-my-green.png'
+			]
+		},
+		{
+			title: '天青',
+			name: 'cyan',
+			color: '#1cbbb4',
+			tabList: [
+				'/static/images/tabBar/tab-home-cyan.png',
+				'/static/images/tabBar/tab-info-cyan.png',
+				'/static/images/tabBar/tab-my-cyan.png'
+			]
+		},
+		{
+			title: '姹紫',
+			name: 'purple',
+			color: '#6739b6',
+			tabList: [
+				'/static/images/tabBar/tab-home-purple.png',
+				'/static/images/tabBar/tab-info-purple.png',
+				'/static/images/tabBar/tab-my-purple.png'
+			]
+		},
+		{
+			title: '木槿',
+			name: 'mauve',
+			color: '#9c26b0',
+			tabList: [
+				'/static/images/tabBar/tab-home-mauve.png',
+				'/static/images/tabBar/tab-info-mauve.png',
+				'/static/images/tabBar/tab-my-mauve.png'
+			]
+		},
+		{
+			title: '桃粉',
+			name: 'pink',
+			color: '#e03997',
+			tabList: [
+				'/static/images/tabBar/tab-home-pink.png',
+				'/static/images/tabBar/tab-info-pink.png',
+				'/static/images/tabBar/tab-my-pink.png'
+			]
+		},
+		{
+			title: '棕褐',
+			name: 'brown',
+			color: '#a5673f',
+			tabList: [
+				'/static/images/tabBar/tab-home-brown.png',
+				'/static/images/tabBar/tab-info-brown.png',
+				'/static/images/tabBar/tab-my-brown.png'
+			]
+		},
+		{
+			title: '玄灰',
+			name: 'grey',
+			color: '#8799a3',
+			tabList: [
+				'/static/images/tabBar/tab-home-grey.png',
+				'/static/images/tabBar/tab-info-grey.png',
+				'/static/images/tabBar/tab-my-grey.png'
+			]
+		},
+		{
+			title: '墨黑',
+			name: 'black',
+			color: '#333333',
+			tabList: [
+				'/static/images/tabBar/tab-home-black.png',
+				'/static/images/tabBar/tab-info-black.png',
+				'/static/images/tabBar/tab-my-black.png'
+			]
+		}
 	],
 
 };

src/static/iconfont/font/iconfont.css

@@ -1,108 +0,0 @@
-@font-face {
-  font-family: "iconfont";
-  src: url("@/static/iconfont/font/iconfont.ttf") format("truetype");
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  display: inline-block;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -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/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_br3ktl1o908.woff2?t=1683275654551') format('woff2'),
-       url('https://at.alicdn.com/t/c/font_3620854_br3ktl1o908.woff?t=1683275654551') format('woff'),
-       url('https://at.alicdn.com/t/c/font_3620854_br3ktl1o908.ttf?t=1683275654551') format('truetype');
+  src: url('https://at.alicdn.com/t/c/font_3620854_bnae7oxag3.woff2?t=1684144663663') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_3620854_bnae7oxag3.woff?t=1684144663663') format('woff'),
+       url('https://at.alicdn.com/t/c/font_3620854_bnae7oxag3.ttf?t=1684144663663') format('truetype');
 }
 
 .iconfont {
@@ -13,8 +13,52 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.ucicon-shezhi:before {
-  content: "\e70f";
+.ucicon-people:before {
+  content: "\e736";
+}
+
+.ucicon-Help:before {
+  content: "\e603";
+}
+
+.ucicon-logout:before {
+  content: "\e6f7";
+}
+
+.ucicon-user:before {
+  content: "\e632";
+}
+
+.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";
+}
+
+.ucicon-qinglihuancun:before {
+  content: "\e608";
 }
 
 .ucicon-yanzheng:before {
@@ -85,7 +129,7 @@
   content: "\e62a";
 }
 
-.ucicon-xingzhuang13:before {
+.ucicon-shanchu:before {
   content: "\e66c";
 }
 
@@ -101,6 +145,10 @@
   content: "\e64b";
 }
 
+.ucicon-shezhi:before {
+  content: "\e70f";
+}
+
 .ucicon-filter:before {
   content: "\e7c7";
 }
@@ -123,5 +171,4 @@
 
 .ucicon-eye-close:before {
   content: "\e8ff";
-}
-
+}

src/static/scss/colorui.css

@@ -3786,6 +3786,10 @@ scroll-view.cu-steps .cu-item {
   font-size: 28upx;
 }
 
+.text-dfl {
+  font-size: 30upx;
+}
+
 .text-lg {
   font-size: 32upx;
 }

src/static/scss/index.scss

@@ -1,6 +1,8 @@
 // global
 @import "./global.scss";
 // color-ui
-@import "@/static/scss/colorui.css";
+@import "./colorui.css";
+// public
+@import "./public.scss";
 // iconfont
-@import "@/static/iconfont/font/iconfont.css";
+@import "@/static/iconfont/iconfont.css";

src/store/index.js

@@ -1,7 +1,5 @@
 import { createPinia } from "pinia";
-import { createPersistedState } from 'pinia-plugin-persistedstate'
-import user from '@/store/modules/user'
-import getters from './getters'
+import { createPersistedState } from 'pinia-plugin-persistedstate';
 
 const store = createPinia()