elink-star
/
epmet-work-uni
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

登录 居民详情页面

master
mk 10 months ago
parent
fc4b3a3ab1
commit
0ab2d29886
23 changed files with 1282 additions and 258 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      App.vue
  2. 10
      components/Head/index.vue
  3. 4
      components/custom-tab-bar/index.vue
  4. 5
      ec-canvas/ec-canvas.vue
  5. 168
      manifest.json
  6. 71
      pages.json
  7. 2
      pages/information/echartsCallBack.js
  8. 2
      pages/information/information.vue
  9. 73
      pages/login/login.vue
  10. 2
      pages/statistics/modules/HotlineComplaints/HotlineComplaints.vue
  11. 2
      pages/statistics/modules/RequirementAnalysis/RequirementAnalysis.vue
  12. 2
      pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.vue
  13. 2
      pages/statistics/modules/Trend/Trend.vue
  14. 0
      static/echarts.js
  15. 984
      subpages/addResi/pages/addResi/addResi.vue
  16. 4
      subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.vue
  17. 2
      subpages/house/pages/housePortrait/component/graph/graph.vue
  18. 36
      subpages/morenews/pages/morenews/morenews.vue
  19. 16
      subpages/searchResult/pages/punchCard/punchCard.vue
  20. 2
      subpages/searchResult/pages/resiInfo/component/graph/graph.vue
  21. 131
      subpages/searchResult/pages/resiInfo/resiInfo.vue
  22. 2
      subpages/statistics/pages/residentPortrait2/residentPortrait.vue
  23. 2
      utils/api.js

16
App.vue
View File

