diff --git a/images/index/bg_center.png b/images/index/bg_center.png deleted file mode 100644 index c009e59..0000000 Binary files a/images/index/bg_center.png and /dev/null differ diff --git a/images/morenews/clearnews.png b/images/morenews/clearnews.png deleted file mode 100644 index 42301f0..0000000 Binary files a/images/morenews/clearnews.png and /dev/null differ diff --git a/images/morenews/read.png b/images/morenews/read.png deleted file mode 100644 index df9fd65..0000000 Binary files a/images/morenews/read.png and /dev/null differ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 64f812c..d003c20 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -7,7 +7,7 @@ - + 数字化社区平台 打造社区工作新模式
用数据提升基层治理与服务水平
diff --git a/subpages/searchResult/pages/resiInfo/component/graph/graph.js b/subpages/searchResult/pages/resiInfo/component/graph/graph.js index df9d897..ef1f760 100644 --- a/subpages/searchResult/pages/resiInfo/component/graph/graph.js +++ b/subpages/searchResult/pages/resiInfo/component/graph/graph.js @@ -3,16 +3,14 @@ import { getFamilyRelationshipList } from "../../../../../../utils/api"; var chart; - -const formatNumber = n => { - n = n.toString() - return n[1] ? n : '0' + n -} Component({ properties: { resiId: { type: String, value: '', + observer(val) { + this.getData() + } } }, data: { @@ -20,13 +18,7 @@ Component({ lazyLoad: true // onInit: initChart }, - tabList: [{ - label: "问题突出类别", - value: 1 - }, { - label: '行业领域分析', - value: 2 - }], + tabValue: 1 }, lifetimes: { @@ -46,10 +38,8 @@ Component({ let than = this chart.on('click', function (param) { if (param.dataType == 'node') { - console.log('点击了节点',param) than.triggerEvent('clickGraphNode', {data: param.data.data }); } else { - console.log('点击了边',param) } }) canvas.setChart(chart); @@ -57,7 +47,6 @@ Component({ type: "0", id: this.data.resiId } - getFamilyRelationshipList(params).then(({ data }) => { @@ -132,7 +121,6 @@ Component({ }, })) - var option = { legend: [{ diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxml b/subpages/searchResult/pages/resiInfo/resiInfo.wxml index 6f71cf6..1d7053b 100644 --- a/subpages/searchResult/pages/resiInfo/resiInfo.wxml +++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxml @@ -130,7 +130,7 @@ 户籍所在地: - {{ item.placeOfDomicile === 'null'?'--':item.placeOfDomicile}} + {{ item.placeOfDomicile?item.placeOfDomicile:'--'}} * @@ -301,7 +301,7 @@ 关系图谱 - + diff --git a/utils/config.js b/utils/config.js index 6990d9b..dce6c12 100644 --- a/utils/config.js +++ b/utils/config.js @@ -5,9 +5,9 @@ module.exports = { }; function BASEURL() { - // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 + return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 // return 'http://192.168.1.144/api/' //测试环境 - return 'http://219.146.91.110:30801/api/' + // return 'http://219.146.91.110:30801/api/' // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 // return 'http://192.168.1.144/api/' //测试环境