kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into build

Browse Source 
# Conflicts:
#	package.json
#	project/dv/apps/AppGridDV.vue
This commit is contained in:
aixianling
2022-08-22 18:07:04 +08:00
parent 4bb6e3be77 f0edad2b97
commit 59542c73b3
8 changed files with 242 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/AiDvPartyOrg.vue
View File

@@ -1,33 +1,19 @@
<template>
<div class="partyDvOrg" ref="container">
<div
class="partyDvOrg-wrapper"
ref="tree"
id="tree"
<div class="partyDvOrg-wrapper" ref="tree" id="tree"
:style="{left: x, top: y, transform: `scale(${scale}) translate(-50%, -50%) `, 'transform-origin': `${0} ${0}`}">
<VueOkrTree
:props="props"
node-key="id"
ref="VueOkrTree"
:data="treeData">
</VueOkrTree>
<ai-okr-tree :props="props" node-key="id" :data="treeData"/>
</div>
</div>
</template>
<script>
import { VueOkrTree } from 'vue-okr-tree'
import 'vue-okr-tree/dist/vue-okr-tree.css'
import AiOkrTree from "./AiOkrTree";
export default {
name: 'AiDvPartyOrg',
components: {AiOkrTree},
props: ['instance'],
components: {
VueOkrTree
},
data() {
return {
scale: 1,

40
components/AiOkrTree.vue Normal file
View File

@@ -0,0 +1,40 @@
<template>
<section class="AiOkrTree">
<component v-if="okrTreeLoaded" v-bind="$attrs" :is="ot" :data="data"/>
</section>
</template>
<script>
import Vue from "vue"
export default {
name: "AiOkrTree",
props: {
data: {default: () => []}
},
computed: {
okrTreeLoaded: v => !!v.ot
},
data() {
return {
ot: null
}
},
created() {
this.$injectCss("https://cdn.cunwuyun.cn/vot/vue-okr-tree.css")
this.$injectLib("https://cdn.cunwuyun.cn/vot/vue-okr-tree.umd.min.js", () => {
const {VueOkrTree} = (window?.["vue-okr-tree"] || {})
this.ot = Vue.extend({
...VueOkrTree, data() {
return {...this.$attrs}
}
})
})
}
}
</script>
<style lang="scss" scoped>
.AiOkrTree {
}
</style>

1
package.json
View File

@@ -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"
},

2
packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
View File

@@ -49,7 +49,7 @@
<el-table-column slot="changeIntegral" label="变动积分" align="center">
<template slot-scope="{ row }">
<span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
<span v-if="row.integralType == 0">{{ row.changeIntegral > 0 ? '+' : '-' }}{{ row.changeIntegral }}</span>
<span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
</template>
</el-table-column>
<el-table-column slot="integralType" label="类型" align="center">

2
packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
View File

@@ -87,7 +87,7 @@
<el-table-column slot="changeIntegral" label="积分变动" align="center">
<template slot-scope="{ row }">
<span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
<span v-if="row.integralType == 0">{{ row.changeIntegral > 0 ? '+' : '-' }}{{ row.changeIntegral }}</span>
<span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
</template>
</el-table-column>
<el-table-column slot="options" label="操作" align="center">

3
packages/wxwork/Announce/AppAnnounce/components/Add.vue
View File

@@ -391,7 +391,8 @@ export default {
return {
...v,
wxOpenUserId: v.examineUserId,
id: v.examineUserId
id: v.examineUserId,
name: v.examineUserName
}
})
this.form.examinesName = '1'

15
project/dv/apps/AppGridDV.vue
View File

@@ -24,16 +24,14 @@
id="tree"
class="tree"
:style="{left: x, top: y, transform: `scale(${scale}) translate(-50%, -50%) `, 'transform-origin': `${0} ${0}`}">
<VueOkrTree
ref="VueOkrTree"
<ai-okr-tree ref="VueOkrTree" v-if="chartData.length"
:data="chartData"
node-key="id"
show-collapsable
aniamte
animate-name="okr-fade-in-linear"
:render-content="renderContent"
default-expand-all>
</VueOkrTree>
default-expand-all/>
</div>
</div>
<div class="right">
@@ -73,7 +71,6 @@
<span>{{ residentInfo.currentAreaName }}</span>
</div>
<ai-table
v-if="tableData.length"
style="width: 558px"
:tableData="tableData"
:col-configs="colConfigs"
@@ -90,8 +87,6 @@
<script>
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(() => {

260
project/dv/apps/AppPdDv.vue
View File

@@ -201,23 +201,23 @@
<div class="left" :class="'left'+ index">{{ index + 1 }}</div>
<div class="middel">
<div class="top">
<h2>{{ item.name }}</h2>
<h2>{{ item.userName }}</h2>
<!-- <span v-if="index === 0">网格长</span> -->
</div>
<p></p>
</div>
<i>{{ item.point }}</i>
<i>{{ item.userIntegral }}</i>
</div>
<div class="tab-item" v-for="(item, index) in rankList" :key="index" v-show="rightIndex === 1">
<div class="left" :class="'left'+ index">{{ index + 1 }}</div>
<div class="middel">
<div class="top">
<h2>{{ item.name }}</h2>
<h2>{{ item.userName }}</h2>
<!-- <span v-if="index === 0">网格长</span> -->
</div>
<p></p>
</div>
<i>{{ item.point }}</i>
<i>{{ item.changeIntegral }}</i>
</div>
</div>
</div>
@@ -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['居民统计']