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

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2022-05-05 18:00:31 +08:00
parent a0c2bf8f67 bd2b066e9a
commit 84954bcc84
9 changed files with 338 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/sass/apps/AppCommunityManage/components/Add.vue
View File

@@ -123,7 +123,7 @@ export default {
methods: { methods: {
beforeSelectTree() { beforeSelectTree() {
this.treeObj.checkedKeys = []; this.treeObj.checkedKeys = [];
this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.form.girdInfoList.length) { if (this.form.girdInfoList.length) {

2
project/sass/apps/AppSpecialAdjustment/components/Add.vue
View File

@@ -315,7 +315,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

2
project/sass/apps/AppSpecialDisabled/components/Add.vue
View File

@@ -325,7 +325,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

2
project/sass/apps/AppSpecialDrug/components/Add.vue
View File

@@ -324,7 +324,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

2
project/sass/apps/AppSpecialMental/components/Add.vue
View File

@@ -316,7 +316,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

2
project/sass/apps/AppSpecialPrison/components/Add.vue
View File

@@ -335,7 +335,7 @@ export default {
}, },
getGridList() { getGridList() {
this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = this.format(res.data) this.treeObj.treeList = this.format(res.data)
if (this.formData.girdId) { if (this.formData.girdId) {

13
project/sass/apps/grid/AppGridBlock/components/list.vue
View File

@@ -5,7 +5,7 @@
<ai-title title="网格区块" :isShowBottomBorder="true"></ai-title> <ai-title title="网格区块" :isShowBottomBorder="true"></ai-title>
</template> </template>
<template slot="left"> <template slot="left">
<ai-tree-menu title="网格层级" @search="(v) => $refs.tree.filter(v)"> <ai-tree-menu title="网格层级" @search="v=> $refs.tree.filter(v)">
<el-tree <el-tree
:data="treeObj.treeList" :data="treeObj.treeList"
:props="treeObj.defaultProps" :props="treeObj.defaultProps"
@@ -14,8 +14,13 @@
ref="tree" ref="tree"
:filter-node-method="filterNode" :filter-node-method="filterNode"
default-expand-all default-expand-all
highlight-current highlight-current>
/> <template slot-scope="{node,data}">
<el-tooltip placement="right" :content="node.label">
<div v-text="node.label"/>
</el-tooltip>
</template>
</el-tree>
</ai-tree-menu> </ai-tree-menu>
</template> </template>
<template slot="content"> <template slot="content">
@@ -608,7 +613,7 @@ export default {
background: #2266FF; background: #2266FF;
span { .el-tooltip {
color: #fff; color: #fff;
} }
} }

17
project/sass/apps/grid/AppGridMap/components/list.vue
View File

@@ -22,8 +22,11 @@
:filter-node-method="filterNode" :filter-node-method="filterNode"
default-expand-all default-expand-all
highlight-current> highlight-current>
<template slot-scope="{ node, data }">
<span class="custom-tree-node" :title="node.label" style="" slot-scope="{ node, data }">{{ node.label }}</span> <el-tooltip effect="light" :content="node.label" placement="right">
<div v-text="node.label"/>
</el-tooltip>
</template>
</el-tree> </el-tree>
</div> </div>
</div> </div>
@@ -100,9 +103,9 @@
return data.girdName.indexOf(value) !== -1; return data.girdName.indexOf(value) !== -1;
}, },
getTreeList() { getTreeList() {
return this.instance.post(`/app/appgirdinfo/listAll`).then((res) => { return this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = res.data; this.treeObj.treeList = [res.data];
this.$nextTick(() => { this.$nextTick(() => {
res.data.length && this.$refs.tree.setCurrentKey(res.data[0].id) res.data.length && this.$refs.tree.setCurrentKey(res.data[0].id)
@@ -374,7 +377,7 @@
} }
::v-deep .is-current { ::v-deep .is-current {
& > .el-tree-node__content > .custom-tree-node { & > .el-tree-node__content > .el-tooltip {
color: #5088ff; color: #5088ff;
} }
} }
@@ -576,7 +579,7 @@
background: #333c53; background: #333c53;
} }
.el-tree-node__label { .el-tooltip {
color: #fff; color: #fff;
} }
@@ -585,7 +588,7 @@
} }
.is-current > .el-tree-node__content { .is-current > .el-tree-node__content {
.el-tree-node__label { .el-tooltip {
color: #5088ff; color: #5088ff;
} }
} }

14
project/sass/apps/grid/AppGridMember/components/add.vue
View File

@@ -401,7 +401,7 @@ export default {
}, },
beforeSelectTree() { beforeSelectTree() {
this.treeObj.checkedKeys = []; this.treeObj.checkedKeys = [];
this.instance.post(`/app/appgirdinfo/listAll`, null, null).then((res) => { this.instance.post(`/app/appgirdinfo/listAllByTop`, null, null).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.treeObj.treeList = res.data; this.treeObj.treeList = res.data;
this.forms.girdInfoList.map((e) => { this.forms.girdInfoList.map((e) => {
@@ -426,13 +426,13 @@ export default {
return this.$message.error('请选择网格') return this.$message.error('请选择网格')
} }
if (currInfo.checkType === '1' && currInfo.girdLevel !== '2') { // if (currInfo.checkType === '1' && currInfo.girdLevel !== '2') {
return this.$message.error(`一级、二级网格不能添加网格员`) // return this.$message.error(`一级、二级网格不能添加网格员`)
} // }
if (sameInfo.length) { // if (sameInfo.length) {
return this.$message.error('不能选择同一网格重复绑定') // return this.$message.error('不能选择同一网格重复绑定')
} // }
} }
this.instance.post(`/app/appgirdmemberinfo/addOrUpdate`,{ this.instance.post(`/app/appgirdmemberinfo/addOrUpdate`,{