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
This commit is contained in:
aixianling
2022-08-15 13:51:24 +08:00
parent 4e1cf8a814 fc7f522524
commit 84299df63e
4 changed files with 100 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,18 +19,18 @@
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="current" :size.sync="page.size"
@getList="getTableData()" :col-configs="colConfigs" :dict="dict">
<el-table-column slot="integral" label="积分余额" align="center" :sortable="'custom'">
@getList="getTableData()" :col-configs="colConfigs" :dict="dict" @sort-change="changeTableSort">
<el-table-column slot="integral" label="积分余额" align="center" prop="integral" :sortable="'custom'">
<template slot-scope="{ row }">
<span>{{ row.integral }}</span>
</template>
</el-table-column>
<el-table-column slot="totalIntegral" label="累计积分" align="center" :sortable="'custom'">
<el-table-column slot="totalIntegral" label="累计积分" align="center" prop="totalIntegral" :sortable="'custom'">
<template slot-scope="{ row }">
<span>{{ row.totalIntegral }}</span>
</template>
</el-table-column>
<el-table-column slot="usedIntegral" label="已用积分" align="center" :sortable="'custom'">
<el-table-column slot="usedIntegral" label="已用积分" align="center" prop="usedIntegral" :sortable="'custom'">
<template slot-scope="{ row }">
<span>{{ row.usedIntegral }}</span>
</template>
@@ -153,7 +153,8 @@ export default {
params: {
...this.page,
...this.search,
current: this.current
current: this.current,
}
}).then(res => {
if(res?.data) {
@@ -209,6 +210,24 @@ export default {
this.getTableData()
},
changeTableSort(col) {
// console.log(col);
if(col.prop === 'integral') { // 剩余积分
// col.order === 'ascending' &&
// col.order === 'descending' &&
// col.order === null &&
} else if(col.prop === 'totalIntegral') { // 累计积分
// col.order === 'ascending' &&
// col.order === 'descending' &&
// col.order === null &&
} else if(col.prop === 'usedIntegral') { // 已用积分
// col.order === 'ascending' &&
// col.order === 'descending' &&
// col.order === null &&
}
// this.getTableData()
},
onConfirm() {
if(this.form.file?.length) {
this.form.enclosure = this.form.file[0].url

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

@@ -6,77 +6,26 @@
<template slot="content">
<ai-search-bar>
<template #left>
<el-button
type="primary"
icon="iconfont iconAdd"
@click="dialog = true"
>添加</el-button
>
<el-cascader
size="small"
v-model="search.systemRuleId"
:options="rulesOps"
placeholder="请选择事件/类型"
clearable
:props="rulesProps"
@change="handleTypeSearch"
ref="eventTypeSearch"
/>
<ai-select
v-model="search.status"
@change="(page.current = 1), getList()"
placeholder="请选择状态"
:selectList="$dict.getDict('integralRuleStatus')"
>
<el-button type="primary" icon="iconfont iconAdd" @click="dialog = true" >添加</el-button>
<el-cascader size="small" v-model="search.systemRuleId" :options="rulesOps" placeholder="请选择事件/类型" clearable :props="rulesProps" @change="handleTypeSearch" ref="eventTypeSearch"/>
<ai-select v-model="search.status" @change="(page.current = 1), getList()" placeholder="请选择状态" :selectList="$dict.getDict('integralRuleStatus')">
</ai-select>
</template>
</ai-search-bar>
<ai-table
:tableData="tableData"
:col-configs="colConfigs"
:total="page.total"
:dict="dict"
:current.sync="page.current"
:size.sync="page.size"
@getList="getList()"
>
<ai-table :tableData="tableData" :col-configs="colConfigs" :total="page.total" :dict="dict" :current.sync="page.current" :size.sync="page.size" @getList="getList()">
<el-table-column slot="integral" label="分值" align="center">
<template slot-scope="{ row }">
<span v-if="row.integralValueType == 1">
{{
row.integralStart > 0
? "+" + row.integralStart
: row.integralStart
}}
~
{{
row.integralEnd > 0 ? "+" + row.integralEnd : row.integralEnd
}}
{{row.integralStart > 0? "+" + row.integralStart : row.integralStart}}~{{row.integralEnd > 0 ? "+" + row.integralEnd : row.integralEnd}}
</span>
<span v-else
>{{ row.integral > 0 ? "+" : "" }}{{ row.integral }}</span
>
<span v-else>{{ row.integral > 0 ? "+" : "" }}{{ row.integral }}</span>
</template>
</el-table-column>
<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 }">
<div class="table-options">
<el-button
type="text"
@click="changeStatus(row.id, 0)"
v-if="row.status == 1"
>
停用
</el-button>
<el-button type="text" @click="changeStatus(row.id, 1)" v-else
>启用</el-button
>
<el-button type="text" @click="changeStatus(row.id, 0)" v-if="row.status == 1">停用</el-button>
<el-button type="text" @click="changeStatus(row.id, 1)" v-else>启用</el-button>
<el-button type="text" @click="toEdit(row)">编辑</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button>
</div>
@@ -86,40 +35,15 @@
</template>
</ai-list>
<!-- <ai-empty v-else>暂无应用权限</ai-empty> -->
<ai-dialog
:title="dialogTitle"
:visible.sync="dialog"
@onConfirm="onConfirm"
@closed="closed"
width="900px"
>
<ai-dialog :title="dialogTitle" :visible.sync="dialog" @onConfirm="onConfirm" @closed="closed" width="900px">
<div class="form_div">
<el-form
ref="DialogForm"
:model="form"
:rules="formRules"
size="small"
label-suffix="："
label-width="150px"
>
<el-form ref="DialogForm" :model="form" :rules="formRules" size="small" label-suffix="：" label-width="150px" >
<el-form-item label="事件类型" prop="systemRuleId">
<el-cascader
v-model="form.systemRuleId"
ref="cascaderArr"
:props="etOps"
clearable
placeholder="请选择"
@change="handleTypeForm"
:options="rulesOps"
/>
<el-cascader v-model="form.systemRuleId" ref="cascaderArr" :props="etOps" clearable placeholder="请选择" @change="handleTypeForm" :options="rulesOps"/>
</el-form-item>
<el-form-item label="自定义事件" v-if="form.systemRuleId == '自定义'">
<el-input
placeholder="请输入,周期范围内,不填写表示不限制"
v-model="form.ruleName"
clearable
/>
<el-input placeholder="请输入,周期范围内,不填写表示不限制" v-model="form.ruleName" clearable/>
</el-form-item>
<el-form-item label="规则">
@@ -154,18 +78,11 @@
</el-form-item> -->
<el-form-item label="周期范围" prop="scoringCycle">
<ai-select
v-model="form.scoringCycle"
:selectList="$dict.getDict('integralRuleScoringCycle')"
/>
<ai-select v-model="form.scoringCycle" :selectList="$dict.getDict('integralRuleScoringCycle')"/>
</el-form-item>
<el-form-item label="奖励次数">
<el-input
placeholder="请输入,周期范围内,不填写表示不限制"
v-model.number="form.numberLimit"
clearable
/>
<el-input placeholder="请输入,周期范围内,不填写表示不限制" v-model.number="form.numberLimit" clearable/>
</el-form-item>
<el-form-item label="积分分值" prop="integral">
@@ -179,50 +96,19 @@
</el-radio-group>
</el-form-item>
<el-form-item
label="生效网格"
:prop="form.validRangeType == 1 ? 'validRangeData' : ''"
:rules="[
{ required: true, message: '请选择生效网格', trigger: 'change' },
]"
v-if="form.validRangeType == 1"
>
<el-button
type="text"
@click="(showGrid = true), beforeSelectTree()"
>{{ girdInfoList.length ? "已选择" : "请选择" }}</el-button
>
<el-form-item label="生效网格" :prop="form.validRangeType == 1 ? 'validRangeData' : ''" :rules="[{ required: true, message: '请选择生效网格', trigger: 'change' }, ]" v-if="form.validRangeType == 1">
<el-button type="text" @click="(showGrid = true), beforeSelectTree()" >{{ girdInfoList.length ? "已选择" : "请选择" }}</el-button>
</el-form-item>
</el-form>
</div>
<ai-dialog
title="选择网格"
:visible.sync="showGrid"
:customFooter="true"
:destroyOnClose="true"
border
width="720px"
append-to-body
>
<ai-dialog title="选择网格" :visible.sync="showGrid" :customFooter="true" :destroyOnClose="true" border width="720px" append-to-body>
<div class="grid">
<el-tree
:data="treeObj.treeList"
:props="treeObj.defaultProps"
node-key="id"
ref="tree"
:check-strictly="true"
show-checkbox
default-expand-all
:default-checked-keys="currCheckedKeys"
@check="onCheckChange"
>
<el-tree :data="treeObj.treeList" :props="treeObj.defaultProps" node-key="id" ref="tree" :check-strictly="true" show-checkbox default-expand-all :default-checked-keys="currCheckedKeys" @check="onCheckChange">
</el-tree>
</div>
<div class="dialog-footer" slot="footer">
<el-button size="medium" @click="showGrid = false">取消</el-button>
<el-button type="primary" size="medium" @click="getCheckedTree()"
>确认</el-button
>
<el-button type="primary" size="medium" @click="getCheckedTree()">确认</el-button>
</div>
</ai-dialog>
</ai-dialog>
@@ -243,6 +129,7 @@ export default {
search: {
status: "",
systemRuleId: "",
ruleName: ""
},
page: { current: 1, size: 10, total: 0 },
colConfigs: [
@@ -336,15 +223,7 @@ export default {
};
},
created() {
this.$dict
.load(
"integralRuleStatus",
"integralRuleRuleType",
"integralRuleScoringCycle",
"integralRuleEvent",
"integralRuleEventType"
)
.then(() => {
this.$dict.load("integralRuleStatus","integralRuleRuleType","integralRuleScoringCycle","integralRuleEvent","integralRuleEventType").then(() => {
this.getList();
this.getRulesList();
this.beforeSelectTree();
@@ -379,7 +258,14 @@ export default {
};
},
toEdit(row) {
this.form = this.$copy(row);
this.form = {...row}
// let arr = this.form?.validRangeData?.split(",");
// this.girdInfoList = arr.map(e=> {
// return {
// id: e,
// checkType: true
// }
// })
this.girdInfoList = this.form?.validRangeData?.split(",");
this.$nextTick(() => {
this.dialog = true;
@@ -446,6 +332,7 @@ export default {
},
handleTypeSearch(v) {
this.search.systemRuleId = v?.[v.length - 1];
this.search.ruleName = this.$refs.eventTypeSearch.getCheckedNodes()[0]?.label
this.page.current = 1;
this.$refs.eventTypeSearch.dropDownVisible = false;
this.getList();
@@ -523,7 +410,7 @@ export default {
if (!this.$refs.tree.getCheckedNodes().length) {
return this.$message.error("请选择网格");
}
console.log(this.girdInfoList, this.$refs.tree.getCheckedNodes());
// console.log(this.girdInfoList, this.$refs.tree.getCheckedNodes());
this.girdInfoList = this.$refs.tree.getCheckedNodes().map((item) => {
return { ...item, checkType: true };
});
@@ -544,14 +431,13 @@ export default {
.post(`/app/appgirdinfo/listAll3`, null, null)
.then((res) => {
if (res.code == 0) {
// res.data.forEach((item)=>{
// const isChecked= this.girdInfoList.find((checkedId)=>{
// return item.id===checkedId
// })
// if(isChecked) item.checkType=true
// })
// console.log(res.data)
res.data.forEach((item)=>{
const isChecked = this.girdInfoList.find((checkedId)=>{
return item.id === checkedId
})
if(isChecked) item.checkType = true
})
console.log(res.data)
this.treeObj.treeList = this.girdToTree(res.data);
this.girdInfoList.map((e) => {
@@ -560,7 +446,7 @@ export default {
this.$nextTick(() => {
this.currCheckedKeys = this.girdInfoList;
this.$nextTick(() => {
this.$refs.tree?.setCheckedKeys(this.currCheckedKeys);
this.$refs.tree?.getCheckedKeys(this.currCheckedKeys);
});
});
}
@@ -568,6 +454,13 @@ export default {
},
onCheckChange(e) {
// this.$nextTick(() => {
// this.$refs.tree.getCheckedKeys().forEach(v => {
// this.$refs.tree.setChecked(v, false)
// })
// this.$refs.tree.setChecked(e.id, true)
// })
// console.log(e);
this.$refs.tree.setChecked(e.id, true);
},
},
@@ -584,12 +477,6 @@ export default {
label: "ruleName",
};
},
// currCheckedKeys() {
// if (this.girdInfoList) {
// return this.girdInfoList
// }
// return []
// },
},
};
</script>

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

@@ -9,7 +9,7 @@
@click="timeChange(index)">{{ item }}</span>
</div>
<el-cascader ref="cascader1" v-model="girdId" :options="girdOptions" placeholder="所属网格" size="small"
:props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
:props="defaultProps" :show-all-levels="false" @change="gridChange" clearable></el-cascader>
</div>
</div>
<div class="card_list">
@@ -97,7 +97,7 @@
<ai-info-item label="积分变动">{{ details.integralCalcType==0? '-' : '+' }}{{ details.changeIntegral }}</ai-info-item>
<ai-info-item label="积分余额" :value="details.nowIntegral"/>
<ai-info-item label="凭证" isLine v-if="fileDownLoad.length">
<ai-file-list :fileList="fileDownLoad" style="width: 200px;"></ai-file-list>
<ai-file-list :fileList="fileDownLoad" style="width: 200px;" :fileOps="fileOps"></ai-file-list>
</ai-info-item>
</ai-wrapper>
</template>
@@ -141,7 +141,6 @@ export default {
endTime: '',
},
page: {
size: 10,
total: 0,
},
@@ -167,10 +166,11 @@ export default {
fileDownLoad: [],
userSortListX: [],
userSortListY: [],
girdSortListX: [
],
girdSortListX: [],
girdSortListY: [],
fileOps: {
name: ''
},
}
},
computed: {
@@ -227,50 +227,12 @@ export default {
this.userSortListX = res.data.userSortList.map(e=> e.userName).reverse()
this.userSortListY = res.data.userSortList.map(e=> e.changeIntegral).reverse()
this.girdSortListX = res.data.girdSortList.map(e=> e.girdName).reverse()
// this.girdSortListX = ['好家伙规定非官方多喝点黑胡椒发布会','好好发挥或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或']
this.girdSortListY = res.data.girdSortList.map(e=> e.changeIntegral).reverse()
this.getColEcherts1(this.userSortListX,this.userSortListY)
this.getColEcherts2(this.girdSortListX,this.girdSortListY)
}
})
},
// extension(chart){
// //判断是否创建过div框,如果创建过就不再创建了
// //该div用来盛放文本显示内容的，方便对其悬浮位置进行处理
// var id = document.getElementById("extension");
// if(!id) {
// var div = "<div id = 'extension' sytle=\"display:block\"></div>";
// document.documentElement.append(div);
// }
// chart.on('mouseover', function(params) {
// //注意这里，我是以Y轴显示内容过长为例，如果是x轴的话，需要改为xAxis
// if(params.componentType == "xAxis") {
// //设置悬浮文本的位置以及样式
// document.getElementById('extension').style.className = "chartCss"
// // ({
// // "position": "absolute",
// // "color": "black",
// // "background":"white",
// // "font-family": "Arial",
// // "font-size": "12px",
// // "padding": "5px",
// // "display": "inline"
// // })
// // .text(params.value);
// document.documentElement.mousemove(function(event) {
// var xx = event.pageX - 10;
// var yy = event.pageY + 15;
// document.getElementById('extension').css('top', yy).style('left', xx);
// });
// }
// });
// chart.on('mouseout', function(params) {
// //注意这里，我是以Y轴显示内容过长为例，如果是x轴的话，需要改为xAxis
// if(params.componentType == "yAxis") {
// document.getElementById('extension').style('display', 'none');
// }
// });
// },
// 积分明细
getTableData() {
this.instance.post('/app/appintegraluser/girdIntegralDetail',null,{
@@ -489,6 +451,8 @@ export default {
this.details = res.data
if(res.data.enclosure) {
this.fileDownLoad = [{ url:res.data.enclosure }]
let str = res.data.enclosure.split('/')
this.fileOps.name = str?.[str.length - 1]
}
}
})
@@ -632,15 +596,15 @@ export default {
}
}
.chartCss {
position: absolute;
color: black;
background:white;
font-family: Aril;
font-size: 12px;
padding: 5px;
display: inline;
}
// .chartCss {
// position: absolute;
// color: black;
// background:white;
// font-family: Aril;
// font-size: 12px;
// padding: 5px;
// display: inline;
// }
::v-deep .el-dialog__footer {
text-align: center;

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

@@ -36,7 +36,7 @@
<div class="grid-dialog" v-show="isShowGrid2">
<div class="mask" @click="isShowGrid2 = false"></div>
<div class="grid-container">
<h2>{{ girdName2 }}</h2>
<h2 :title="girdName2">{{ girdName2 }}</h2>
<div class="grid-list">
<div
:class="[currIndex2 === index ? 'grid-active' : '']"
@@ -54,7 +54,7 @@
<div class="grid-dialog" v-show="isShowGrid3">
<div class="mask" @click="isShowGrid3 = false"></div>
<div class="grid-container">
<h2>{{ girdName3 }}</h2>
<h2 :title="girdName3">{{ girdName3 }}</h2>
<div class="grid-list">
<div
:class="[currIndex3 === index ? 'grid-active' : '']"
@@ -72,7 +72,7 @@
<div class="grid-dialog" v-show="isShowGrid4">
<div class="mask" @click="isShowGrid4 = false"></div>
<div class="grid-container">
<h2>{{ girdName4 }}</h2>
<h2 :title="girdName4">{{ girdName4 }}</h2>
<div class="grid-list">
<div
:class="[currIndex4 === index ? 'grid-active' : '']"
@@ -90,7 +90,7 @@
<div class="grid-dialog" v-show="isShowGrid5">
<div class="mask" @click="isShowGrid5 = false"></div>
<div class="grid-container">
<h2>{{ girdName5 }}</h2>
<h2 :title="girdName5">{{ girdName5 }}</h2>
<div class="grid-list">
<div
:class="[currIndex5 === index ? 'grid-active' : '']"
@@ -299,7 +299,7 @@
position: absolute;
top: 200px;
left: 50%;
width: 640px;
min-width: 640px;
height: 80px;
line-height: 80px;
text-align: center;
@@ -309,7 +309,8 @@
h2 {
color: #FFFFFF;
font-size: 32px;
font-size: 22px;
white-space: nowrap;
text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
background: #fff;
-webkit-background-clip: text;
@@ -434,9 +435,13 @@
width: 100%;
height: 67px;
line-height: 67px;
padding: 0 20px;
text-align: center;
color: #FFFFFF;
font-size: 27px;
font-size: 24px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/grid-title-bg.png) no-repeat center;
background-size: 100% 100%;