@ -18,14 +18,14 @@ export default {
} else { } else {
this.globalData.share = false; this.globalData.share = false;
} }
const menuButtonInfo = uni.getMenuButtonBoundingClientRect(); // const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
uni.getSystemInfo({ // uni.getSystemInfo({
success: (res) => { // success: (res) => {
this.globalData.height = res.statusBarHeight; // this.globalData.height = res.statusBarHeight;
this.globalData.deviceInfo.statusHeight = res.statusBarHeight; // this.globalData.deviceInfo.statusHeight = res.statusBarHeight;
this.globalData.deviceInfo.navigationHeight = menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2; // this.globalData.deviceInfo.navigationHeight = menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2;
} // }
}); // });
uni.hideTabBar(); uni.hideTabBar();
getStaffbasicinfo() getStaffbasicinfo()
.then((res) => { .then((res) => {

10
components/Head/index.vue
View File

@ -57,12 +57,12 @@ export default {
navigationHeight: app.globalData.deviceInfo.navigationHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight,
agencyName: app.globalData.user.agencyName agencyName: app.globalData.user.agencyName
}); });
const menuButton = uni.getMenuButtonBoundingClientRect(); // const menuButton = uni.getMenuButtonBoundingClientRect();
console.log(menuButton); console.log(menuButton);
this.setData({ // this.setData({
leftWidth: menuButton.left, // leftWidth: menuButton.left,
iconWidth: menuButton.width // iconWidth: menuButton.width
}); // });
}, },
back() { back() {

4
components/custom-tab-bar/index.vue
View File

@ -94,13 +94,13 @@ export default {
getOwnedRolesOfStaffId(res.data.id).then((res2) => { getOwnedRolesOfStaffId(res.data.id).then((res2) => {
app.globalData.user = res.data; app.globalData.user = res.data;
this.setData({ this.setData({
'list[3].show': res2.data.filter((item) => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0 'list[3].show': true
}); });
}); });
}); });
} else { } else {
this.setData({ 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'); console.log(app.globalData.roleList, 'userss');

5
ec-canvas/ec-canvas.vue
View File

@ -26,7 +26,7 @@
<script> <script>
import WxCanvas from './wx-canvas'; import WxCanvas from './wx-canvas';
import * as echarts from './echarts'; import * as echarts from '../static/echarts';
let ctx; let ctx;
function compareVersion(v1, v2) { function compareVersion(v1, v2) {
v1 = v1.split('.'); v1 = v1.split('.');
@ -100,7 +100,7 @@ export default {
const version = uni.getSystemInfoSync().SDKVersion; const version = uni.getSystemInfoSync().SDKVersion;
const canUseNewCanvas = compareVersion(version, '2.9.0') >= 0; const canUseNewCanvas = compareVersion(version, '2.9.0') >= 0;
const forceUseOldCanvas = this.forceUseOldCanvas; const forceUseOldCanvas = this.forceUseOldCanvas;
const isUseNewCanvas = canUseNewCanvas && !forceUseOldCanvas; const isUseNewCanvas = true;
this.setData({ this.setData({
isUseNewCanvas isUseNewCanvas
}); });
@ -170,6 +170,7 @@ export default {
size: true size: true
}) })
.exec((res) => { .exec((res) => {
console.log(res,'seeeee')
const canvasNode = res[0].node; const canvasNode = res[0].node;
this.canvasNode = canvasNode; this.canvasNode = canvasNode;
const canvasDpr = uni.getSystemInfoSync().pixelRatio; const canvasDpr = uni.getSystemInfoSync().pixelRatio;

168
manifest.json
View File

@ -1,86 +1,86 @@
{ {
"name": "epmet-work-mp", "name" : "epmet-work-mp",
"appid": "", "appid" : "__UNI__0A9CAB7",
"description": "{\r \"pagePath\": \"pages/information/information\",\r \"text\": \"数据\",\r \"iconPath\": \"images/home/information.png\",\r \"selectedIconPath\": \"images/home/informationSelected.png\"\r },", "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", "versionName" : "1.0.0",
"versionCode": "100", "versionCode" : "100",
"transformPx": false, "transformPx" : false,
"app-plus": { "app-plus" : {
"usingComponents": true, "usingComponents" : true,
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
"modules": {}, "modules" : {},
"distribute": { "distribute" : {
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
] ]
}, },
"ios": {}, "ios" : {},
"sdkConfigs": {} "sdkConfigs" : {}
} }
}, },
"quickapp": {}, "quickapp" : {},
"mp-weixin": { "mp-weixin" : {
"appid": "wxaf87b420b87e2d79", "appid" : "wxaf87b420b87e2d79",
"setting": { "setting" : {
"urlCheck": false "urlCheck" : false
}, },
"usingComponents": true, "usingComponents" : true,
"permission": { "permission" : {
"scope.userLocation": { "scope.userLocation" : {
"desc": "亿联社区将获取您的位置信息" "desc" : "亿联社区将获取您的位置信息"
} }
}, },
"plugins": { "plugins" : {
"ocr-plugin": { "ocr-plugin" : {
"version": "3.1.3", "version" : "3.1.3",
"provider": "wx4418e3e031e551be" "provider" : "wx4418e3e031e551be"
}, },
"routePlan": { "routePlan" : {
"version": "1.0.11", "version" : "1.0.11",
"provider": "wx50b5593e81dd937a" "provider" : "wx50b5593e81dd937a"
}, },
"WechatSI": { "WechatSI" : {
"version": "0.3.6", "version" : "0.3.6",
"provider": "wx069ba97219f66d99" "provider" : "wx069ba97219f66d99"
} }
} }
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true "usingComponents" : true
}, },
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
}, },
"vueVersion": "2", "vueVersion" : "2",
"networkTimeout": { "networkTimeout" : {
"request": 60000 "request" : 60000
} }
} }

71
pages.json
View File

@ -584,5 +584,74 @@
"provider": "wx4418e3e031e551be" "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"
}
}
} }

2
pages/information/echartsCallBack.js
View File

