From 0ab2d29886c583c2f76abe4f8fa61bb82d3651ba Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 22 Oct 2024 10:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=20=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  16 +-
 components/Head/index.vue                     |  10 +-
 components/custom-tab-bar/index.vue           |   4 +-
 ec-canvas/ec-canvas.vue                       |   5 +-
 manifest.json                                 | 170 +--
 pages.json                                    |  71 +-
 pages/information/echartsCallBack.js          |   2 +-
 pages/information/information.vue             |   2 +-
 pages/login/login.vue                         |  73 +-
 .../HotlineComplaints/HotlineComplaints.vue   |   2 +-
 .../RequirementAnalysis.vue                   |   2 +-
 .../modules/SmyddcSqmydzc/SmyddcSqmydzc.vue   |   2 +-
 pages/statistics/modules/Trend/Trend.vue      |   2 +-
 {ec-canvas => static}/echarts.js              |   0
 subpages/addResi/pages/addResi/addResi.vue    | 984 +++++++++++++++++-
 .../dissatisfied/demandCheck/demandCheck.vue  |   4 +-
 .../housePortrait/component/graph/graph.vue   |   2 +-
 subpages/morenews/pages/morenews/morenews.vue |  36 +-
 .../pages/punchCard/punchCard.vue             |  16 +-
 .../pages/resiInfo/component/graph/graph.vue  |   2 +-
 .../searchResult/pages/resiInfo/resiInfo.vue  | 131 +--
 .../residentPortrait2/residentPortrait.vue    |   2 +-
 utils/api.js                                  |   2 +-
 23 files changed, 1282 insertions(+), 258 deletions(-)
 rename {ec-canvas => static}/echarts.js (100%)

diff --git a/App.vue b/App.vue
index 3822041..5f9fd82 100644
--- a/App.vue
+++ b/App.vue
@@ -18,14 +18,14 @@ export default {
         } else {
             this.globalData.share = false;
         }
-        const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-        uni.getSystemInfo({
-            success: (res) => {
-                this.globalData.height = res.statusBarHeight;
-                this.globalData.deviceInfo.statusHeight = res.statusBarHeight;
-                this.globalData.deviceInfo.navigationHeight = menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2;
-            }
-        });
+        // const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+        // uni.getSystemInfo({
+        //     success: (res) => {
+        //         this.globalData.height = res.statusBarHeight;
+        //         this.globalData.deviceInfo.statusHeight = res.statusBarHeight;
+        //         this.globalData.deviceInfo.navigationHeight = menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2;
+        //     }
+        // });
         uni.hideTabBar();
         getStaffbasicinfo()
             .then((res) => {
diff --git a/components/Head/index.vue b/components/Head/index.vue
index 8f75cac..f741ef6 100644
--- a/components/Head/index.vue
+++ b/components/Head/index.vue
@@ -57,12 +57,12 @@ export default {
                 navigationHeight: app.globalData.deviceInfo.navigationHeight,
                 agencyName: app.globalData.user.agencyName
             });
-            const menuButton = uni.getMenuButtonBoundingClientRect();
+            // const menuButton = uni.getMenuButtonBoundingClientRect();
             console.log(menuButton);
-            this.setData({
-                leftWidth: menuButton.left,
-                iconWidth: menuButton.width
-            });
+            // this.setData({
+            //     leftWidth: menuButton.left,
+            //     iconWidth: menuButton.width
+            // });
         },
 
         back() {
diff --git a/components/custom-tab-bar/index.vue b/components/custom-tab-bar/index.vue
index e8ae24a..d63c964 100644
--- a/components/custom-tab-bar/index.vue
+++ b/components/custom-tab-bar/index.vue
@@ -94,13 +94,13 @@ export default {
                     getOwnedRolesOfStaffId(res.data.id).then((res2) => {
                         app.globalData.user = res.data;
                         this.setData({
-                            'list[3].show': res2.data.filter((item) => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
+                            'list[3].show': true
                         });
                     });
                 });
             } else {
                 this.setData({
-                    'list[3].show': app.globalData.roleList.filter((item) => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
+                    'list[3].show': true
                 });
             }
             console.log(app.globalData.roleList, 'userss');
diff --git a/ec-canvas/ec-canvas.vue b/ec-canvas/ec-canvas.vue
index 3705f97..569b88d 100644
--- a/ec-canvas/ec-canvas.vue
+++ b/ec-canvas/ec-canvas.vue
@@ -26,7 +26,7 @@
 
 <script>
 import WxCanvas from './wx-canvas';
-import * as echarts from './echarts';
+import * as echarts from '../static/echarts';
 let ctx;
 function compareVersion(v1, v2) {
     v1 = v1.split('.');
@@ -100,7 +100,7 @@ export default {
             const version = uni.getSystemInfoSync().SDKVersion;
             const canUseNewCanvas = compareVersion(version, '2.9.0') >= 0;
             const forceUseOldCanvas = this.forceUseOldCanvas;
-            const isUseNewCanvas = canUseNewCanvas && !forceUseOldCanvas;
+            const isUseNewCanvas = true;
             this.setData({
                 isUseNewCanvas
             });
@@ -170,6 +170,7 @@ export default {
                     size: true
                 })
                 .exec((res) => {
+					console.log(res,'seeeee')
                     const canvasNode = res[0].node;
                     this.canvasNode = canvasNode;
                     const canvasDpr = uni.getSystemInfoSync().pixelRatio;
diff --git a/manifest.json b/manifest.json
index c64547b..432f912 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,86 +1,86 @@
 {
-	"name": "epmet-work-mp",
-	"appid": "",
-	"description": "{\r                 \"pagePath\": \"pages/information/information\",\r                 \"text\": \"数据\",\r                 \"iconPath\": \"images/home/information.png\",\r                 \"selectedIconPath\": \"images/home/informationSelected.png\"\r },",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {},
-		"distribute": {
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			"sdkConfigs": {}
-		}
-	},
-	"quickapp": {},
-	"mp-weixin": {
-		"appid": "wxaf87b420b87e2d79",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true,
-		"permission": {
-			"scope.userLocation": {
-				"desc": "亿联社区将获取您的位置信息"
-			}
-		},
-		"plugins": {
-			"ocr-plugin": {
-				"version": "3.1.3",
-				"provider": "wx4418e3e031e551be"
-			},
-			"routePlan": {
-				"version": "1.0.11",
-				"provider": "wx50b5593e81dd937a"
-			},
-			"WechatSI": {
-				"version": "0.3.6",
-				"provider": "wx069ba97219f66d99"
-			}
-		}
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2",
-	"networkTimeout": {
-		"request": 60000
-	}
-}
\ No newline at end of file
+    "name" : "epmet-work-mp",
+    "appid" : "__UNI__0A9CAB7",
+    "description" : "{\r                 \"pagePath\": \"pages/information/information\",\r                 \"text\": \"数据\",\r                 \"iconPath\": \"images/home/information.png\",\r                 \"selectedIconPath\": \"images/home/informationSelected.png\"\r },",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            "sdkConfigs" : {}
+        }
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wxaf87b420b87e2d79",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "亿联社区将获取您的位置信息"
+            }
+        },
+        "plugins" : {
+            "ocr-plugin" : {
+                "version" : "3.1.3",
+                "provider" : "wx4418e3e031e551be"
+            },
+            "routePlan" : {
+                "version" : "1.0.11",
+                "provider" : "wx50b5593e81dd937a"
+            },
+            "WechatSI" : {
+                "version" : "0.3.6",
+                "provider" : "wx069ba97219f66d99"
+            }
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2",
+    "networkTimeout" : {
+        "request" : 60000
+    }
+}
diff --git a/pages.json b/pages.json
index a24cbeb..ef10853 100644
--- a/pages.json
+++ b/pages.json
@@ -584,5 +584,74 @@
 			"provider": "wx4418e3e031e551be"
 		}
 	},
