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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-08-12 09:29:56 +08:00
parent d5b104fefd b879c1b0c4
commit c3f6fbbffe
6 changed files with 286 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@
</div> </div>
</div> </div>
</el-row> </el-row>
<!-- <el-row class="echertsBox" style="margin-bottom: 16px"> <el-row class="echertsBox" style="margin-bottom: 16px">
<div class="title"> <div class="title">
<h4>事件汇总</h4> <h4>事件汇总</h4>
<div class="timecSelect"> <div class="timecSelect">
@@ -26,26 +26,32 @@
</div> </div>
<div class="bar_Box"> <div class="bar_Box">
<div id="chartDom" style="height: 230px; width: 100%;"></div> <div id="chartDom" style="height: 230px; width: 100%;"></div>
<ai-empty v-if="false" style="height: 230px;"></ai-empty> <ai-empty v-if="false" style="height: 200px; width: 100%;"></ai-empty>
</div> </div>
</el-row> --> </el-row>
<ai-card> <ai-card>
<ai-title slot="title" title="余额变动明细"/> <ai-title slot="title" title="余额变动明细"/>
<template #content> <template #content>
<ai-search-bar> <ai-search-bar>
<template #left> <template #left>
<ai-select v-model="search.type" placeholder="请选择类型" @change="page.current=1,getIntegralChange()" <ai-select v-model="search.type" placeholder="请选择类型" @change="search.current=1,getIntegralChange()"
:selectList="dict.getDict('integralDetailType')"/> :selectList="dict.getDict('integralType')"/>
</template> </template>
<template #right> <template #right>
<ai-download :instance="instance" url="" :params="search" fileName="网格员积分" <ai-download :instance="instance" :url="`/app/appintegraluser/changeIntegralExport?id=${$route.query.id}`" :params="search" fileName="网格员余额变动明细"
:disabled="tableData.length == 0"> :disabled="tableData.length == 0">
<el-button size="small">导出</el-button> <el-button size="small">导出</el-button>
</ai-download> </ai-download>
</template> </template>
</ai-search-bar> </ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size" <ai-table :tableData="tableData" :total="search.total" :current.sync="search.current" :size.sync="search.size"
@getList="getTableData" :col-configs="colConfigs" :dict="dict"> @getList="getTableData" :col-configs="colConfigs" :dict="dict">
<el-table-column slot="eventDesc" label="事件" align="center">
<template slot-scope="{ row }">
<span>{{ row.integralType == 3 ? row.integralRuleNamesearch : row.integralType == 0? row.eventDesc : '' }}</span>
</template>
</el-table-column>
</ai-table> </ai-table>
</template> </template>
</ai-card> </ai-card>
@@ -64,8 +70,6 @@ export default {
name: '', name: '',
girdId: '', girdId: '',
type: '', type: '',
},
page: {
current: 1, current: 1,
size: 10, size: 10,
total: 0 total: 0
@@ -75,7 +79,6 @@ export default {
data: {}, data: {},
startTime: '', startTime: '',
endTime: '', endTime: '',
} }
}, },
props: { props: {
@@ -83,28 +86,22 @@ export default {
dict: Object, dict: Object,
permissions: Function, permissions: Function,
}, },
watch: {
timeList(newVal, oldVal) {
if(!newVal) {
// this.getList()
}
}
},
computed: { computed: {
colConfigs() { colConfigs() {
return [ return [
{ prop: "doTime", label: '时间', align: "left", width: "200px" }, { prop: "doTime", label: '时间', align: "left", width: "200px" },
{ prop: "integralType", label: '类型', align: "center", width: "180px", dict:"integralDetailType"}, { prop: "integralType", label: '类型', align: "center", width: "240px", dict:"integralType"},
{ prop: "changeIntegral", label: '变动积分', align: "center",width: "200px",render: (h, { row }) => { { prop: "changeIntegral", label: '变动积分', align: "center",width: "200px",render: (h, { row }) => {
return h('span', {}, `${row.integralCalcType == 1 ? '+' : '-'}${row.changeIntegral}`) return h('span', {}, `${row.integralCalcType == 1 ? '+' : '-'}${row.changeIntegral}`)
}}, }},
{ prop: "nowIntegral", label: '剩余积分', align: "center",width: "200px" }, { prop: "nowIntegral", label: '剩余积分', align: "center",width: "200px" },
{ prop: "eventDesc", label: '事件', align: "center", }, { slot: "eventDesc", label: '事件', align: "center", },
] ]
} }
}, },
created() { created() {
this.$dict.load('integralDetailType') this.$dict.load('integralType')
this.getDetail() this.getDetail()
this.getIntegralChange() this.getIntegralChange()
}, },
@@ -124,12 +121,12 @@ export default {
// 事件汇总 暂定 // 事件汇总 暂定
// 余额变动明细 // 余额变动明细
getIntegralChange() { getIntegralChange() {
this.instance.post(`/app/appintegraluser/getChangeDetail`, null, { this.instance.post(`/app/appintegraluser/getChangeDetail`, null, {
params: { params: {
...this.page, ...this.search, //积分类型
type: this.search.type, //积分类型
id: this.$route.query.id, id: this.$route.query.id,
} }
}).then(res => { }).then(res => {
@@ -205,10 +202,6 @@ export default {
this.myChart.resize() this.myChart.resize()
}, },
getTableData() {},
getListInit() {},
cancel(isRefresh) { cancel(isRefresh) {
this.$emit('change', { this.$emit('change', {
type: 'gridScoreManage', type: 'gridScoreManage',
@@ -219,7 +212,7 @@ export default {
}, },
mounted() { mounted() {
// this.getColEcherts() this.getColEcherts()
}, },
destroyed () { destroyed () {
@@ -234,6 +227,7 @@ export default {
height: 100%; height: 100%;
padding: 0 20px; padding: 0 20px;
box-sizing: border-box; box-sizing: border-box;
overflow-y: scroll;
.card_list { .card_list {
display: flex; display: flex;
.card { .card {

5
packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
View File

@@ -12,7 +12,7 @@
<el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.userName" clearable <el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.userName" clearable
@clear="page.current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch" @clear="page.current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch"
v-throttle="() => {(page.current = 1), getTableData();}"/> v-throttle="() => {(page.current = 1), getTableData();}"/>
<ai-download :instance="instance" url="" :params="search" fileName="网格员积分" <ai-download :instance="instance" url="`/app/appintegraluser/girdIntegralExport" :params="search" fileName="网格员积分"
:disabled="tableData.length == 0"> :disabled="tableData.length == 0">
<el-button size="small">导出</el-button> <el-button size="small">导出</el-button>
</ai-download> </ai-download>
@@ -96,6 +96,8 @@ export default {
search: { search: {
userName: '', userName: '',
girdId: '', girdId: '',
current: 1,
size: 10,
}, },
tableData: [], tableData: [],
page: {current: 1, size: 10, total: 0}, page: {current: 1, size: 10, total: 0},
@@ -116,7 +118,6 @@ export default {
label: 'girdName', label: 'girdName',
value: 'id', value: 'id',
checkStrictly: true, checkStrictly: true,
expandTrigger: 'hover',
}, },
} }
}, },

23
packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
View File

@@ -39,12 +39,12 @@
<el-table-column slot="options" label="操作" align="center" fixed="right" width="200"> <el-table-column slot="options" label="操作" align="center" fixed="right" width="200">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="table-options"> <div class="table-options">
<el-button type="text" :disabled="!permissions('app_appvillagerintegralrule_edit')" @click="changeStatus(row.id, 0)" v-if="row.status == 1"> <el-button type="text" @click="changeStatus(row.id, 0)" v-if="row.status == 1">
停用 停用
</el-button> </el-button>
<el-button type="text" :disabled="!permissions('app_appvillagerintegralrule_edit')" @click="changeStatus(row.id, 1)" v-else>启用</el-button> <el-button type="text" @click="changeStatus(row.id, 1)" v-else>启用</el-button>
<el-button type="text" :disabled="!permissions('app_appvillagerintegralrule_edit')" @click="toEdit(row)">编辑</el-button> <el-button type="text" @click="toEdit(row)">编辑</el-button>
<el-button type="text" :disabled="!permissions('app_appvillagerintegralrule_del')" @click="remove(row.id)">删除</el-button> <el-button type="text" @click="remove(row.id)">删除</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -120,9 +120,8 @@ export default {
{prop: "type", label: "类型", dict: "integralRuleEventType"}, {prop: "type", label: "类型", dict: "integralRuleEventType"},
{prop: "ruleType", label: "规则", dict: "integralRuleRuleType"}, {prop: "ruleType", label: "规则", dict: "integralRuleRuleType"},
{prop: "scoringCycle", label: "周期范围", dict: "integralRuleScoringCycle"}, {prop: "scoringCycle", label: "周期范围", dict: "integralRuleScoringCycle"},
// {prop: "", label: "积分分值", dict: "integralRuleScoringCycle"},
{slot: "integral",label: "积分分值", align: "center"}, {slot: "integral",label: "积分分值", align: "center"},
{prop: "", label: "有效范围", dict: "integralRuleScoringCycle"}, {prop: "validRangeType", label: "有效范围", dict: "integralRuleScoringCycle"},
{prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"}, {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"},
{slot: "options", label: "操作", align: "center"}, {slot: "options", label: "操作", align: "center"},
], ],
@@ -145,7 +144,7 @@ export default {
}, },
methods: { methods: {
getList() { getList() {
this.instance.post(`/app/appvillagerintegralrule/list`, null, { this.instance.post(`/app/appintegralrule/list`, null, {
params: {...this.search, ...this.page}, params: {...this.search, ...this.page},
}).then(res => { }).then(res => {
if (res?.data) { if (res?.data) {
@@ -176,11 +175,9 @@ export default {
this.$confirm("删除后不可恢复，是否要删除该事项？", { this.$confirm("删除后不可恢复，是否要删除该事项？", {
type: 'error' type: 'error'
}).then(() => { }).then(() => {
this.instance this.instance.post(`/app/appintegralrule/delete?ids=${id}`).then((res) => {
.post(`/app/appvillagerintegralrule/delete?ids=${id}`)
.then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.$message.success("删除成功！"); this.$message.success("删除成功！")
this.getList(); this.getList();
} }
}); });
@@ -189,7 +186,7 @@ export default {
changeStatus(id, status) { changeStatus(id, status) {
let text = status == 1 ? '启用' : '停用' let text = status == 1 ? '启用' : '停用'
this.$confirm(`确定${text}该条规则？`).then(() => { this.$confirm(`确定${text}该条规则？`).then(() => {
this.instance.post(`/app/appvillagerintegralrule/enableOrDisable?id=${id}`).then((res) => { this.instance.post(`/app/appintegralrule/enableStatus?id=${id}`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.$message.success(`${text}成功！`) this.$message.success(`${text}成功！`)
this.getList(); this.getList();
@@ -213,7 +210,7 @@ export default {
let formData = this.$copy(this.form) let formData = this.$copy(this.form)
formData.ladderRule = JSON.stringify(formData.ladderRule) formData.ladderRule = JSON.stringify(formData.ladderRule)
formData.integral = formData.integral || 0 formData.integral = formData.integral || 0
this.instance.post(`/app/appvillagerintegralrule/addOrUpdate`, formData).then((res) => { this.instance.post(`/app/appintegralrule/addOrUpdate`, formData).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.$message.success(`${this.isEdit ? '编辑成功' : '添加成功'}`) this.$message.success(`${this.isEdit ? '编辑成功' : '添加成功'}`)
this.onReset() this.onReset()

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

@@ -35,12 +35,18 @@
</div> </div>
<div class="echertsBox"> <div class="echertsBox">
<div class="left_Box"> <div class="left_Box">
<div id="chart1" style="height: 300px; width: 100%;"></div> <p>个人积分排行</p>
<ai-empty v-if="false" style="height: 300px;"></ai-empty> <div>
<div id="chart1" style="height: 300px; width: 100%;" v-show="userSortListX.length && userSortListY.length"></div>
<ai-empty v-show="!userSortListX.length && !userSortListY.length" style="height: 200px; width: 100%;" id="empty"></ai-empty>
</div>
</div> </div>
<div class="right_Box"> <div class="right_Box">
<div id="chart2" style="height: 300px; width: 100%;"></div> <p>网格积分排行</p>
<ai-empty v-if="false" style="height: 300px;"></ai-empty> <div>
<div id="chart2" style="height: 300px; width: 100%;" v-show="girdSortListX.length && girdSortListY.length"></div>
<ai-empty v-show="!girdSortListX.length && !girdSortListY.length" style="height: 200px; width: 100%;" id="empty"></ai-empty>
</div>
</div> </div>
</div> </div>
</el-row> </el-row>
@@ -51,14 +57,16 @@
<ai-search-bar> <ai-search-bar>
<template #left> <template #left>
<el-cascader ref="cascader2" v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small" <el-cascader ref="cascader2" v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small"
:props="defaultProps" :show-all-levels="false" @change="gridChangeOpt"></el-cascader> :props="defaultProps" :show-all-levels="false" clearable @change="gridChangeOpt"></el-cascader>
<!-- <el-date-picker v-model="time" size="small" type="daterange" value-format="yyyy-MM-dd" <ai-select v-model="search.integralType" placeholder="请选择类型" @change="page.current=1, getTableData()"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> :selectList="dict.getDict('integralType')"/>
</el-date-picker> --> <el-date-picker v-model="time" size="small" type="daterange" value-format="yyyy-MM-dd"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="onChange">
</el-date-picker>
</template> </template>
<template #right> <template #right>
<el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.name" clearable <el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.userName" clearable
@clear="page.current = 1, search.name = '', getTableData()" suffix-icon="iconfont iconSearch" @clear="page.current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch"
v-throttle="() => {(page.current = 1), getTableData();}" /> v-throttle="() => {(page.current = 1), getTableData();}" />
</template> </template>
</ai-search-bar> </ai-search-bar>
@@ -121,23 +129,25 @@ export default {
}, },
data() { data() {
return { return {
name: "积分统计",
myChart1: null, myChart1: null,
myChart2: null, myChart2: null,
tableData: [], tableData: [],
search: { search: {
current: 1, current: 1,
name: '', userName: '',
girdId: '' girdId: '',
integralType: '',
startTime: '',
endTime: '',
}, },
page: {current: 1, size: 10,total: 0,}, page: {current: 1, size: 10,total: 0,},
girdList: [], girdList: [],
time: '', time: [],
timeCheck: ['昨日','近7天','近30天','自定义'], timeCheck: ['昨日','近7天','近30天','自定义'],
dialog: false, dialog: false,
dialogDate: false, dialogDate: false,
timeList: '', timeList: [],
type: '0', type: '1',
startTime: '', startTime: '',
endTime: '', endTime: '',
data: {}, data: {},
@@ -147,13 +157,13 @@ export default {
label: 'girdName', label: 'girdName',
value: 'id', value: 'id',
checkStrictly: true, checkStrictly: true,
expandTrigger: 'hover',
}, },
details: {}, details: {},
fileDownLoad: [], fileDownLoad: [],
girdSortList: [], userSortListX: [],
userSortList: [], userSortListY: [],
girdSortListX: [],
girdSortListY: [],
} }
}, },
computed: { computed: {
@@ -163,7 +173,7 @@ export default {
{ prop: "integralUserName", label: '姓名', align: "left", width: "200px" }, { prop: "integralUserName", label: '姓名', align: "left", width: "200px" },
{ prop: "girdName", label: '所属网格', align: "center", width: "180px" }, { prop: "girdName", label: '所属网格', align: "center", width: "180px" },
{ prop: "eventDesc", label: '事件', align: "center",width: "200px" }, { prop: "eventDesc", label: '事件', align: "center",width: "200px" },
{ prop: "integralType", label: '类型', align: "center",width: "200px", dict:"integralDetailType" }, { prop: "integralType", label: '类型', align: "center",width: "200px", dict:"integralType" },
// render: (h, {row}) => { // render: (h, {row}) => {
// return h('span', { // return h('span', {
// style: { // style: {
@@ -179,11 +189,12 @@ export default {
} }
}, },
created() { created() {
this.$dict.load('epidemicDangerousAreaLevel') this.$dict.load('epidemicDangerousAreaLevel','integralType').then(() => {
this.getStatistics() this.getStatistics()
this.getGridList() this.getGridList()
this.getRanking() this.getRanking()
this.getTableData() this.getTableData()
})
}, },
methods: { methods: {
// 统计接口 // 统计接口
@@ -212,9 +223,14 @@ export default {
endTime: this.endTime endTime: this.endTime
} }
}).then((res) => { }).then((res) => {
console.log(res, '积分排行'); if(res?.data) {
this.userSortList = res.data.userSortList this.userSortListX = res.data.userSortList.map(e=> e.userName).reverse()
this.girdSortList = res.data.girdSortList this.userSortListY = res.data.userSortList.map(e=> e.changeIntegral).reverse()
this.girdSortListX = res.data.girdSortList.map(e=> e.girdName).reverse()
this.girdSortListY = res.data.girdSortList.map(e=> e.changeIntegral).reverse()
this.getColEcherts1(this.userSortListX,this.userSortListY)
this.getColEcherts2(this.girdSortListX,this.girdSortListY)
}
}) })
}, },
// 积分明细 // 积分明细
@@ -223,9 +239,6 @@ export default {
params: { params: {
...this.page, ...this.page,
...this.search, ...this.search,
integralType: this.integralType,
startTime: this.startTime,
endTime: this.endTime,
} }
}).then(res => { }).then(res => {
if(res?.data) { if(res?.data) {
@@ -235,21 +248,17 @@ export default {
}) })
}, },
gridChangeOpt() { gridChangeOpt(val) {
this.search.girdId = val?.[val.length - 1] this.search.girdId = val?.[val.length - 1]
this.$refs.cascader2.dropDownVisible = false; this.$refs.cascader2.dropDownVisible = false;
this.getTableData() this.getTableData()
}, },
getColEcherts1() { getColEcherts1(xData,yData) {
let chartDom1 = document.getElementById('chart1'); let chartDom1 = document.getElementById('chart1');
chartDom1.style.width = (window.innerWidth - 435) / 2 + "px"; chartDom1.style.width = (window.innerWidth - 435) / 2 + "px";
this.myChart1 = echarts.init(chartDom1); this.myChart1 = echarts.init(chartDom1);
this.myChart1.setOption({ this.myChart1.setOption({
title: {
text: '个人积分排行'
},
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
@@ -260,7 +269,7 @@ export default {
left: '16px', left: '16px',
right: '28px', right: '28px',
bottom: '14px', bottom: '14px',
top: '50px', top: '16px',
containLabel: true containLabel: true
}, },
xAxis: { xAxis: {
@@ -269,7 +278,7 @@ export default {
}, },
yAxis: { yAxis: {
type: 'category', type: 'category',
data: ['Brazil', 'Indonesia', 'India', 'China', 'World'], data: xData,
axisTick: { axisTick: {
show: false, show: false,
}, },
@@ -280,7 +289,7 @@ export default {
series: [ series: [
{ {
data: [120, 200, 150, 80, 70,], data: yData,
type: 'bar', type: 'bar',
itemStyle: { itemStyle: {
normal: { normal: {
@@ -302,14 +311,11 @@ export default {
}, true); }, true);
window.addEventListener("resize", this.onResize) window.addEventListener("resize", this.onResize)
}, },
getColEcherts2() { getColEcherts2(xData,yData) {
let chartDom2 = document.getElementById('chart2'); let chartDom2 = document.getElementById('chart2');
chartDom2.style.width = (window.innerWidth - 435) / 2 + "px"; chartDom2.style.width = (window.innerWidth - 435) / 2 + "px";
this.myChart2 = echarts.init(chartDom2); this.myChart2 = echarts.init(chartDom2);
this.myChart2.setOption({ this.myChart2.setOption({
title: {
text: '网格积分排行'
},
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
@@ -320,7 +326,7 @@ export default {
left: '16px', left: '16px',
right: '28px', right: '28px',
bottom: '14px', bottom: '14px',
top: '50px', top: '16px',
containLabel: true containLabel: true
}, },
xAxis: { xAxis: {
@@ -329,7 +335,7 @@ export default {
}, },
yAxis: { yAxis: {
type: 'category', type: 'category',
data: ['Brazil', 'Indonesia', 'India', 'China', 'World'], data: xData,
axisTick: { axisTick: {
show: false, show: false,
}, },
@@ -339,7 +345,7 @@ export default {
}, },
series: [ series: [
{ {
data: [120, 200, 150, 80, 70,], data: yData,
type: 'bar', type: 'bar',
itemStyle: { itemStyle: {
normal: { normal: {
@@ -373,7 +379,7 @@ export default {
this.getStatistics() this.getStatistics()
this.getRanking() this.getRanking()
}, },
// 所有网格
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => { this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
@@ -417,6 +423,12 @@ export default {
this.getDetail(id) this.getDetail(id)
}, },
onChange(val) {
this.search.startTime = val?.[0]
this.search.endTime = val?.[1]
this.getTableData()
},
getDetail(id) { getDetail(id) {
this.instance.post(`/app/appintegraldetail/queryDetailById?id=${id}`).then(res=> { this.instance.post(`/app/appintegraldetail/queryDetailById?id=${id}`).then(res=> {
if(res?.data) { if(res?.data) {
@@ -436,6 +448,7 @@ export default {
this.endTime = this.timeList?.[1] this.endTime = this.timeList?.[1]
this.dialogDate = false this.dialogDate = false
this.getStatistics() this.getStatistics()
this.getRanking()
}, },
}, },
@@ -455,7 +468,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.gridScoreStatistics { .gridScoreStatistics {
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
padding-top: 20px; padding-top: 20px;
@@ -540,9 +552,11 @@ export default {
display: flex; display: flex;
.left_Box { .left_Box {
margin-right: 16px; margin-right: 16px;
flex: 1;
} }
.right_Box { .right_Box {
width: 100%; width: 100%;
flex: 1;
} }
.left_Box, .left_Box,
@@ -555,7 +569,10 @@ export default {
#chart1, #chart1,
#chart2 { #chart2 {
width: 100%; width: 100%;
height: 260px; height: 300px;
}
p {
font-weight: 600;
} }
} }
} }

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

@@ -519,7 +519,7 @@
methods: { methods: {
onNodeClick (e) { onNodeClick (e) {
this.getGridInfo(e.id) this.getGridInfo(e)
}, },
getInfo () { getInfo () {

203
project/dv/apps/components/PdGrid.vue
View File

@@ -1,49 +1,104 @@
<template> <template>
<div class="pdgrid"> <div class="pdgrid">
<div class="pdgrid-title"> <div class="pdgrid-title">
<h2>幸福郫都微网实格架构</h2> <h2>{{ currGird }}</h2>
</div> </div>
<div class="pdgrid-grid__title"> <div class="pdgrid-grid__title" @click="isShowGrid2 = true">
<h2>郫都某街道</h2> <h2 :title="girdName2">{{ girdName2 }}</h2>
</div> </div>
<div class="pdgrid-body"> <div class="pdgrid-body">
<div class="pdgrid-body__item"> <div class="pdgrid-body__item" @click="isShowGrid3 = true">
<h2>240</h2> <h2>{{ girdNum3 }}</h2>
<div class="bottom"> <div class="bottom">
<i></i> <i></i>
<p>第一网格</p> <p>{{ girdName3 }}</p>
<i class="right"></i> <i class="right"></i>
</div> </div>
</div> </div>
<div class="pdgrid-body__item" @click.stop="isShowGrid1 = true"> <div class="pdgrid-body__item" @click.stop="isShowGrid4 = true">
<h2>240</h2> <h2>{{ girdNum4 }}</h2>
<div class="bottom"> <div class="bottom">
<i></i> <i></i>
<p>第二网格</p> <p>{{ girdName4 }}</p>
<i class="right"></i> <i class="right"></i>
</div> </div>
</div> </div>
<div class="pdgrid-body__item"> <div class="pdgrid-body__item" @click="isShowGrid5 = true">
<h2>240</h2> <h2>{{ girdNum5 }}</h2>
<div class="bottom"> <div class="bottom">
<i></i> <i></i>
<p>微网格</p> <p>{{ girdName5 }}</p>
<i class="right"></i> <i class="right"></i>
</div> </div>
</div> </div>
</div> </div>
<transition name="fade"> <transition name="fade">
<div class="grid-dialog" v-show="isShowGrid1"> <div class="grid-dialog" v-show="isShowGrid2">
<div class="mask" @click="isShowGrid1 = false"></div> <div class="mask" @click="isShowGrid2 = false"></div>
<div class="grid-container"> <div class="grid-container">
<h2>已选择的网格</h2> <h2>{{ girdName2 }}</h2>
<div class="grid-list"> <div class="grid-list">
<div <div
:class="[currIndex1 === index ? 'grid-active' : '']" :class="[currIndex2 === index ? 'grid-active' : '']"
v-for="(item, index) in 20" v-for="(item, index) in girdInfoList2"
:key="index" :key="index"
@click.stop="currIndex1 = index"> :title="item.girdName"
幸福郫都微网实格架构 @click.stop="onGrid2Click(item, index)">
{{ item.girdName }}
</div>
</div>
</div>
</div>
</transition>
<transition name="fade">
<div class="grid-dialog" v-show="isShowGrid3">
<div class="mask" @click="isShowGrid3 = false"></div>
<div class="grid-container">
<h2>{{ girdName3 }}</h2>
<div class="grid-list">
<div
:class="[currIndex3 === index ? 'grid-active' : '']"
v-for="(item, index) in girdInfoList3"
:key="index"
:title="item.girdName"
@click.stop="onGrid3Click(item, index)">
{{ item.girdName }}
</div>
</div>
</div>
</div>
</transition>
<transition name="fade">
<div class="grid-dialog" v-show="isShowGrid4">
<div class="mask" @click="isShowGrid4 = false"></div>
<div class="grid-container">
<h2>{{ girdName4 }}</h2>
<div class="grid-list">
<div
:class="[currIndex4 === index ? 'grid-active' : '']"
v-for="(item, index) in girdInfoList4"
:key="index"
:title="item.girdName"
@click.stop="onGrid4Click(item, index)">
{{ item.girdName }}
</div>
</div>
</div>
</div>
</transition>
<transition name="fade">
<div class="grid-dialog" v-show="isShowGrid5">
<div class="mask" @click="isShowGrid5 = false"></div>
<div class="grid-container">
<h2>{{ girdName5 }}</h2>
<div class="grid-list">
<div
:class="[currIndex5 === index ? 'grid-active' : '']"
v-for="(item, index) in girdInfoList5"
:key="index"
:title="item.girdName"
@click.stop="onGrid5Click(item, index)">
{{ item.girdName }}
</div> </div>
</div> </div>
</div> </div>
@@ -56,10 +111,30 @@
export default { export default {
name: 'pdgrid', name: 'pdgrid',
props: ['instance'],
data () { data () {
return { return {
isShowGrid1: false, isShowGrid2: false,
currIndex1: 0 isShowGrid3: false,
isShowGrid4: false,
isShowGrid5: false,
currIndex2: 0,
currIndex3: 0,
currIndex4: 0,
currIndex5: 0,
girdInfoList2: [],
girdInfoList3: [],
girdInfoList4: [],
girdInfoList5: [],
girdName2: '',
girdName3: '',
girdName4: '',
girdName5: '',
girdNum3: 0,
girdNum4: 0,
girdNum5: 0,
currGird: ''
} }
}, },
@@ -67,6 +142,8 @@
this.$nextTick(() => { this.$nextTick(() => {
document.addEventListener('keydown', this.onKeyDown) document.addEventListener('keydown', this.onKeyDown)
}) })
this.getInfo()
}, },
destroyed () { destroyed () {
@@ -78,6 +155,79 @@
if (e.keyCode == 27) { if (e.keyCode == 27) {
this.isShowGrid1 = false this.isShowGrid1 = false
} }
},
onGrid2Click (item, index) {
this.currIndex2 = index
this.girdName2 = item.girdName
this.currIndex3 = -1
this.currIndex4 = -1
this.currIndex5 = -1
this.isShowGrid2 = false
this.$emit('nodeClick', item.id)
this.currGird = item.girdName
this.getInfo(item.id)
},
onGrid3Click (item, index) {
this.currIndex3 = index
this.girdName3 = item.girdName
this.currIndex4 = -1
this.currIndex5 = -1
this.girdNum3 = 1
this.isShowGrid3 = false
this.$emit('nodeClick', item.id)
this.currGird = item.girdName
this.getInfo(item.id)
},
onGrid4Click (item, index) {
this.currIndex4 = index
this.girdName4 = item.girdName
this.currIndex5 = -1
this.girdNum4 = 1
this.isShowGrid4 = false
this.$emit('nodeClick', item.id)
this.currGird = item.girdName
this.getInfo(item.id)
},
onGrid5Click (item, index) {
this.currIndex5 = index
this.girdName5 = item.girdName
this.isShowGrid5 = false
this.girdNum5 = 1
this.$emit('nodeClick', item.id)
this.currGird = item.girdName
this.getInfo(item.id)
},
getInfo (id) {
this.instance.post(`/app/appgirdinfo/queryPdDetailByGirdId?id=${id || ''}`).then(res => {
if (res.code === 0) {
res.data.girdInfoList2 && (this.girdInfoList2 = res.data.girdInfoList2)
res.data.girdInfoList3 && (this.girdInfoList3 = res.data.girdInfoList3)
res.data.girdInfoList4 && (this.girdInfoList4 = res.data.girdInfoList4)
res.data.girdInfoList5 && (this.girdInfoList5 = res.data.girdInfoList5)
res.data.girdName2 && (this.girdName2 = res.data.girdName2)
res.data.girdName3 && (this.girdName3 = res.data.girdName3)
res.data.girdName4 && (this.girdName4 = res.data.girdName4)
res.data.girdName5 && (this.girdName5 = res.data.girdName5)
res.data.girdNum3 && (this.girdNum3 = res.data.girdNum3)
res.data.girdNum4 && (this.girdNum4 = res.data.girdNum4)
res.data.girdNum5 && (this.girdNum5 = res.data.girdNum5)
if (!id) {
this.currGird = res.data.girdName2
this.currIndex2 = res.data.girdInfoList2.findIndex(v => res.data.girdName2 === v.girdName)
}
}
})
} }
} }
} }
@@ -123,6 +273,11 @@
} }
h2 { h2 {
width: 182px;
margin: 0 auto;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #FFFFFF; color: #FFFFFF;
font-size: 21px; font-size: 21px;
text-shadow: 0px 0px 13px rgb(59 182 255 / 80%); text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
@@ -251,7 +406,7 @@
z-index: 1; z-index: 1;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(0, 0, 0, 0.4); background: rgba(0, 0, 0, 0.5);
} }
.grid-container { .grid-container {
@@ -286,10 +441,14 @@
& > div { & > div {
height: 67px; height: 67px;
line-height: 67px; line-height: 67px;
padding: 0 20px;
text-align: center; text-align: center;
color: #FFFFFF; color: #FFFFFF;
font-size: 27px; font-size: 27px;
cursor: pointer; cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
transition: all ease 0.5s; transition: all ease 0.5s;
&.grid-active { &.grid-active {