@ -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) { function initLineChart(canvas, width, height, dpr, xData) {
const chart = echarts.init(canvas, null, { const chart = echarts.init(canvas, null, {
width: width, width: width,

2
pages/information/information.vue
View File

@ -7,7 +7,7 @@
<script> <script>
import ecCanvas from '@/ec-canvas/ec-canvas'; 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) { function initChart(canvas, width, height, dpr) {
const chart = echarts.init(canvas, null, { const chart = echarts.init(canvas, null, {
width: width, width: width,

73
pages/login/login.vue
View File

@ -14,7 +14,7 @@
<view class="input_box"> <view class="input_box">
<image src="/static/images/login/user.png" mode="" /> <image src="/static/images/login/user.png" mode="" />
<!-- 失去焦点的时候bindblur="handelBlurMobile" --> <!-- 失去焦点的时候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="" /> <image src="/static/images/login/password.png" mode="" />
<!-- 将值绑定formData.password中 --> <!-- 将值绑定formData.password中 -->
<input type="text" confirm-type="go" :password="true" placeholder="请输入密码" @input="handelBlurPassword" @blur="handelBlurPassword" :value="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() { data() {
return { return {
formData: { formData: {
mobile: '', phone: '',
password: '', password: '',
appId: 'wxaf87b420b87e2d79' app:'gov',
client:'h5',
customerId:'45687aa479955f9d06204d415238f7cc'
// appId: ''
} }
}; };
} }
@ -76,7 +79,7 @@ export default {
handelBlurMobile(e) { handelBlurMobile(e) {
this.setData({ this.setData({
// 获取绑定过的值，付给fromData.mobile // 获取绑定过的值，付给fromData.mobile
'formData.mobile': e.detail.value 'formData.phone': e.detail.value
}); });
console.log(this.formData); console.log(this.formData);
}, },
@ -90,7 +93,7 @@ export default {
}, },
handelClickSubmit() { handelClickSubmit() {
if (!this.formData.mobile) { if (!this.formData.phone) {
// 微信的轻量级api // 微信的轻量级api
uni.showToast({ uni.showToast({
title: '请填写手机号', title: '请填写手机号',
@ -110,44 +113,42 @@ export default {
return; return;
} }
const parm = { const parm = {
// wxCode对象的初始化
wxCode: '',
// ...将this.data.formData所有属性，赋值到表单中
...this.formData ...this.formData
}; };
// 轻量级api,在加载时进行显示 // 轻量级api,在加载时进行显示
uni.showLoading({ uni.showLoading({
title: '登录中' title: '登录中'
}); });
uni.login({ userLoginlog(parm)
success: (res) => { .then((res) => {
parm.wxCode = res.code; console.log(res);
console.log(parm.wxCode); // 判断登录是否成功
// 调用登录的接口 if (res.code == 0) {
userLoginlog(parm) // 用于跳转的api,跳转到某某某
.then((res) => { uni.switchTab({
console.log(res); url: '/pages/index/index'
// 判断登录是否成功
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);
}); });
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,获取登录凭证,用户获取凭证 //微信的api,获取登录凭证,用户获取凭证
// uni.getUserProfile({ // uni.getUserProfile({
// desc: '用于获取用户个人信息', // desc: '用于获取用户个人信息',

2
pages/statistics/modules/HotlineComplaints/HotlineComplaints.vue
View File

@ -11,7 +11,7 @@
<script> <script>
import Tabs from '../../../../components/Tabs'; import Tabs from '../../../../components/Tabs';
import ecCanvas from '../../../../ec-canvas/ec-canvas'; 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'; import { dwdEventReport, event12345Group } from '../../../../utils/statisticsApi';
var chart; var chart;
const formatTime = (date) => { const formatTime = (date) => {

2
pages/statistics/modules/RequirementAnalysis/RequirementAnalysis.vue
View File

@ -11,7 +11,7 @@
<script> <script>
import Tabs from '../../../../components/Tabs'; import Tabs from '../../../../components/Tabs';
import ecCanvas from '../../../../ec-canvas/ec-canvas'; 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'; import { commonDemandCountByCategory, countByCategory, event12345Group } from '../../../../utils/statisticsApi';
var chart; var chart;
const formatTime = (date) => { const formatTime = (date) => {

2
pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.vue
View File

@ -11,7 +11,7 @@
<script> <script>
import Tabs from '../../../../components/Tabs'; import Tabs from '../../../../components/Tabs';
import ecCanvas from '../../../../ec-canvas/ec-canvas'; 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'; import { satisfactionGroup, event12345Group } from '../../../../utils/statisticsApi';
var chart; var chart;
const formatTime = (date) => { const formatTime = (date) => {

2
pages/statistics/modules/Trend/Trend.vue
View File

@ -6,7 +6,7 @@
<script> <script>
import ecCanvas from '../../../../ec-canvas/ec-canvas'; 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'; import { notSatisfactionTrend } from '../../../../utils/statisticsApi';
var chart = null; var chart = null;
export default { export default {

0
ec-canvas/echarts.js → static/echarts.js
View File

984
subpages/addResi/pages/addResi/addResi.vue
View File

File diff suppressed because it is too large

4
subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.vue
View File

@ -461,9 +461,9 @@ var recorderManager = uni.getRecorderManager();
var innerAudioContext = uni.createInnerAudioContext(); var innerAudioContext = uni.createInnerAudioContext();
import api from '../../../../../utils/api'; import api from '../../../../../utils/api';
// 引入插件 // 引入插件
const plugin = requirePlugin('WechatSI'); // const plugin = requirePlugin('WechatSI');
// 获取全局唯一语音识别管理器 // 获取全局唯一语音识别管理器
const manager = plugin.getRecordRecognitionManager(); // const manager = plugin.getRecordRecognitionManager();
var timer; var timer;
export default { export default {
components: { components: {

2
subpages/house/pages/housePortrait/component/graph/graph.vue
View File

@ -7,7 +7,7 @@
<script> <script>
import ecCanvas from '../../../../../../ec-canvas/ec-canvas'; 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'; import { getFamilyRelationshipListByHouseId } from '../../../../../../utils/api';
var chart; var chart;
export default { export default {

36
subpages/morenews/pages/morenews/morenews.vue
View File

@ -7,7 +7,7 @@
<!-- #endif --> <!-- #endif -->
<!-- #ifndef MP-WEIXIN --> <!-- #ifndef MP-WEIXIN -->
<view>当前为非微信小程序环境，不支持公众号关注组件，请自行调整当前节点内容！</view> <!-- <view>当前为非微信小程序环境，不支持公众号关注组件，请自行调整当前节点内容！</view> -->
<!-- #endif --> <!-- #endif -->
</view> </view>
@ -60,7 +60,7 @@ import loadMore from '../../../../components/loadMore/loadMore';
import noData from '../../../../components/noData/nodata'; import noData from '../../../../components/noData/nodata';
import customTabBar from '../../../../components/custom-tab-bar/index.vue'; import customTabBar from '../../../../components/custom-tab-bar/index.vue';
const app = getApp(); const app = getApp();
import api, { getIntelligentMessage, getToken, getStaffbasicinfo, clearMessage } from '../../../../utils/api'; import api, { getIntelligentMessage, getStaffbasicinfo, clearMessage } from '../../../../utils/api';
export default { export default {
components: { components: {
loadMore, loadMore,
@ -91,7 +91,6 @@ export default {
navigationHeight: app.globalData.deviceInfo.navigationHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight,
share: app.globalData.share share: app.globalData.share
}); });
await this.getToken();
// await this.getIntelligentMessage() // await this.getIntelligentMessage()
await this.getStaffbasicinfo(); 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() {
getStaffbasicinfo() getStaffbasicinfo()
.then((res) => { .then((res) => {

16
subpages/searchResult/pages/punchCard/punchCard.vue
View File

@ -7,23 +7,23 @@
<view class="info"> <view class="info">
<view class="item"> <view class="item">
<view class="label">姓名：</view> <view class="label">姓名：</view>
<View class="value">{{ form.name }}</View> <view class="value">{{ form.name }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">性别：</view> <view class="label">性别：</view>
<View class="value">{{ form.genderName }}</View> <view class="value">{{ form.genderName }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">出生日期：</view> <view class="label">出生日期：</view>
<View class="value">{{ form.birthday }}</View> <view class="value">{{ form.birthday }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">住宅：</view> <view class="label">住宅：</view>
<View class="value">{{ form.homeName }}</View> <view class="value">{{ form.homeName }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">电话：</view> <view class="label">电话：</view>
<View class="value">{{ form.mobile }}</View> <view class="value">{{ form.mobile }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -41,7 +41,7 @@
<view class="card"> <view class="card">
<view class="title">相关操作</view> <view class="title">相关操作</view>
<view class="blue btn" @tap="toAddResi" style="margin-top: 40rpx">修改居民信息</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 class="green btn" @tap="toEvent">上报居民诉求</view>
</view> </view>
</view> </view>
@ -194,10 +194,10 @@ export default {
}); });
}, },
toWebView() { toWebview() {
console.log(app.globalData); console.log(app.globalData);
uni.navigateTo({ uni.navigateTo({
url: '/pages/webView/webView?url=' + app.globalData.questionnaireUrl url: '/pages/webview/webview?url=' + app.globalData.questionnaireUrl
}); });
}, },

2
subpages/searchResult/pages/resiInfo/component/graph/graph.vue
View File

@ -7,7 +7,7 @@
<script> <script>
import ecCanvas from '../../../../../../ec-canvas/ec-canvas'; 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'; import { getFamilyRelationshipList } from '../../../../../../utils/api';
var chart; var chart;
export default { export default {

131
subpages/searchResult/pages/resiInfo/resiInfo.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<view> <view >
<!-- subpages/searchResult/pages/resiInfo/resiInfo.wxml --> <!-- subpages/searchResult/pages/resiInfo/resiInfo.wxml -->
<!-- 基本信息 --> <!-- 基本信息 -->
<view class="card"> <view class="card" v-if="form.baseInfoDto.idNum">
<view class="top"> <view class="top">
<view class="left"> <view class="left" >
<view class="name"> <view class="name">
<view style="display: flex"> <view style="display: flex">
<image <image
@ -33,7 +33,7 @@
/> />
<image <image
style="width: 40rpx; height: 40rpx; margin-right: 16rpx" 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" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/0c38251bba644a6b8e4a925aea74c9a7.png"
mode="" mode=""
/> />
@ -160,47 +160,47 @@
<view class="item"> <view class="item">
<text class="must">*</text> <text class="must">*</text>
<view class="label">国籍：</view> <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>
<view class="item"> <view class="item">
<text class="must">*</text> <text class="must">*</text>
<view class="label">证件类型：</view> <view class="label">证件类型：</view>
<View class="value">{{ idTypeList[form.baseInfoDto.idType].label || '--' }}</View> <view class="value">{{ filterLabel(idTypeList,form.baseInfoDto.idType) }}</view>
</view> </view>
<view class="item"> <view class="item">
<text class="must">*</text> <text class="must">*</text>
<view class="label">证件号：</view> <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>
<view class="item"> <view class="item">
<text class="must">*</text> <text class="must">*</text>
<view class="label">联系电话：</view> <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>
<view class="item"> <view class="item">
<view class="label">文化程度：</view> <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>
<view class="item"> <view class="item">
<view class="label">性别：</view> <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>
<view class="item"> <view class="item">
<view class="label">出生日期：</view> <view class="label">出生日期：</view>
<View class="value">{{ form.baseInfoDto.birthday || '--' }}</View> <view class="value">{{ form.baseInfoDto.birthday || '--' }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">民族：</view> <view class="label">民族：</view>
<View class="value">{{ form.baseInfoDto.nationName || '--' }}</View> <view class="value">{{ form.baseInfoDto.nationName || '--' }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">婚姻状况：</view> <view class="label">婚姻状况：</view>
<View class="value">{{ marriageName || '--' }}</View> <view class="value">{{ marriageName || '--' }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">籍贯：</view> <view class="label">籍贯：</view>
<View class="value">{{ form.baseInfoDto.nativePlace || '--' }}</View> <view class="value">{{ form.baseInfoDto.nativePlace || '--' }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -211,18 +211,18 @@
<view class="item"> <view class="item">
<text class="must">*</text> <text class="must">*</text>
<view class="label">所属网格：</view> <view class="label">所属网格：</view>
<View class="value">{{ item.gridName || '--' }}</View> <view class="value">{{ item.gridName || '--' }}</view>
</view> </view>
<view class="item"> <view class="item">
<text class="must">*</text> <text class="must">*</text>
<view class="label">所属房屋：</view> <view class="label">所属房屋：</view>
<View class="value">{{ item.agencyName }}{{ item.homeName }}</View> <view class="value">{{ item.agencyName }}{{ item.homeName }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">人房关系：</view> <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>
<view class="item"> <view class="item">
@ -239,12 +239,12 @@
<view class="item"> <view class="item">
<view class="label">户籍所在地：</view> <view class="label">户籍所在地：</view>
<View class="value">{{ item.placeOfDomicile ? item.placeOfDomicile : '--' }}</View> <view class="value">{{ item.placeOfDomicile ? item.placeOfDomicile : '--' }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">与户主关系：</view> <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> </view>
</view> </view>
@ -258,47 +258,47 @@
</view> </view>
<view class="item"> <view class="item">
<view class="label">就业状态：</view> <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>
<view class="item" v-if="form.workInfoDto && form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5"> <view class="item" v-if="form.workInfoDto && form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
<view class="label">工作单位：</view> <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>
<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="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>
<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="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>
<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="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>
<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="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>
<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="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>
<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="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>
<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="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>
<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="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>
<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="label">是否领取失业金：</view>
<View class="value"> <view class="value">
{{ {{
form.unemployedDto.unempCompensationFlag != null form.unemployedDto.unempCompensationFlag != null
? form.unemployedDto.unempCompensationFlag === 0 ? form.unemployedDto.unempCompensationFlag === 0
@ -308,11 +308,11 @@
: '--' : '--'
: '--' : '--'
}} }}
</View> </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="label">是否就业困难对象：</view>
<View class="value"> <view class="value">
{{ {{
form.unemployedDto.employmentHardFlag != null form.unemployedDto.employmentHardFlag != null
? form.unemployedDto.employmentHardFlag === 0 ? form.unemployedDto.employmentHardFlag === 0
@ -322,17 +322,17 @@
: '--' : '--'
: '--' : '--'
}} }}
</View> </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="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>
<view class="item"> <view class="item">
<view class="label">有无赡养人：</view> <view class="label">有无赡养人：</view>
<View class="value"> <view class="value">
{{ form.familyInfoDto && form.familyInfoDto.elderlyFlag == 1 ? '有' : form.familyInfoDto && form.familyInfoDto.elderlyFlag == 0 ? '无' : '--' }} {{ form.familyInfoDto && form.familyInfoDto.elderlyFlag == 1 ? '有' : form.familyInfoDto && form.familyInfoDto.elderlyFlag == 0 ? '无' : '--' }}
</View> </view>
</view> </view>
</view> </view>
</view> </view>
@ -343,13 +343,13 @@
<view class="info" v-for="(itemC, indexC) in item.children" :key="indexC"> <view class="info" v-for="(itemC, indexC) in item.children" :key="indexC">
<view class="item"> <view class="item">
<view class="label">{{ itemC.label }}：</view> <view class="label">{{ itemC.label }}：</view>
<View class="value">{{ itemC.value || '--' }}</View> <view class="value">{{ itemC.value || '--' }}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="card" id="graph"> <view class="card" id="graph">
<view class="title">关系图谱</view> <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>
<view class="card" id="business"> <view class="card" id="business">
@ -402,7 +402,7 @@
</view> </view>
</view> </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>
<!-- 走访打卡 --> <!-- 走访打卡 -->
<!-- <view class="card "> <!-- <view class="card ">
@ -420,7 +420,7 @@
<view class="bto_btn"> <view class="bto_btn">
<view class="btn" @tap="toEvent">上报诉求</view> <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 class="btn blue" @tap="handelTopunchCard">走访打卡</view>
</view> </view>
<van-dialog <van-dialog
@ -1055,10 +1055,6 @@ export default {
this.getChangeRecordsById(); this.getChangeRecordsById();
this.getTabData(); this.getTabData();
} }
// this.data.qqMapWX = new QQMapWX({
// key: 'CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ'
// })
// this.reverseLocation()
this.setData({ this.setData({
agencyLevel: app.globalData.user.level agencyLevel: app.globalData.user.level
}); });
@ -1097,6 +1093,20 @@ export default {
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
onShareAppMessage() {}, 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: { methods: {
getDicts: async function () { getDicts: async function () {
try { try {
@ -1141,14 +1151,15 @@ export default {
if (res.data.residentCategoryStr) { if (res.data.residentCategoryStr) {
res.data.baseInfoDto.categoryInfo.categoryNames = res.data.residentCategoryStr.split(','); res.data.baseInfoDto.categoryInfo.categoryNames = res.data.residentCategoryStr.split(',');
} }
if (res.data.familyInfoDto && res.data.familyInfoDto.marriage) { // if (res.data.familyInfoDto && res.data.familyInfoDto.marriage) {
marriageName = this.dicts.marriageArr.filter((item) => item.value == res.data.familyInfoDto.marriage)[0].label; // marriageName = this.dicts.marriageArr.filter((item) => item.value == res.data.familyInfoDto.marriage)[0].label;
} // }
// 处理tab // 处理tab
this.setData({ this.setData({
form: res.data, form: res.data,
marriageName: marriageName marriageName: marriageName
}); });
await this.updateTabList(res.data.integrityData.integrityQtyMap); await this.updateTabList(res.data.integrityData.integrityQtyMap);
} catch (err) { } catch (err) {
console.log('CatchClause', err); console.log('CatchClause', err);
@ -1531,10 +1542,10 @@ export default {
}); });
}, },
toWebView() { toWebview() {
if (app.globalData.questionnaireUrl) { if (app.globalData.questionnaireUrl) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/webView/webView?url=' + app.globalData.questionnaireUrl url: '/pages/webview/webview?url=' + app.globalData.questionnaireUrl
}); });
} else { } else {
uni.showToast({ uni.showToast({

2
subpages/statistics/pages/residentPortrait2/residentPortrait.vue
View File

@ -151,7 +151,7 @@
<script> <script>
import Tabs from '../../../../components/Tabs'; import Tabs from '../../../../components/Tabs';
import ecCanvas from '../../../../ec-canvas/ec-canvas'; import ecCanvas from '../../../../ec-canvas/ec-canvas';
import * as echarts from '../../../../ec-canvas/echarts'; import * as echarts from '../../../../static/echarts.js';
import { import {
getPersonalFile, getPersonalFile,
getFamilyRelationshipList, getFamilyRelationshipList,

2
utils/api.js
View File

@ -113,7 +113,7 @@ function clearMessage() {
*小程序用户登录 *小程序用户登录
*/ */
function userLoginlog(para) { function userLoginlog(para) {
return fly.post('auth/gov/loginbypassword', para); return fly.post('auth/login/govH5/loginByPassword', para);
} }
/** /**
*人员详情 *人员详情

Write Preview
Loading…
Cancel
Save