-	"sitemapLocation": "sitemap.json"
+	"sitemapLocation": "sitemap.json",
+	"globalStyle": {
+			"backgroundTextStyle": "light",
+			"navigationBarBackgroundColor": "#fff",
+			"navigationBarTitleText": "WeChat",
+			"navigationBarTextStyle": "black",
+			"usingComponents": {
+				"van-action-sheet": "/wxcomponents/vant/action-sheet/index",
+				"van-area": "/wxcomponents/vant/area/index",
+				"van-button": "/wxcomponents/vant/button/index",
+				"van-card": "/wxcomponents/vant/card/index",
+				"van-cell": "/wxcomponents/vant/cell/index",
+				"van-cell-group": "/wxcomponents/vant/cell-group/index",
+				"van-checkbox": "/wxcomponents/vant/checkbox/index",
+				"van-checkbox-group": "/wxcomponents/vant/checkbox-group/index",
+				"van-col": "/wxcomponents/vant/col/index",
+				"van-count-down": "/wxcomponents/vant/count-down/index",
+				"van-dialog": "/wxcomponents/vant/dialog/index",
+				"van-divider": "/wxcomponents/vant/divider/index",
+				"van-field": "/wxcomponents/vant/field/index",
+				"van-goods-action": "/wxcomponents/vant/goods-action/index",
+				"van-goods-action-icon": "/wxcomponents/vant/goods-action-icon/index",
+				"van-goods-action-button": "/wxcomponents/vant/goods-action-button/index",
+				"van-icon": "/wxcomponents/vant/icon/index",
+				"van-image": "/wxcomponents/vant/image/index",
+				"van-loading": "/wxcomponents/vant/loading/index",
+				"van-nav-bar": "/wxcomponents/vant/nav-bar/index",
+				"van-notice-bar": "/wxcomponents/vant/notice-bar/index",
+				"van-notify": "/wxcomponents/vant/notify/index",
+				"van-panel": "/wxcomponents/vant/panel/index",
+				"van-popup": "/wxcomponents/vant/popup/index",
+				"van-progress": "/wxcomponents/vant/progress/index",
+				"van-radio": "/wxcomponents/vant/radio/index",
+				"van-radio-group": "/wxcomponents/vant/radio-group/index",
+				"van-row": "/wxcomponents/vant/row/index",
+				"van-search": "/wxcomponents/vant/search/index",
+				"van-sidebar": "/wxcomponents/vant/sidebar/index",
+				"van-sidebar-item": "/wxcomponents/vant/sidebar-item/index",
+				"van-slider": "/wxcomponents/vant/slider/index",
+				"van-stepper": "/wxcomponents/vant/stepper/index",
+				"van-steps": "/wxcomponents/vant/steps/index",
+				"van-sticky": "/wxcomponents/vant/sticky/index",
+				"van-submit-bar": "/wxcomponents/vant/submit-bar/index",
+				"van-swipe-cell": "/wxcomponents/vant/swipe-cell/index",
+				"van-uploader": "/wxcomponents/vant/uploader/index",
+				"van-switch": "/wxcomponents/vant/switch/index",
+				"van-tab": "/wxcomponents/vant/tab/index",
+				"van-tabs": "/wxcomponents/vant/tabs/index",
+				"van-tabbar": "/wxcomponents/vant/tabbar/index",
+				"van-tabbar-item": "/wxcomponents/vant/tabbar-item/index",
+				"van-tag": "/wxcomponents/vant/tag/index",
+				"van-toast": "/wxcomponents/vant/toast/index",
+				"van-transition": "/wxcomponents/vant/transition/index",
+				"van-tree-select": "/wxcomponents/vant/tree-select/index",
+				"van-datetime-picker": "/wxcomponents/vant/datetime-picker/index",
+				"van-rate": "/wxcomponents/vant/rate/index",
+				"van-collapse": "/wxcomponents/vant/collapse/index",
+				"van-collapse-item": "/wxcomponents/vant/collapse-item/index",
+				"van-picker": "/wxcomponents/vant/picker/index",
+				"van-overlay": "/wxcomponents/vant/overlay/index",
+				"van-circle": "/wxcomponents/vant/circle/index",
+				"van-index-bar": "/wxcomponents/vant/index-bar/index",
+				"van-index-anchor": "/wxcomponents/vant/index-anchor/index",
+				"van-grid": "/wxcomponents/vant/grid/index",
+				"van-grid-item": "/wxcomponents/vant/grid-item/index",
+				"van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index",
+				"van-dropdown-item": "/wxcomponents/vant/dropdown-item/index",
+				"van-skeleton": "/wxcomponents/vant/skeleton/index"
+			}
+		}
 }
\ No newline at end of file
diff --git a/pages/information/echartsCallBack.js b/pages/information/echartsCallBack.js
index 6ea6c60..0e6fdec 100644
--- a/pages/information/echartsCallBack.js
+++ b/pages/information/echartsCallBack.js
@@ -1,4 +1,4 @@
-import * as echarts from '../../ec-canvas/echarts';
+import * as echarts from '../../static/echarts.js';
 function initLineChart(canvas, width, height, dpr, xData) {
     const chart = echarts.init(canvas, null, {
         width: width,
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 6553a5a..917a1e8 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -7,7 +7,7 @@
 
 <script>
 import ecCanvas from '@/ec-canvas/ec-canvas';
-import * as echarts from '../../ec-canvas/echarts';
+import * as echarts from '../../static/echarts.js';
 function initChart(canvas, width, height, dpr) {
     const chart = echarts.init(canvas, null, {
         width: width,
diff --git a/pages/login/login.vue b/pages/login/login.vue
index caa9400..aa32e79 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -14,7 +14,7 @@
             <view class="input_box">
                 <image src="/static/images/login/user.png" mode="" />
                 <!-- 失去焦点的时候bindblur="handelBlurMobile" -->
-                <input type="text" placeholder="请输入手机号" @blur="handelBlurMobile" :value="formData.mobile" confirm-type="next" />
+                <input type="text" placeholder="请输入手机号" @blur="handelBlurMobile" :value="formData.phone" confirm-type="next" />
                 <image src="/static/images/login/password.png" mode="" />
                 <!-- 将值绑定formData.password中 -->
                 <input type="text" confirm-type="go" :password="true" placeholder="请输入密码" @input="handelBlurPassword" @blur="handelBlurPassword" :value="formData.password" />
@@ -34,9 +34,12 @@ export default {
     data() {
         return {
             formData: {
-                mobile: '',
+                phone: '',
                 password: '',
-                appId: 'wxaf87b420b87e2d79'
+				app:'gov',
+				client:'h5',
+				customerId:'45687aa479955f9d06204d415238f7cc'
+                // appId: ''
             }
         };
     }
@@ -76,7 +79,7 @@ export default {
         handelBlurMobile(e) {
             this.setData({
                 // 获取绑定过的值，付给fromData.mobile
-                'formData.mobile': e.detail.value
+                'formData.phone': e.detail.value
             });
             console.log(this.formData);
         },
@@ -90,7 +93,7 @@ export default {
         },
 
         handelClickSubmit() {
-            if (!this.formData.mobile) {
+            if (!this.formData.phone) {
                 // 微信的轻量级api
                 uni.showToast({
                     title: '请填写手机号',
@@ -110,44 +113,42 @@ export default {
                 return;
             }
             const parm = {
-                // wxCode对象的初始化
-                wxCode: '',
-                // ...将this.data.formData所有属性，赋值到表单中
                 ...this.formData
             };
             // 轻量级api,在加载时进行显示
             uni.showLoading({
                 title: '登录中'
             });
-			uni.login({
-			    success: (res) => {
-			        parm.wxCode = res.code;
-			        console.log(parm.wxCode);
-			        // 调用登录的接口
-			        userLoginlog(parm)
-			            .then((res) => {
-			                console.log(res);
-			                // 判断登录是否成功
-			                if (res.code == 0) {
-			                    //  用于跳转的api,跳转到某某某
-			                    uni.switchTab({
-			                        url: '/pages/index/index'
-			                    });
-			                    //加入本地内存的api
-			                    uni.setStorageSync('token', res.data.token);
-			                }
-			            })
-			            .catch((err) => {
-			                uni.showToast({
-			                    title: res.msg,
-			                    icon: 'none',
-			                    duration: 3000
-			                });
-			                console.log(err);
+			userLoginlog(parm)
+			    .then((res) => {
+			        console.log(res);
+			        // 判断登录是否成功
+			        if (res.code == 0) {
+			            //  用于跳转的api,跳转到某某某
+			            uni.switchTab({
+			                url: '/pages/index/index'
 			            });
-			        uni.hideLoading();
-			    }
-			});
+			            //加入本地内存的api
+			            uni.setStorageSync('token', res.data.token);
+			        }
+			    })
+			    .catch((err) => {
+			        uni.showToast({
+			            title: res.msg,
+			            icon: 'none',
+			            duration: 3000
+			        });
+			        console.log(err);
+			    });
+			uni.hideLoading();
+			// uni.login({
+			//     success: (res) => {
+			//         parm.wxCode = res.code;
+			//         console.log(parm.wxCode);
+			//         // 调用登录的接口
+			     
+			//     }
+			// });
             //微信的api,获取登录凭证,用户获取凭证
             // uni.getUserProfile({
             //     desc: '用于获取用户个人信息',
diff --git a/pages/statistics/modules/HotlineComplaints/HotlineComplaints.vue b/pages/statistics/modules/HotlineComplaints/HotlineComplaints.vue
index c69c7e2..782d1e8 100644
--- a/pages/statistics/modules/HotlineComplaints/HotlineComplaints.vue
+++ b/pages/statistics/modules/HotlineComplaints/HotlineComplaints.vue
@@ -11,7 +11,7 @@
 <script>
 import Tabs from '../../../../components/Tabs';
 import ecCanvas from '../../../../ec-canvas/ec-canvas';
-import * as echarts from '../../../../ec-canvas/echarts';
+import * as echarts from '../../../../static/echarts.js';
 import { dwdEventReport, event12345Group } from '../../../../utils/statisticsApi';
 var chart;
 const formatTime = (date) => {
diff --git a/pages/statistics/modules/RequirementAnalysis/RequirementAnalysis.vue b/pages/statistics/modules/RequirementAnalysis/RequirementAnalysis.vue
index 7d73b58..1ac0b05 100644
--- a/pages/statistics/modules/RequirementAnalysis/RequirementAnalysis.vue
+++ b/pages/statistics/modules/RequirementAnalysis/RequirementAnalysis.vue
@@ -11,7 +11,7 @@
 <script>
 import Tabs from '../../../../components/Tabs';
 import ecCanvas from '../../../../ec-canvas/ec-canvas';
-import * as echarts from '../../../../ec-canvas/echarts';
+import * as echarts from '../../../../static/echarts.js';
 import { commonDemandCountByCategory, countByCategory, event12345Group } from '../../../../utils/statisticsApi';
 var chart;
 const formatTime = (date) => {
diff --git a/pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.vue b/pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.vue
index 4fa0099..8eca45b 100644
--- a/pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.vue
+++ b/pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.vue
@@ -11,7 +11,7 @@
 <script>
 import Tabs from '../../../../components/Tabs';
 import ecCanvas from '../../../../ec-canvas/ec-canvas';
-import * as echarts from '../../../../ec-canvas/echarts';
+import * as echarts from '../../../../static/echarts.js';
 import { satisfactionGroup, event12345Group } from '../../../../utils/statisticsApi';
 var chart;
 const formatTime = (date) => {
diff --git a/pages/statistics/modules/Trend/Trend.vue b/pages/statistics/modules/Trend/Trend.vue
index e637c6d..935cb42 100644
--- a/pages/statistics/modules/Trend/Trend.vue
+++ b/pages/statistics/modules/Trend/Trend.vue
@@ -6,7 +6,7 @@
 
 <script>
 import ecCanvas from '../../../../ec-canvas/ec-canvas';
-import * as echarts from '../../../../ec-canvas/echarts';
+import * as echarts from '../../../../static/echarts.js';
 import { notSatisfactionTrend } from '../../../../utils/statisticsApi';
 var chart = null;
 export default {
diff --git a/ec-canvas/echarts.js b/static/echarts.js
similarity index 100%
rename from ec-canvas/echarts.js
rename to static/echarts.js
diff --git a/subpages/addResi/pages/addResi/addResi.vue b/subpages/addResi/pages/addResi/addResi.vue
index df87627..7eb28e9 100644
--- a/subpages/addResi/pages/addResi/addResi.vue
+++ b/subpages/addResi/pages/addResi/addResi.vue
@@ -1,16 +1,990 @@
 <template>
-    
+ <view>
+        <view class="content">
+            <view class="form_card" style="height: 100rpx; overflow: hidden; font-size: 50rpx">
+                <van-steps :steps="stepsList" custom-class="steps" inactive-color="" active-color="#3974f6" :active="activeForm" ></van-steps>
+            </view>
+            <view class="house_box" v-if="activeForm === 0">
+                <view class="form_height_all form_card" style="margin-bottom: 20rpx" v-for="(item, indexP) in form.resideInfoDtos" :key="indexP">
+                    <view class="title">
+                        <text class="tag"></text>
+                        选择居住房屋{{ indexP + 1 }}
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <text class="must">*</text>
+                            <view class="title">所属组织</view>
+                        </view>
+                        <view class="input">
+                            <picker @change="bindPickerChangeGrid" :data-indexP="indexP" range-key="label" :value="index" :range="gridList">
+                                <view :class="form.resideInfoDtos[indexP].gridName ? '' : 'gray'">
+                                    {{ form.resideInfoDtos[indexP].gridName ? form.resideInfoDtos[indexP].gridName : '请选择' }}
+                                </view>
+                            </picker>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <text class="must">*</text>
+                            <view class="title">所在小区</view>
+                        </view>
+                        <view class="input">
+                            <picker @change="bindPickerChangevillageId" range-key="label" :data-indexP="indexP" :value="index" :range="form.resideInfoDtos[indexP].optionsV">
+                                <view :class="form.resideInfoDtos[indexP].villageName ? '' : 'gray'">
+                                    {{ form.resideInfoDtos[indexP].villageName ? form.resideInfoDtos[indexP].villageName : '请选择' }}
+                                </view>
+                            </picker>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <text class="must">*</text>
+                            <view class="title">所在楼栋</view>
+                        </view>
+                        <view class="input">
+                            <picker @change="bindPickerChangebuilding" range-key="label" :value="index" :range="form.resideInfoDtos[indexP].optionsB" :data-indexP="indexP">
+                                <view :class="form.resideInfoDtos[indexP].buildName ? '' : 'gray'">
+                                    {{ form.resideInfoDtos[indexP].buildName ? form.resideInfoDtos[indexP].buildName : '请选择' }}
+                                </view>
+                            </picker>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <text class="must">*</text>
+                            <view class="title">所在单元</view>
+                        </view>
+                        <view class="input">
+                            <picker @change="bindPickerChangeUnit" range-key="label" :value="index" :range="form.resideInfoDtos[indexP].optionsD" :data-indexP="indexP">
+                                <view :class="form.resideInfoDtos[indexP].unitName ? '' : 'gray'">
+                                    {{ form.resideInfoDtos[indexP].unitName ? form.resideInfoDtos[indexP].unitName : '请选择' }}
+                                </view>
+                            </picker>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <text class="must">*</text>
+                            <view class="title">门牌号</view>
+                        </view>
+                        <view class="input">
+                            <picker @change="bindPickerChangeHouse" range-key="label" :value="index" :range="form.resideInfoDtos[indexP].optionsH" :data-indexP="indexP">
+                                <view :class="form.resideInfoDtos[indexP].doorName ? '' : 'gray'">
+                                    {{ form.resideInfoDtos[indexP].doorName ? form.resideInfoDtos[indexP].doorName : '请选择' }}
+                                </view>
+                            </picker>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">人房关系</view>
+                        </view>
+                        <view class="input">
+                            <picker @change="bindPickerChangeResiHouseRel" range-key="label" :value="index" :range="resiHouseRelList" :data-indexP="indexP">
+                                <view :class="form.resideInfoDtos[indexP].resiHouseRelName ? '' : 'gray'">
+                                    {{ form.resideInfoDtos[indexP].resiHouseRelName ? form.resideInfoDtos[indexP].resiHouseRelName : '请选择' }}
+                                </view>
+                            </picker>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">人户状况</view>
+                        </view>
+                        <view class="input">
+                            <picker @change="bindPickerChangeHouseholdSituation" range-key="label" :value="index" :range="dicts.householdSituationList" :data-indexP="indexP">
+                                <view :class="form.resideInfoDtos[indexP].householdSituationName ? '' : 'gray'">
+                                    {{ form.resideInfoDtos[indexP].householdSituationName ? form.resideInfoDtos[indexP].householdSituationName : '请选择' }}
+                                </view>
+                            </picker>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">与户主关系</view>
+                        </view>
+                        <view class="input">
+                            <picker @change="bindPickerChangehouseHolderRel" range-key="label" :value="index" :range="dicts.houseHolderRelList" :data-indexP="indexP">
+                                <view :class="form.resideInfoDtos[indexP].houseHolderRelName ? '' : 'gray'">
+                                    {{ form.resideInfoDtos[indexP].houseHolderRelName ? form.resideInfoDtos[indexP].houseHolderRelName : '请选择' }}
+                                </view>
+                            </picker>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item" v-if="form.resideInfoDtos[indexP].householdSituation == 'rzhbz'">
+                        <view class="label">
+                            <view class="title">户籍所在地</view>
+                        </view>
+                        <view class="input">
+                            <input
+                                confirm-type="next"
+                                @blur="bindPlaceOfDomicileInput"
+                                @input="bindPlaceOfDomicileInput"
+                                :value="form.resideInfoDtos[indexP].placeOfDomicile"
+                                placeholder-class="gray"
+                                placeholder="请输入"
+                                :data-indexP="indexP"
+                            />
+                        </view>
+                    </view>
+
+                    <view class="form_item" v-if="form.resideInfoDtos[indexP].householdSituation == 'hzrbz'">
+                        <view class="label">
+                            <view class="title">现居住地址</view>
+                        </view>
+                        <view class="input">
+                            <input
+                                confirm-type="next"
+                                @blur="bindCurrentResidenceInput"
+                                @input="bindCurrentResidenceInput"
+                                :value="form.resideInfoDtos[indexP].currentResidence"
+                                placeholder-class="gray"
+                                placeholder="请输入"
+                                :data-indexP="indexP"
+                            />
+                        </view>
+                    </view>
+
+                    <view class="form_item" v-if="form.resideInfoDtos[indexP].householdSituation == 'rhdbz'">
+                        <view class="label">
+                            <view class="title">迁出时间</view>
+                        </view>
+                        <view class="input">
+                            <picker mode="date" :value="form.resideInfoDtos[indexP].outOfTime" :end="day" @change="bindOutOfTimeChange" :data-indexP="indexP">
+                                <view :class="form.resideInfoDtos[indexP].outOfTime ? '' : 'gray'">
+                                    {{ form.resideInfoDtos[indexP].outOfTime ? form.resideInfoDtos[indexP].outOfTime : '请选择' }}
+                                </view>
+                            </picker>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+                </view>
+                <view class="house_btn">
+                    <button @tap="addHouse">+</button>
+                    <button @tap="delHouse" :data-indexP="indexP" v-if="form.resideInfoDtos.length > 1">-</button>
+                </view>
+            </view>
+
+            <view class="form_card form_height" v-if="activeForm === 1">
+                <view class="title">
+                    <text class="tag"></text>
+                    基础信息登记
+                </view>
+                <view class="form_item">
+                    <view class="label">
+                        <text class="must">*</text>
+                        <view class="title">姓名</view>
+                    </view>
+                    <view class="input">
+                        <input confirm-type="next" @blur="bindNameInput" @input="bindNameInput" :value="form.baseInfoDto.name" placeholder-class="gray" placeholder="请输入" />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <text class="must">*</text>
+                        <view class="title">证件类型</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindPickerChangeIdType" range-key="label" :value="index" :range="dicts.idTypeList">
+                            <view :class="form.baseInfoDto.idType ? '' : 'gray'">
+                                {{ idTypeName ? idTypeName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <text class="must">*</text>
+                        <view class="title">证件号</view>
+                    </view>
+                    <view class="input">
+                        <input confirm-type="next" @blur="bindIdNumInput" @input="bindidNumInput" :value="form.baseInfoDto.idNum" placeholder-class="gray" placeholder="请输入" />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <text class="must">*</text>
+                        <view class="title">国籍</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindPickerChangeNationality" range-key="label" :value="index" :range="dicts.nationalityList">
+                            <view :class="form.baseInfoDto.nationalityName ? '' : 'gray'">
+                                {{ form.baseInfoDto.nationalityName ? form.baseInfoDto.nationalityName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <text class="must">*</text>
+                        <view class="title">联系电话</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindMobileInput"
+                            @input="bindmobileInput"
+                            :value="form.baseInfoDto.mobile"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <text class="must">*</text>
+                        <view class="title">性别</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindPickerChangeGender" range-key="label" :value="index" :range="dicts.genderList">
+                            <view :class="form.baseInfoDto.genderName ? '' : 'gray'">
+                                {{ form.baseInfoDto.genderName ? form.baseInfoDto.genderName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+                <view class="form_item">
+                    <view class="label">
+                        <text class="must">*</text>
+                        <view class="title">出生日期</view>
+                    </view>
+                    <view class="input">
+                        <picker mode="date" :value="form.baseInfoDto.birthday" :end="day" @change="bindDateChange">
+                            <view :class="form.baseInfoDto.birthday ? '' : 'gray'">
+                                {{ form.baseInfoDto.birthday ? form.baseInfoDto.birthday : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <view class="title">民族</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindPickerChangeNation" range-key="label" :value="index" :range="dicts.nationList">
+                            <view :class="form.baseInfoDto.nation ? '' : 'gray'">
+                                {{ form.baseInfoDto.nationName ? form.baseInfoDto.nationName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+                <view class="form_item">
+                    <view class="label">
+                        <view class="title">文化程度</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindPickerChangeEducation" range-key="label" :value="index" :range="dicts.educationList">
+                            <view :class="form.eduInfoDto.cultureLevel ? '' : 'gray'">
+                                {{ form.eduInfoDto.cultureLevelName ? form.eduInfoDto.cultureLevelName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+                <view class="form_item">
+                    <view class="label">
+                        <view class="title">婚姻状况</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindPickerChangeMarriage" range-key="label" :value="index" :range="dicts.marriageList">
+                            <view :class="marriageName ? '' : 'gray'">
+                                {{ marriageName ? marriageName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+                <view class="form_item" v-if="form.familyInfoDto.marriage == 'chuhun' || form.familyInfoDto.marriage == 'zaihun' || form.familyInfoDto.marriage == 'fuhun'">
+                    <view class="label">
+                        <view class="title">配偶情况</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindPickerChangeSpouse" range-key="label" :value="index" :range="dicts.spouseSituationList">
+                            <view :class="spouseSituationName ? '' : 'gray'">
+                                {{ spouseSituationName ? spouseSituationName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <view class="title">籍贯</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindNativePlaceInput"
+                            @input="bindNativePlaceInput"
+                            :value="form.baseInfoDto.nativePlace"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <view class="title">本地户籍</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindLocalResidenceFlag" range-key="label" :value="index" :range="dicts.binaryOptionList">
+                            <view :class="form.baseInfoDto.localResidenceFlag ? '' : 'gray'">
+                                {{ form.baseInfoDto.localResidenceFlag ? dicts.binaryOptionList[form.baseInfoDto.localResidenceFlag].label : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+            </view>
+
+            <view v-if="activeForm === 2" class="form_card form_height">
+                <view class="title">
+                    <text class="tag"></text>
+                    拓展信息登记
+                </view>
+                <view class="form_item">
+                    <view class="label">
+                        <view class="title">宗教信仰</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindReligionInput"
+                            @input="bindReligionInput"
+                            :value="form.religionDto.religion"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <view class="title">就业状态</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindCareerStatus" range-key="label" :value="index" :range="dicts.careerStatusList">
+                            <view :class="form.workInfoDto.careerStatus ? '' : 'gray'">
+                                {{ careerStatusName ? careerStatusName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                    <view class="label">
+                        <view class="title">工作单位</view>
+                    </view>
+                    <view class="input">
+                        <input confirm-type="next" @blur="bindWorkUnit" @input="bindWorkUnit" :value="form.workInfoDto.workUnit" placeholder-class="gray" placeholder="请输入" />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                    <view class="label">
+                        <view class="title">职业</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindWorkOccupation"
+                            @input="bindWorkOccupation"
+                            :value="form.workInfoDto.occupation"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                    <view class="label">
+                        <view class="title">月收入</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindMonthIncome"
+                            @input="bindMonthIncome"
+                            :value="form.economyDto.monthIncome"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                    <view class="label">
+                        <view class="title">原工作单位</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindOriginWorkUnit"
+                            @input="bindOriginWorkUnit"
+                            :value="form.unemployedDto.originWorkUnit"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                    <view class="label">
+                        <view class="title">失业时间</view>
+                    </view>
+                    <view class="input">
+                        <picker mode="date" :value="form.unemployedDto.unemploymentTime" :end="day" @change="bindUnemploymentTime">
+                            <view :class="form.unemployedDto.unemploymentTime ? '' : 'gray'">
+                                {{ form.unemployedDto.unemploymentTime ? form.unemployedDto.unemploymentTime : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                    <view class="label">
+                        <view class="title">失业证号</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindUnemploymentNum"
+                            @input="bindUnemploymentNum"
+                            :value="form.unemployedDto.unemploymentNum"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                    <view class="label">
+                        <view class="title">失业原因</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindUnemploymentReason" range-key="label" :value="index" :range="dicts.unemploymentReasonList">
+                            <view :class="form.unemployedDto.unemploymentReason ? '' : 'gray'">
+                                {{ unemploymentReasonName ? unemploymentReasonName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                    <view class="label">
+                        <view class="title">再就业优惠证号</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindEmploymentNum"
+                            @input="bindEmploymentNum"
+                            :value="form.unemployedDto.employmentNum"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                    <view class="label">
+                        <view class="title">技术特长</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindSpecialSkill"
+                            @input="bindSpecialSkill"
+                            :value="form.unemployedDto.specialSkill"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                    <view class="label">
+                        <view class="title">是否领取失业金</view>
+                    </view>
+                    <view class="input">
+                        <radio-group class="radio_group" @change="bindUnempCompensationFlag">
+                            <radio value="1" :checked="form.unemployedDto.unempCompensationFlag == 1 ? true : false" color="#3974f6" />
+                            是
+                            <radio value="0" :checked="form.unemployedDto.unempCompensationFlag == 0 ? true : false" color="#3974f6" />
+                            否
+                        </radio-group>
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                    <view class="label">
+                        <view class="title">是否就业困难对象</view>
+                    </view>
+                    <view class="input">
+                        <radio-group class="radio_group" @change="bindEmploymentHardFlag">
+                            <radio value="1" :checked="form.unemployedDto.employmentHardFlag == 1 ? true : false" color="#3974f6" />
+                            是
+                            <radio value="0" :checked="form.unemployedDto.employmentHardFlag == 0 ? true : false" color="#3974f6" />
+                            否
+                        </radio-group>
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                    <view class="label">
+                        <view class="title">劳动就业愿望</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindEmploymentWish" range-key="label" :value="index" :range="dicts.employmentWishList">
+                            <view :class="form.unemployedDto.employmentWish ? '' : 'gray'">
+                                {{ employmentWishName ? employmentWishName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+
+                <view class="form_item">
+                    <view class="label">
+                        <view class="title">有无赡养人</view>
+                    </view>
+                    <view class="input">
+                        <radio-group class="radio_group" @change="bindElderlyFlag">
+                            <radio value="1" :checked="form.familyInfoDto.elderlyFlag == 1 ? true : false" color="#3974f6" />
+                            是
+                            <radio value="0" :checked="form.familyInfoDto.elderlyFlag == 0 ? true : false" color="#3974f6" />
+                            否
+                        </radio-group>
+                    </view>
+                </view>
+                <view class="form_item" v-if="form.familyInfoDto.elderlyFlag == 1">
+                    <view class="label">
+                        <view class="title">与赡养人关系</view>
+                    </view>
+                    <view class="input">
+                        <picker @change="bindElderlyRelation" range-key="label" :value="index" :range="dicts.houseHolderRelList">
+                            <view :class="form.familyInfoDto.elderlyRelation ? '' : 'gray'">
+                                {{ elderlyRelationName ? elderlyRelationName : '请选择' }}
+                            </view>
+                        </picker>
+                        <image src="/static/images/right.png" mode="" />
+                    </view>
+                </view>
+
+                <view class="form_item" v-if="form.familyInfoDto.elderlyFlag == 1">
+                    <view class="label">
+                        <view class="title">赡养人联系电话</view>
+                    </view>
+                    <view class="input">
+                        <input
+                            confirm-type="next"
+                            @blur="bindDependantMobile"
+                            @input="bindDependantMobile"
+                            :value="form.familyInfoDto.dependantMobile"
+                            placeholder-class="gray"
+                            placeholder="请输入"
+                        />
+                    </view>
+                </view>
+            </view>
+            <view v-if="activeForm == 3" class="form_height">
+                <view class="form_card">
+                    <view class="title">
+                        <text class="tag"></text>
+                        人员标签
+                    </view>
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">政治面貌</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindPartyFlag">
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.partyFlag == 0 ? true : false" color="#3974f6" />
+                                群众
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.partyFlag == 1 ? true : false" color="#3974f6" />
+                                党员
+                                <radio value="2" :checked="form.baseInfoDto.categoryInfo.partyFlag == 2 ? true : false" color="#3974f6" />
+                                共青团员
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.partyFlag === 1">
+                        <view class="detail" @tap="showDetailForm" data-title="党员信息" data-dto="parymemberInfoDto">
+                            <text>党员信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+                </view>
+                <view class="form_card">
+                    <view class="title">
+                        <text class="tag"></text>
+                        健康状况
+                    </view>
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">残疾</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="disabilityFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.disabilityFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.disabilityFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.disabilityFlag === 1">
+                        <view class="detail" data-field="form.healthyDto.disabilityFlag" @tap="showDetailForm" data-dto="healthyDto" data-title="残疾信息">
+                            <text>残疾信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <!-- 大病 -->
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">大病</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="seriousIllnessFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.seriousIllnessFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.seriousIllnessFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.seriousIllnessFlag === 1">
+                        <view class="detail" @tap="showDetailForm" data-field="form.healthyDto.seriousIllnessFlag" data-title="大病信息" data-dto="seriousIllnessDto">
+                            <text>大病信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <!-- 慢病 -->
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">慢病</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="chronicDiseaseFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.chronicDiseaseFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.chronicDiseaseFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.chronicDiseaseFlag === 1">
+                        <view class="detail" @tap="showDetailForm" data-field="form.healthyDto.chronicDiseaseFlag" data-title="慢病信息" data-dto="chronicDiseaseDto">
+                            <text>慢病信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <!-- 死亡 -->
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">死亡</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="deathFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.deathFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.deathFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.deathFlag === 1">
+                        <view class="detail" @tap="showDetailForm" data-field="form.healthyDto.deathFlag" data-title="死亡信息" data-dto="deathDto">
+                            <text>死亡信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+                </view>
+
+                <view class="form_card">
+                    <view class="title">
+                        <text class="tag"></text>
+                        关注人群
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">老年人</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="oldPeopleFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.oldPeopleFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.oldPeopleFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.oldPeopleFlag === 1">
+                        <view class="detail" @tap="showDetailForm" data-field="form.attentionResiDto.oldPeopleFlag" data-dto="oldPeopleDto" data-title="老年人信息">
+                            <text>老年人信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">低保</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="subsistenceAllowanceFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.subsistenceAllowanceFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.subsistenceAllowanceFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.subsistenceAllowanceFlag === 1">
+                        <view
+                            class="detail"
+                            @tap="showDetailForm"
+                            data-field="form.attentionResiDto.subsistenceAllowanceFlag"
+                            data-title="低保信息"
+                            data-dto="subsistenceAllowanceDto"
+                        >
+                            <text>低保信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">退役军人</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="veteranFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.veteranFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.veteranFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.veteranFlag === 1">
+                        <view class="detail" @tap="showDetailForm" data-field="form.attentionResiDto.veteranFlag" data-dto="veteranDto" data-title="退役军人信息">
+                            <text>退役军人信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">保障房人员</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="ensureHouseFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.ensureHouseFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.ensureHouseFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.ensureHouseFlag === 1">
+                        <view class="detail" @tap="showDetailForm" data-field="form.attentionResiDto.ensureHouseFlag" data-dto="ensureHouseDto" data-title="保障房人员信息">
+                            <text>保障房人员信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">育龄妇女</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="fertileWomanFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.fertileWomanFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.fertileWomanFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">特扶人员</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="specialSupportFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.specialSupportFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.specialSupportFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.specialSupportFlag === 1">
+                        <view class="detail" @tap="showDetailForm" data-field="form.attentionResiDto.specialSupportFlag" data-dto="specialSupportDto" data-title="特扶人员信息">
+                            <text>特扶人员信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+                </view>
+
+                <view class="form_card">
+                    <view class="title">
+                        <text class="tag"></text>
+                        特殊人群
+                    </view>
+
+                    <view class="form_item" v-for="(radioItem, index) in dicts.specialResidentCategory" :key="radioItem.value">
+                        <view class="label">
+                            <view class="title">{{ radioItem.label }}</view>
+                        </view>
+
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindSpecialCategory" :data-category="radioItem.value">
+                                <radio :value="radioItem.radioValue" :checked="radioItem.radioValue == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio :value="radioItem.radioValue" :checked="radioItem.radioValue == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                </view>
+
+                <view class="form_card">
+                    <view class="title">
+                        <text class="tag"></text>
+                        身份
+                    </view>
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">志愿者</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="volunteerFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.volunteerFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.volunteerFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                    <view v-if="form.baseInfoDto.categoryInfo.volunteerFlag === 1">
+                        <view class="detail" @tap="showDetailForm" data-field="form.identityDto.volunteerFlag" data-dto="volunteerDto" data-title="志愿者信息">
+                            <text>志愿者信息</text>
+                            <image src="/static/images/right.png" mode="" />
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">楼长</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="buildingChiefFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.buildingChiefFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.buildingChiefFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">单元长</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="unitChiefFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.unitChiefFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.unitChiefFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+
+                    <view class="form_item">
+                        <view class="label">
+                            <view class="title">公益岗</view>
+                        </view>
+                        <view class="input">
+                            <radio-group class="radio_group" @change="bindResiLabelFlag" data-category="publicWelfareFlag">
+                                <radio value="1" :checked="form.baseInfoDto.categoryInfo.publicWelfareFlag == 1 ? true : false" color="#3974f6" />
+                                是
+                                <radio value="0" :checked="form.baseInfoDto.categoryInfo.publicWelfareFlag == 0 ? true : false" color="#3974f6" />
+                                否
+                            </radio-group>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <van-popup :show="showExpand" round custom-style="width:90%;height:90%;" @close="onCloseExpandForm" v-if="showExpand">
+            <expand-form
+                @hideExpandForm="hideExpandForm"
+                :formList="expandFormList"
+                :popupTitle="popupTitle"
+                @confirmExpandForm="confirmExpandForm"
+                @changExpandForm="changExpandForm"
+            ></expand-form>
+        </van-popup>
+        <view class="bot_btn">
+            <button type="default" :plain="true" class="bottom_btn bottom_btn_close" @tap="close" v-if="activeForm === 0">取消</button>
+            <button type="default" :plain="true" class="bottom_btn bottom_btn_close" @tap="backStep" v-else>上一步</button>
+            <button type="primary" class="btn_bule bottom_btn" @tap="nextStep" v-if="activeForm !== 3">下一步</button>
+            <button type="primary" class="btn_bule bottom_btn" @tap="saveForm" v-if="activeForm === 3">提交</button>
+        </view>
+
+        <wux-select id="wux-select3" />
+        <!-- <DynamicForms show="{{isShowDynamicForms}}" title="{{dynamicFormsTitle}}" bind:close="closeDynamicForms" bind:ok="okDynamicForms" formController="{{formController}}" /> -->
+    </view>
 </template>
 
 <script>
 import wuxSelect from '../../../../wxcomponents/dist/select';
 import DynamicForms from '../../../../components/DynamicForms/DynamicForms';
-import expandForm from '../../component/expandForm';
+import expandForm from '../../component/expandForm/index.vue';
 // subpages/addResi/pages/addResi/addResi.js
 import api from '../../../../utils/api';
 var http = require('../../../../utils/request.js');
 var fly = require('../../../../utils/request');
-const App = getApp();
 import { cardHide } from '../../../../utils/util';
 import { $wuxSelect } from '../../../../wxcomponents/dist/index';
 import {
@@ -1001,7 +1975,7 @@ export default {
         async setNeighborHood() {
             let parm = {
                 gridId: this.houseIds.grid,
-                agencyId: App.globalData.user.agencyId
+                agencyId: app.globalData.user.agencyId
             };
             try {
                 const res = await api.getQuartersOptions(parm);
@@ -1319,7 +2293,7 @@ export default {
         getQuartersOptions(gridId, indexP) {
             let parm = {
                 gridId,
-                agencyId: App.globalData.user.agencyId
+                agencyId: app.globalData.user.agencyId
             };
             api.getQuartersOptions(parm)
                 .then((res) => {
diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.vue b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.vue
index 5c4937b..25cbce0 100644
--- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.vue
+++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.vue
@@ -461,9 +461,9 @@ var recorderManager = uni.getRecorderManager();
 var innerAudioContext = uni.createInnerAudioContext();
 import api from '../../../../../utils/api';
 // 引入插件
-const plugin = requirePlugin('WechatSI');
+// const plugin = requirePlugin('WechatSI');
 // 获取全局唯一语音识别管理器
-const manager = plugin.getRecordRecognitionManager();
+// const manager = plugin.getRecordRecognitionManager();
 var timer;
 export default {
     components: {
diff --git a/subpages/house/pages/housePortrait/component/graph/graph.vue b/subpages/house/pages/housePortrait/component/graph/graph.vue
index b51e784..2a74f34 100644
--- a/subpages/house/pages/housePortrait/component/graph/graph.vue
+++ b/subpages/house/pages/housePortrait/component/graph/graph.vue
@@ -7,7 +7,7 @@
 
 <script>
 import ecCanvas from '../../../../../../ec-canvas/ec-canvas';
-import * as echarts from '../../../../../../ec-canvas/echarts';
+import * as echarts from '../../../../../../static/echarts.js';
 import { getFamilyRelationshipListByHouseId } from '../../../../../../utils/api';
 var chart;
 export default {
diff --git a/subpages/morenews/pages/morenews/morenews.vue b/subpages/morenews/pages/morenews/morenews.vue
index c2c54cf..1892de3 100644
--- a/subpages/morenews/pages/morenews/morenews.vue
+++ b/subpages/morenews/pages/morenews/morenews.vue
@@ -7,7 +7,7 @@
             <!-- #endif -->
 
             <!-- #ifndef MP-WEIXIN -->
-            <view>当前为非微信小程序环境，不支持公众号关注组件，请自行调整当前节点内容！</view>
+            <!-- <view>当前为非微信小程序环境，不支持公众号关注组件，请自行调整当前节点内容！</view> -->
             <!-- #endif -->
         </view>
 
@@ -60,7 +60,7 @@ import loadMore from '../../../../components/loadMore/loadMore';
 import noData from '../../../../components/noData/nodata';
 import customTabBar from '../../../../components/custom-tab-bar/index.vue';
 const app = getApp();
-import api, { getIntelligentMessage, getToken, getStaffbasicinfo, clearMessage } from '../../../../utils/api';
+import api, { getIntelligentMessage, getStaffbasicinfo, clearMessage } from '../../../../utils/api';
 export default {
     components: {
         loadMore,
@@ -91,7 +91,6 @@ export default {
             navigationHeight: app.globalData.deviceInfo.navigationHeight,
             share: app.globalData.share
         });
-        await this.getToken();
         //  await this.getIntelligentMessage()
         await this.getStaffbasicinfo();
     },
@@ -160,37 +159,6 @@ export default {
                 });
         },
 
-        getToken() {
-            const parm = {
-                wxCode: '',
-                app: 'gov',
-                client: 'wxmp',
-                appId: 'wxaf87b420b87e2d79'
-            };
-            uni.showLoading({
-                title: '加载中...'
-            });
-            uni.login({
-                success: (res) => {
-                    parm.wxCode = res.code;
-                    getToken(parm)
-                        .then((res) => {
-                            uni.hideLoading();
-                            if (res.code === 0) {
-                                uni.setStorageSync('token', res.data.token);
-                            } else {
-                                uni.reLaunch({
-                                    url: '/pages/login/login'
-                                });
-                            }
-                        })
-                        .catch((err) => {
-                            console.log(err);
-                        });
-                }
-            });
-        },
-
         getStaffbasicinfo() {
             getStaffbasicinfo()
                 .then((res) => {
diff --git a/subpages/searchResult/pages/punchCard/punchCard.vue b/subpages/searchResult/pages/punchCard/punchCard.vue
index 71cb765..93315ce 100644
--- a/subpages/searchResult/pages/punchCard/punchCard.vue
+++ b/subpages/searchResult/pages/punchCard/punchCard.vue
@@ -7,23 +7,23 @@
             <view class="info">
                 <view class="item">
                     <view class="label">姓名：</view>
-                    <View class="value">{{ form.name }}</View>
+                    <view class="value">{{ form.name }}</view>
                 </view>
                 <view class="item">
                     <view class="label">性别：</view>
-                    <View class="value">{{ form.genderName }}</View>
+                    <view class="value">{{ form.genderName }}</view>
                 </view>
                 <view class="item">
                     <view class="label">出生日期：</view>
-                    <View class="value">{{ form.birthday }}</View>
+                    <view class="value">{{ form.birthday }}</view>
                 </view>
                 <view class="item">
                     <view class="label">住宅：</view>
-                    <View class="value">{{ form.homeName }}</View>
+                    <view class="value">{{ form.homeName }}</view>
                 </view>
                 <view class="item">
                     <view class="label">电话：</view>
-                    <View class="value">{{ form.mobile }}</View>
+                    <view class="value">{{ form.mobile }}</view>
                 </view>
             </view>
         </view>
@@ -41,7 +41,7 @@
         <view class="card">
             <view class="title">相关操作</view>
             <view class="blue btn" @tap="toAddResi" style="margin-top: 40rpx">修改居民信息</view>
-            <view class="yellow btn" @tap="toWebView">满意度调查</view>
+            <view class="yellow btn" @tap="toWebview">满意度调查</view>
             <view class="green btn" @tap="toEvent">上报居民诉求</view>
         </view>
     </view>
@@ -194,10 +194,10 @@ export default {
             });
         },
 
-        toWebView() {
+        toWebview() {
             console.log(app.globalData);
             uni.navigateTo({
-                url: '/pages/webView/webView?url=' + app.globalData.questionnaireUrl
+                url: '/pages/webview/webview?url=' + app.globalData.questionnaireUrl
             });
         },
 
diff --git a/subpages/searchResult/pages/resiInfo/component/graph/graph.vue b/subpages/searchResult/pages/resiInfo/component/graph/graph.vue
index a10f308..1615973 100644
--- a/subpages/searchResult/pages/resiInfo/component/graph/graph.vue
+++ b/subpages/searchResult/pages/resiInfo/component/graph/graph.vue
@@ -7,7 +7,7 @@
 
 <script>
 import ecCanvas from '../../../../../../ec-canvas/ec-canvas';
-import * as echarts from '../../../../../../ec-canvas/echarts';
+import * as echarts from '../../../../../../static/echarts.js';
 import { getFamilyRelationshipList } from '../../../../../../utils/api';
 var chart;
 export default {
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.vue b/subpages/searchResult/pages/resiInfo/resiInfo.vue
index 4ff645d..0a3904e 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.vue
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.vue
@@ -1,10 +1,10 @@
 <template>
-    <view>
+    <view >
         <!-- subpages/searchResult/pages/resiInfo/resiInfo.wxml -->
         <!-- 基本信息 -->
-        <view class="card">
+        <view class="card" v-if="form.baseInfoDto.idNum">
             <view class="top">
-                <view class="left">
+                <view class="left" >
                     <view class="name">
                         <view style="display: flex">
                             <image
@@ -33,7 +33,7 @@
                             />
                             <image
                                 style="width: 40rpx; height: 40rpx; margin-right: 16rpx"
-                                v-if="form.baseInfoDt.gender == '2' && form.baseInfoDto.age < 18"
+                                v-if="form.baseInfoDto.gender == '2' && form.baseInfoDto.age < 18"
                                 src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/0c38251bba644a6b8e4a925aea74c9a7.png"
                                 mode=""
                             />
@@ -160,47 +160,47 @@
                 <view class="item">
                     <text class="must">*</text>
                     <view class="label">国籍：</view>
-                    <View class="value">{{ form.baseInfoDto.nationalityName || '--' }}</View>
+                    <view class="value">{{ form.baseInfoDto&&form.baseInfoDto.nationalityName?form.baseInfoDto.nationalityName:'--' }}</view>
                 </view>
                 <view class="item">
                     <text class="must">*</text>
                     <view class="label">证件类型：</view>
-                    <View class="value">{{ idTypeList[form.baseInfoDto.idType].label || '--' }}</View>
+                    <view class="value">{{ filterLabel(idTypeList,form.baseInfoDto.idType) }}</view>
                 </view>
                 <view class="item">
                     <text class="must">*</text>
                     <view class="label">证件号：</view>
-                    <View class="value">{{ form.baseInfoDto.idNum || '--' }}</View>
+                    <view class="value">{{ form.baseInfoDto&&form.baseInfoDto.idNum?form.baseInfoDto.idNum:'--' }}</view>
                 </view>
                 <view class="item">
                     <text class="must">*</text>
                     <view class="label">联系电话：</view>
-                    <View class="value">{{ form.baseInfoDto.mobile || '--' }}</View>
+                    <view class="value">{{ form.baseInfoDto&&form.baseInfoDto.mobile?form.baseInfoDto.mobile:'--'  }}</view>
                 </view>
                 <view class="item">
                     <view class="label">文化程度：</view>
-                    <View class="value">{{ form.eduInfoDto.cultureLevelName || '--' }}</View>
+                    <view class="value">{{ form.eduInfoDto&&form.eduInfoDto.cultureLevelName?form.eduInfoDto.cultureLevelName:'--'  }}</view>
                 </view>
 
                 <view class="item">
                     <view class="label">性别：</view>
-                    <View class="value">{{ form.baseInfoDto.genderName || '--' }}</View>
+                    <view class="value">{{ form.baseInfoDto&&form.baseInfoDto.genderName?form.baseInfoDto.genderName:'--' }}</view>
                 </view>
                 <view class="item">
                     <view class="label">出生日期：</view>
-                    <View class="value">{{ form.baseInfoDto.birthday || '--' }}</View>
+                    <view class="value">{{ form.baseInfoDto.birthday || '--' }}</view>
                 </view>
                 <view class="item">
                     <view class="label">民族：</view>
-                    <View class="value">{{ form.baseInfoDto.nationName || '--' }}</View>
+                    <view class="value">{{ form.baseInfoDto.nationName || '--' }}</view>
                 </view>
                 <view class="item">
                     <view class="label">婚姻状况：</view>
-                    <View class="value">{{ marriageName || '--' }}</View>
+                    <view class="value">{{ marriageName || '--' }}</view>
                 </view>
                 <view class="item">
                     <view class="label">籍贯：</view>
-                    <View class="value">{{ form.baseInfoDto.nativePlace || '--' }}</View>
+                    <view class="value">{{ form.baseInfoDto.nativePlace || '--' }}</view>
                 </view>
             </view>
         </view>
@@ -211,18 +211,18 @@
                 <view class="item">
                     <text class="must">*</text>
                     <view class="label">所属网格：</view>
-                    <View class="value">{{ item.gridName || '--' }}</View>
+                    <view class="value">{{ item.gridName || '--' }}</view>
                 </view>
 
                 <view class="item">
                     <text class="must">*</text>
                     <view class="label">所属房屋：</view>
-                    <View class="value">{{ item.agencyName }}{{ item.homeName }}</View>
+                    <view class="value">{{ item.agencyName }}{{ item.homeName }}</view>
                 </view>
 
                 <view class="item">
                     <view class="label">人房关系：</view>
-                    <View class="value">{{ item.resiHouseRel != null ? (item.resiHouseRel === 0 ? '自住' : item.resiHouseRel === 1 ? '租住' : '--') : '--' }}</View>
+                    <view class="value">{{ item.resiHouseRel != null ? (item.resiHouseRel === 0 ? '自住' : item.resiHouseRel === 1 ? '租住' : '--') : '--' }}</view>
                 </view>
 
                 <view class="item">
@@ -239,12 +239,12 @@
 
                 <view class="item">
                     <view class="label">户籍所在地：</view>
-                    <View class="value">{{ item.placeOfDomicile ? item.placeOfDomicile : '--' }}</View>
+                    <view class="value">{{ item.placeOfDomicile ? item.placeOfDomicile : '--' }}</view>
                 </view>
 
                 <view class="item">
                     <view class="label">与户主关系：</view>
-                    <View class="value">{{ dicts.houseHolderRelArr[item.houseHolderRel].label || '--' }}</View>
+                    <view class="value" >{{ filterLabel(dicts.houseHolderRelArr,item.houseHolderRel)}}</view>
                 </view>
             </view>
         </view>
@@ -258,47 +258,47 @@
                 </view>
                 <view class="item">
                     <view class="label">就业状态：</view>
-                    <View class="value">{{ dicts.careerStatusArr[form.workInfoDto.careerStatus].label || '--' }}</View>
+                    <view class="value" >{{ filterLabel(dicts.careerStatusArr,form.workInfoDto?form.workInfoDto.careerStatus:null)}}</view>
                 </view>
                 <view class="item" v-if="form.workInfoDto && form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
                     <view class="label">工作单位：</view>
-                    <View class="value">{{ form.workInfoDto ? (form.workInfoDto.workUnit ? form.workInfoDto.workUnit : '--') : '--' }}</View>
+                    <view class="value">{{ form.workInfoDto ? (form.workInfoDto.workUnit ? form.workInfoDto.workUnit : '--') : '--' }}</view>
                 </view>
-                <view class="item" v-if="form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
+                <view class="item" v-if="form.unemployedDto &&form.workInfoDto &&(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
                     <view class="label">原工作单位：</view>
-                    <View class="value">{{ form.unemployedDto ? (form.unemployedDto.originWorkUnit ? form.unemployedDto.originWorkUnit : '--') : '--' }}</View>
+                    <view class="value">{{ form.unemployedDto ? (form.unemployedDto.originWorkUnit ? form.unemployedDto.originWorkUnit : '--') : '--' }}</view>
                 </view>
-                <view class="item" v-if="form.workInfoDto && form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                <view class="item" v-if="form.workInfoDto && form.workInfoDto  && form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
                     <view class="label">职业：</view>
-                    <View class="value">{{ form.workInfoDto ? (form.workInfoDto.occupation ? form.workInfoDto.occupation : '--') : '--' }}</View>
+                    <view class="value">{{ form.workInfoDto ? (form.workInfoDto.occupation ? form.workInfoDto.occupation : '--') : '--' }}</view>
                 </view>
-                <view class="item" v-if="form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
+                <view class="item" v-if="form.unemployedDto &&form.workInfoDto  && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
                     <view class="label">失业时间：</view>
-                    <View class="value">{{ form.unemployedDto ? (form.unemployedDto.unemploymentTime ? form.unemployedDto.unemploymentTime : '--') : '--' }}</View>
+                    <view class="value">{{ form.unemployedDto ? (form.unemployedDto.unemploymentTime ? form.unemployedDto.unemploymentTime : '--') : '--' }}</view>
                 </view>
-                <view class="item" v-if="form.economyDto && form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                <view class="item" v-if="form.economyDto &&form.workInfoDto  && form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
                     <view class="label">月收入：</view>
-                    <View class="value">{{ form.economyDto ? (form.economyDto.monthIncome ? form.economyDto.monthIncome : '--') : '--' }}</View>
+                    <view class="value">{{ form.economyDto ? (form.economyDto.monthIncome ? form.economyDto.monthIncome : '--') : '--' }}</view>
                 </view>
-                <view class="item" v-if="form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
+                <view class="item" v-if="form.unemployedDto &&form.workInfoDto  && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
                     <view class="label">失业证号：</view>
-                    <View class="value">{{ form.unemployedDto ? (form.unemployedDto.unemploymentNum ? form.unemployedDto.unemploymentNum : '--') : '--' }}</View>
+                    <view class="value">{{ form.unemployedDto ? (form.unemployedDto.unemploymentNum ? form.unemployedDto.unemploymentNum : '--') : '--' }}</view>
                 </view>
-                <view class="item" v-if="form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
+                <view class="item" v-if="form.unemployedDto &&form.workInfoDto  && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
                     <view class="label">失业原因：</view>
-                    <View class="value">{{ form.unemployedDto ? (form.unemployedDto.unemploymentReason ? form.unemployedDto.unemploymentReason : '--') : '--' }}</View>
+                    <view class="value">{{ form.unemployedDto ? (form.unemployedDto.unemploymentReason ? form.unemployedDto.unemploymentReason : '--') : '--' }}</view>
                 </view>
-                <view class="item" v-if="form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
+                <view class="item" v-if="form.unemployedDto &&form.workInfoDto  && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
                     <view class="label">失业原因：</view>
-                    <View class="value">{{ form.unemployedDto ? (form.unemployedDto.employmentNum ? form.unemployedDto.employmentNum : '--') : '--' }}</View>
+                    <view class="value">{{ form.unemployedDto ? (form.unemployedDto.employmentNum ? form.unemployedDto.employmentNum : '--') : '--' }}</view>
                 </view>
-                <view class="item" v-if="form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
+                <view class="item" v-if="form.unemployedDto &&form.workInfoDto  && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
                     <view class="label">技术特长：</view>
-                    <View class="value">{{ form.unemployedDto ? (form.unemployedDto.specialSkill ? form.unemployedDto.specialSkill : '--') : '--' }}</View>
+                    <view class="value">{{ form.unemployedDto ? (form.unemployedDto.specialSkill ? form.unemployedDto.specialSkill : '--') : '--' }}</view>
                 </view>
-                <view class="item" v-if="form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
+                <view class="item" v-if="form.unemployedDto &&form.workInfoDto  && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
                     <view class="label">是否领取失业金：</view>
-                    <View class="value">
+                    <view class="value">
                         {{
                             form.unemployedDto.unempCompensationFlag != null
                                 ? form.unemployedDto.unempCompensationFlag === 0
@@ -308,11 +308,11 @@
                                     : '--'
                                 : '--'
                         }}
-                    </View>
+                    </view>
                 </view>
-                <view class="item" v-if="form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
+                <view class="item" v-if="form.unemployedDto && form.workInfoDto  &&  (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
                     <view class="label">是否就业困难对象：</view>
-                    <View class="value">
+                    <view class="value">
                         {{
                             form.unemployedDto.employmentHardFlag != null
                                 ? form.unemployedDto.employmentHardFlag === 0
@@ -322,17 +322,17 @@
                                     : '--'
                                 : '--'
                         }}
-                    </View>
+                    </view>
                 </view>
-                <view class="item" v-if="form.workInfoDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
+                <view class="item" v-if="form.workInfoDto && form.workInfoDto  && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)">
                     <view class="label">劳动就业愿望：</view>
-                    <View class="value">{{ form.workInfoDto ? (form.workInfoDto.employmentWish ? form.workInfoDto.employmentWish : '--') : '--' }}</View>
+                    <view class="value">{{ form.workInfoDto ? (form.workInfoDto.employmentWish ? form.workInfoDto.employmentWish : '--') : '--' }}</view>
                 </view>
                 <view class="item">
                     <view class="label">有无赡养人：</view>
-                    <View class="value">
+                    <view class="value">
                         {{ form.familyInfoDto && form.familyInfoDto.elderlyFlag == 1 ? '有' : form.familyInfoDto && form.familyInfoDto.elderlyFlag == 0 ? '无' : '--' }}
-                    </View>
+                    </view>
                 </view>
             </view>
         </view>
@@ -343,13 +343,13 @@
             <view class="info" v-for="(itemC, indexC) in item.children" :key="indexC">
                 <view class="item">
                     <view class="label">{{ itemC.label }}：</view>
-                    <View class="value">{{ itemC.value || '--' }}</View>
+                    <view class="value">{{ itemC.value || '--' }}</view>
                 </view>
             </view>
         </view>
         <view class="card" id="graph">
             <view class="title">关系图谱</view>
-            <resi-graph :resiId="resiId" @clickGraphNode="clickGraphNode" v-if="resiId"></resi-graph>
+            <!-- <resi-graph :resiId="resiId" @clickGraphNode="clickGraphNode" v-if="resiId"></resi-graph> -->
         </view>
 
         <view class="card" id="business">
@@ -402,7 +402,7 @@
                     </view>
                 </view>
             </view>
-            <no-data :isShow="logs.length === 0" v-if="logs.length === 0"></no-data>
+            <!-- <no-data :isShow="logs.length === 0" v-if="logs.length === 0"></no-data> -->
         </view>
         <!-- 走访打卡 -->
         <!-- <view class="card ">
@@ -420,7 +420,7 @@
 
         <view class="bto_btn">
             <view class="btn" @tap="toEvent">上报诉求</view>
-            <view class="btn" @tap="toWebView" v-if="agencyLevel !== 'street'">满意度调查</view>
+            <view class="btn" @tap="toWebview" v-if="agencyLevel !== 'street'">满意度调查</view>
             <view class="btn blue" @tap="handelTopunchCard">走访打卡</view>
         </view>
         <van-dialog
@@ -1055,10 +1055,6 @@ export default {
             this.getChangeRecordsById();
             this.getTabData();
         }
-        // this.data.qqMapWX = new QQMapWX({
-        //     key: 'CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ'
-        // })
-        // this.reverseLocation()
         this.setData({
             agencyLevel: app.globalData.user.level
         });
@@ -1097,6 +1093,20 @@ export default {
      * 用户点击右上角分享
      */
     onShareAppMessage() {},
+	computed:{
+		 filterLabel() {
+		     return function(arr,key){
+             console.log(arr,key,'seeee');
+             let str = ''
+                if(key){
+                   str =  arr[key].label
+                }else{
+                    str = '--'
+                }
+		      	return str
+		      }
+		    }
+	},
     methods: {
         getDicts: async function () {
             try {
@@ -1141,14 +1151,15 @@ export default {
                 if (res.data.residentCategoryStr) {
                     res.data.baseInfoDto.categoryInfo.categoryNames = res.data.residentCategoryStr.split(',');
                 }
-                if (res.data.familyInfoDto && res.data.familyInfoDto.marriage) {
-                    marriageName = this.dicts.marriageArr.filter((item) => item.value == res.data.familyInfoDto.marriage)[0].label;
-                }
+                // if (res.data.familyInfoDto && res.data.familyInfoDto.marriage) {
+                //     marriageName = this.dicts.marriageArr.filter((item) => item.value == res.data.familyInfoDto.marriage)[0].label;
+                // }
                 // 处理tab
                 this.setData({
                     form: res.data,
                     marriageName: marriageName
                 });
+				
                 await this.updateTabList(res.data.integrityData.integrityQtyMap);
             } catch (err) {
                 console.log('CatchClause', err);
@@ -1531,10 +1542,10 @@ export default {
                 });
         },
 
-        toWebView() {
+        toWebview() {
             if (app.globalData.questionnaireUrl) {
                 uni.navigateTo({
-                    url: '/pages/webView/webView?url=' + app.globalData.questionnaireUrl
+                    url: '/pages/webview/webview?url=' + app.globalData.questionnaireUrl
                 });
             } else {
                 uni.showToast({
diff --git a/subpages/statistics/pages/residentPortrait2/residentPortrait.vue b/subpages/statistics/pages/residentPortrait2/residentPortrait.vue
index 917f973..c19ae8c 100644
--- a/subpages/statistics/pages/residentPortrait2/residentPortrait.vue
+++ b/subpages/statistics/pages/residentPortrait2/residentPortrait.vue
@@ -151,7 +151,7 @@
 <script>
 import Tabs from '../../../../components/Tabs';
 import ecCanvas from '../../../../ec-canvas/ec-canvas';
-import * as echarts from '../../../../ec-canvas/echarts';
+import * as echarts from '../../../../static/echarts.js';
 import {
     getPersonalFile,
     getFamilyRelationshipList,
diff --git a/utils/api.js b/utils/api.js
index 076ad22..69e37bd 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -113,7 +113,7 @@ function clearMessage() {
  *小程序用户登录
  */
 function userLoginlog(para) {
-    return fly.post('auth/gov/loginbypassword', para);
+    return fly.post('auth/login/govH5/loginByPassword', para);
 }
 /**
  *人员详情