Commit 35808b6e by 吕海涛

围栏相关

parent 1dc7c8b2
...@@ -3081,6 +3081,11 @@ ...@@ -3081,6 +3081,11 @@
"integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==", "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
"dev": true "dev": true
}, },
"china-area-data": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/china-area-data/-/china-area-data-5.0.1.tgz",
"integrity": "sha512-BQDPpiv5Nn+018ekcJK2oSD9PAD+E1bvXB0wgabc//dFVS/KvRqCgg0QOEUt3vBkx9XzB5a9BmkJCEZDBxVjVw=="
},
"chokidar": { "chokidar": {
"version": "3.5.1", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
...@@ -4659,6 +4664,15 @@ ...@@ -4659,6 +4664,15 @@
"integrity": "sha512-8mFfiAesXdEdE0DhkMKO7W9U6VU/9T3VTWwZ+4g84/YMP4kgwgFtQgUxuu7FUMcvSeKSNhFQNU+WZ68BQTLT5A==", "integrity": "sha512-8mFfiAesXdEdE0DhkMKO7W9U6VU/9T3VTWwZ+4g84/YMP4kgwgFtQgUxuu7FUMcvSeKSNhFQNU+WZ68BQTLT5A==",
"dev": true "dev": true
}, },
"element-china-area-data": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/element-china-area-data/-/element-china-area-data-5.0.2.tgz",
"integrity": "sha512-vLQuvOKJy/uiX7MRHEk3x/j09hipuIl6DJ/C4XFUG7D7Pj3O47sy+Y6aAArM6k9v8cD9UX6e+yz2S4J+IPnZ8g==",
"requires": {
"china-area-data": "^5.0.1",
"lodash-es": "^4.17.15"
}
},
"element-ui": { "element-ui": {
"version": "2.15.1", "version": "2.15.1",
"resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.1.tgz", "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.1.tgz",
...@@ -7543,6 +7557,11 @@ ...@@ -7543,6 +7557,11 @@
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true "dev": true
}, },
"lodash-es": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
},
"lodash.debounce": { "lodash.debounce": {
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"axios": "^0.21.1", "axios": "^0.21.1",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"echarts": "^4.8.0", "echarts": "^4.8.0",
"element-china-area-data": "^5.0.2",
"element-ui": "^2.15.1", "element-ui": "^2.15.1",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"screenfull": "^5.0.0", "screenfull": "^5.0.0",
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<div> <div>
<span> 自定义分组 </span> <span> 自定义分组 </span>
<div> <div>
<div <div
class="text itemlist" class="text itemlist"
v-for="(items, indexs) in departmentdatas[0].children" v-for="(items, indexs) in departmentdatas[0].children"
...@@ -126,6 +127,9 @@ ...@@ -126,6 +127,9 @@
header-align="center" header-align="center"
align="center" align="center"
> >
<template slot-scope="scope">
<span>{{ scope.row.deptName || '/' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="phoneNumber" prop="phoneNumber"
...@@ -849,6 +853,7 @@ export default { ...@@ -849,6 +853,7 @@ export default {
this.departmentdata = table; this.departmentdata = table;
this.departmentdatas = []; this.departmentdatas = [];
organizationsInfo({}, this.parentid).then((res) => { organizationsInfo({}, this.parentid).then((res) => {
if (res.status == 200) { if (res.status == 200) {
if (res.data.orgForShort != null) { if (res.data.orgForShort != null) {
...@@ -864,7 +869,7 @@ export default { ...@@ -864,7 +869,7 @@ export default {
children: this.departmentdata, children: this.departmentdata,
}); });
} }
console.log(JSON.stringify(this.departmentdatas));
} }
}); });
}); });
...@@ -887,12 +892,9 @@ export default { ...@@ -887,12 +892,9 @@ export default {
getData(billState, page, month, rowss, sort) { getData(billState, page, month, rowss, sort) {
organizationsauditType({}, this.parentid, page, rowss).then((res) => { organizationsauditType({}, this.parentid, page, rowss).then((res) => {
if (res.status == 200) { if (res.status == 200) {
this.total = res.data.counts; this.total = res.data.counts;
this.alllength = res.data.counts; this.alllength = res.data.counts;
this.tableData = res.data.result; this.tableData = res.data.result;
console.log(res.data.result)
console.log("________")
} }
}); });
}, },
......
...@@ -823,9 +823,7 @@ export default { ...@@ -823,9 +823,7 @@ export default {
margin-right: 10px; margin-right: 10px;
} }
} }
.el-card__body {
padding: 0;
}
.footer { .footer {
margin-left: 40px; margin-left: 40px;
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment