diff --git a/components/AiDvPartyOrg.vue b/components/AiDvPartyOrg.vue index eeddf4cf..94b7f530 100644 --- a/components/AiDvPartyOrg.vue +++ b/components/AiDvPartyOrg.vue @@ -1,202 +1,158 @@ diff --git a/components/AiOkrTree.vue b/components/AiOkrTree.vue new file mode 100644 index 00000000..6db0640b --- /dev/null +++ b/components/AiOkrTree.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/package.json b/package.json index c15e8ede..cfa7aeed 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "sortablejs": "^1.12.0", "vue-draggable-resizable": "^2.3.0", "vue-json-editor": "^1.4.3", - "vue-okr-tree": "~1.0.10", "vue-ruler-tool": "^1.2.4", "vuedraggable": "^2.24.3" }, diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue index c2e105e1..b0649bb9 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue @@ -49,7 +49,7 @@ diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue index 02ce35e0..1cb20a0b 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue @@ -87,7 +87,7 @@ diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue index b759f63e..0fbf0e5c 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue @@ -391,7 +391,8 @@ export default { return { ...v, wxOpenUserId: v.examineUserId, - id: v.examineUserId + id: v.examineUserId, + name: v.examineUserName } }) this.form.examinesName = '1' diff --git a/project/dv/apps/AppGridDV.vue b/project/dv/apps/AppGridDV.vue index 963b2daf..0281faca 100644 --- a/project/dv/apps/AppGridDV.vue +++ b/project/dv/apps/AppGridDV.vue @@ -24,16 +24,14 @@ id="tree" class="tree" :style="{left: x, top: y, transform: `scale(${scale}) translate(-50%, -50%) `, 'transform-origin': `${0} ${0}`}"> - - +
@@ -73,7 +71,6 @@ {{ residentInfo.currentAreaName }}
import {barChart1, pieChart2} from "./components/chartOps" -import {VueOkrTree} from 'vue-okr-tree' -import 'vue-okr-tree/dist/vue-okr-tree.css' export default { name: 'AppGridDV', @@ -157,10 +152,6 @@ export default { } }, - components: { - VueOkrTree - }, - created() { this.dict.load('householdRelation') this.getTreeList() @@ -237,7 +228,6 @@ export default { handleNodeClick(e) { this.girdLevel = e.girdLevel this.isLoading = true - console.log(e) this.getGirdInfo(e.id, e.girdLevel) this.getStatisticsInfo(e.id) }, @@ -350,7 +340,6 @@ export default { this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => { if (res.code == 0) { const chartData = this.formatList([res.data]) - console.log(chartData) this.chartData = chartData this.$nextTick(() => { diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 5797c1bd..e43a705e 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -201,23 +201,23 @@
{{ index + 1 }}
-

{{ item.name }}

+

{{ item.userName }}

- {{ item.point }} + {{ item.userIntegral }}
{{ index + 1 }}
-

{{ item.name }}

+

{{ item.userName }}

- {{ item.point }} + {{ item.changeIntegral }}
@@ -261,246 +261,8 @@ replyPercentage: {}, groupChatNumber: {}, dynamicList: [], - rankList: [ - { - name: '李玉梅', - point: 550 - }, - { - name: '尚俊华', - point: 400 - }, - { - name: '周进', - point: 400 - }, - { - name: '熊兰', - point: 350 - }, - { - name: '全学奎', - point: 300 - }, - { - name: '张铂楠', - point: 300 - }, - { - name: '黄立琼', - point: 100 - }, - ], - pointList: [ - { - name: '王娇', - point: 9800 - }, - { - name: '张雨婷', - point: 6500 - }, - { - name: '周进', - point: 7800 - }, - { - name: '彭开富', - point: 5550 - }, - { - name: '李玉梅', - point: 5100 - }, - { - name: '尚俊华', - point: 4900 - }, - { - name: '周进', - point: 4050 - }, - { - name: '熊兰', - point: 3650 - }, - { - name: '全学奎', - point: 3000 - }, - { - name: '张铂楠', - point: 3000 - }, - { - name: '黄立琼', - point: 2500 - }, - { - name: '张丽', - point: 2750 - }, - { - name: '甘华富', - point: 1650 - }, - { - name: '刘明', - point: 1250 - }, - { - name: '张浩', - point: 900 - }, - { - name: '陈利权', - point: 900 - }, - { - name: '邱博文', - point: 600 - }, - { - name: '朱太原', - point: 600 - }, - { - name: '张淑君', - point: 600 - }, - { - name: '郭虹', - point: 600 - }, - { - name: '张丽萍', - point: 600 - }, - { - name: '李申琼', - point: 550 - }, - { - name: '易涛', - point: 500 - }, - { - name: '黄先华', - point: 500 - }, - { - name: '王卫理', - point: 450 - }, - { - name: '郑建秋', - point: 450 - }, - { - name: '尹涛', - point: 450 - }, - { - name: '李青', - point: 400 - }, - { - name: '杨丽蓉', - point: 400 - }, - { - name: '郭俊华', - point: 300 - }, - { - name: '高仁虎', - point: 300 - }, - { - name: '肖维兵', - point: 300 - }, - { - name: '刘文菊', - point: 200 - }, - { - name: '陈艳', - point: 200 - }, - { - name: '兰头', - point: 150 - }, - { - name: '廖加芬', - point: 150 - }, - { - name: '陈林华', - point: 150 - }, - { - name: '严先荣', - point: 150 - }, - { - name: '易涛', - point: 150 - }, - { - name: '伍小兵', - point: 150 - }, - { - name: '刘亚筠', - point: 150 - }, - { - name: '陈群英', - point: 150 - }, - { - name: '刘信党', - point: 150 - }, - { - name: '杨悦堃', - point: 150 - }, - { - name: '李茂珊', - point: 150 - }, - { - name: '饶春秀', - point: 150 - }, - { - name: '范先琼', - point: 150 - }, - { - name: '曾上游', - point: 150 - }, - { - name: '钟郁昭', - point: 150 - }, - { - name: '付德秀', - point: 150 - }, - { - name: '张胜玉', - point: 100 - }, - { - name: '谭星', - point: 100 - } - ] + rankList: [], + pointList: [] } }, @@ -523,6 +285,16 @@ }, getInfo () { + this.instance.post(`app/appintegraluser/userTotalIntegralSort`).then(res => { + if (res.code === 0) { + this.pointList = res.data + } + }) + this.instance.post(`app/appintegraluser/suffixWeekIntegralSort`).then(res => { + if (res.code === 0) { + this.rankList = res.data + } + }) this.instance.post(`/app/wxgroupstatistic/getCustommerNumber`).then(res => { if (res.code === 0) { this.residentInfo = res.data['居民统计']