Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
f79f1525 by 任超
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents 0a11bd7f 90e3f601
Inline Side-by-side
Showing 21 changed files with 354 additions and 308 deletions
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
3 </template> 3 </template>
4 4
5 <script> 5 <script>
6 import Chart from "./Chart"; 6 import Chart from "./Chart";
7 import work from "@/api/work"; 7 import work from "@/api/work";
8 export default { 8 export default {
9 data() { 9 data () {
10 return { 10 return {
11 cdata: { 11 cdata: {
12 category: [], 12 category: [],
...@@ -18,14 +18,14 @@ export default { ...@@ -18,14 +18,14 @@ export default {
18 components: { 18 components: {
19 Chart, 19 Chart,
20 }, 20 },
21 mounted() { 21 mounted () {
22 window.addEventListener("resize", () => { 22 window.addEventListener("resize", () => {
23 this.submitViews(); 23 this.submitViews();
24 }); 24 });
25 this.submitViews(); 25 this.submitViews();
26 }, 26 },
27 methods: { 27 methods: {
28 async submitViews() { 28 async submitViews () {
29 try { 29 try {
30 let { result: res } = await work.submitViews("A20"); 30 let { result: res } = await work.submitViews("A20");
31 this.cdata.category = []; 31 this.cdata.category = [];
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
43 } 43 }
44 }, 44 },
45 }, 45 },
46 }; 46 };
47 </script> 47 </script>
48 48
49 <style lang="scss" scoped></style> 49 <style lang="scss" scoped></style>
......
...@@ -7,15 +7,14 @@ ...@@ -7,15 +7,14 @@
7 ref="centreLeft2ChartRef" 7 ref="centreLeft2ChartRef"
8 width="100%" 8 width="100%"
9 height="100%" 9 height="100%"
10 :options="options" 10 :options="options"></Echart>
11 ></Echart>
12 </template> 11 </template>
13 12
14 <script> 13 <script>
15 import Echart from "@/common/echart"; 14 import Echart from "@/common/echart";
16 import { mapGetters } from "vuex"; 15 import { mapGetters } from "vuex";
17 export default { 16 export default {
18 data() { 17 data () {
19 return { 18 return {
20 options: {}, 19 options: {},
21 max: "100", //最大value值 20 max: "100", //最大value值
...@@ -27,14 +26,14 @@ export default { ...@@ -27,14 +26,14 @@ export default {
27 components: { 26 components: {
28 Echart, 27 Echart,
29 }, 28 },
30 created() {}, 29 created () { },
31 props: { 30 props: {
32 cdata: { 31 cdata: {
33 type: Array, 32 type: Array,
34 default: () => [], 33 default: () => [],
35 }, 34 },
36 }, 35 },
37 mounted() { 36 mounted () {
38 37
39 window.addEventListener("resize", () => { 38 window.addEventListener("resize", () => {
40 this.key++; 39 this.key++;
...@@ -43,7 +42,7 @@ export default { ...@@ -43,7 +42,7 @@ export default {
43 }, 42 },
44 watch: { 43 watch: {
45 cdata: { 44 cdata: {
46 handler(newData) { 45 handler (newData) {
47 let _this = this; 46 let _this = this;
48 // 设置点的位置(经纬度) 47 // 设置点的位置(经纬度)
49 const geoCoordMap = { 48 const geoCoordMap = {
...@@ -73,8 +72,7 @@ export default { ...@@ -73,8 +72,7 @@ export default {
73 }, 72 },
74 // 如果需要自定义 tooltip样式，需要使用formatter 73 // 如果需要自定义 tooltip样式，需要使用formatter
75 formatter: (params) => { 74 formatter: (params) => {
76 return `<div style="">${params.name}:${ 75 return `<div style="">${params.name}:${params.value + "个"
77 params.value + "个"
78 }</div>`; 76 }</div>`;
79 }, 77 },
80 }, 78 },
...@@ -164,24 +162,23 @@ export default { ...@@ -164,24 +162,23 @@ export default {
164 }, 162 },
165 computed: { 163 computed: {
166 ...mapGetters(["sidebar", "dicData"]), 164 ...mapGetters(["sidebar", "dicData"]),
167 logoName() { 165 logoName () {
168 return ( 166 return (
169 this.dicData["sysCode"] && 167 this.dicData["sysCode"].filter((item) => { return item.DCODE == "areaMap" })
170 this.dicData["sysCode"].filter((item) => item.DCODE == "areaMap")
171 ); 168 );
172 }, 169 },
173 }, 170 },
174 methods: { 171 methods: {
175 // 根据行政区代码匹配行政区 172 // 根据行政区代码匹配行政区
176 getDistrictcode() { 173 getDistrictcode () {
177 console.log("this.logoName.DNAME", this.logoName.DNAME); 174 this.mapjson = ""
178 if ((this.logoName.DNAME = "map610700")) { 175 if (this.logoName[0].DNAME) {
179 this.mapjson = "hanzhong"; 176 this.mapjson = this.logoName[0].DNAME;
180 require(`@/common/map/${this.mapjson}.js`); 177 require(`@/common/map/${this.mapjson}.js`);
181 } 178 }
182 }, 179 },
183 // 开启定时器 180 // 开启定时器
184 startInterval() { 181 startInterval () {
185 const _self = this; 182 const _self = this;
186 // 应通过接口获取配置时间，暂时写死5s 183 // 应通过接口获取配置时间，暂时写死5s
187 const time = 2000; 184 const time = 2000;
...@@ -193,7 +190,7 @@ export default { ...@@ -193,7 +190,7 @@ export default {
193 }, time); 190 }, time);
194 }, 191 },
195 // 重新随机选中地图区域 192 // 重新随机选中地图区域
196 reSelectMapRandomArea() { 193 reSelectMapRandomArea () {
197 const length = 9; 194 const length = 9;
198 this.$nextTick(() => { 195 this.$nextTick(() => {
199 try { 196 try {
...@@ -223,7 +220,7 @@ export default { ...@@ -223,7 +220,7 @@ export default {
223 } 220 }
224 }); 221 });
225 }, 222 },
226 handleMapRandomSelect() { 223 handleMapRandomSelect () {
227 this.$nextTick(() => { 224 this.$nextTick(() => {
228 try { 225 try {
229 const map = this.$refs.centreLeft2ChartRef.chart; 226 const map = this.$refs.centreLeft2ChartRef.chart;
...@@ -258,6 +255,6 @@ export default { ...@@ -258,6 +255,6 @@ export default {
258 }); 255 });
259 }, 256 },
260 }, 257 },
261 }; 258 };
262 </script> 259 </script>
263 <style></style> 260 <style></style>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <div> 2 <div>
3 <i class="el-icon-s-management icon" :title="title" @click="openDialog" /> 3 <i class="el-icon-s-management icon" :title="title" @click="openDialog" />
4 <el-dialog 4 <el-dialog
5 class="configuration"
5 :key="key" 6 :key="key"
6 :title="title" 7 :title="title"
7 :inner-dialog="true" 8 :inner-dialog="true"
...@@ -9,8 +10,7 @@ ...@@ -9,8 +10,7 @@
9 width="600px" 10 width="600px"
10 :close-on-click-modal="false" 11 :close-on-click-modal="false"
11 append-to-body 12 append-to-body
12 @cancel="cancel" 13 @cancel="cancel">
13 >
14 <vue-json-editor 14 <vue-json-editor
15 id="minejson" 15 id="minejson"
16 v-model="resultInfo" 16 v-model="resultInfo"
...@@ -18,15 +18,13 @@ ...@@ -18,15 +18,13 @@
18 lang="zh" 18 lang="zh"
19 @json-change="onJsonChange" 19 @json-change="onJsonChange"
20 @json-save="onJsonSave" 20 @json-save="onJsonSave"
21 @has-error="onError" 21 @has-error="onError" />
22 />
23 <el-tooltip 22 <el-tooltip
24 content="全屏缩放" 23 content="全屏缩放"
25 effect="dark" 24 effect="dark"
26 placement="bottom" 25 placement="bottom"
27 fullscreen 26 fullscreen
28 class="fullScreen" 27 class="fullScreen">
29 >
30 <i class="el-icon-full-screen" @click="enLarge" /> 28 <i class="el-icon-full-screen" @click="enLarge" />
31 </el-tooltip> 29 </el-tooltip>
32 <template slot="footer"> 30 <template slot="footer">
...@@ -34,21 +32,19 @@ ...@@ -34,21 +32,19 @@
34 <el-button 32 <el-button
35 type="primary" 33 type="primary"
36 class="confirmBtn" 34 class="confirmBtn"
37 @click="onJsonSave" 35 @click="onJsonSave">保存</el-button>
38 >保存</el-button>
39 <el-button 36 <el-button
40 type="primary" 37 type="primary"
41 class="cancelBtn" 38 class="cancelBtn"
42 @click="cancel" 39 @click="cancel">关闭</el-button>
43 >关闭</el-button>
44 </div> 40 </div>
45 </template> 41 </template>
46 </el-dialog> 42 </el-dialog>
47 </div> 43 </div>
48 </template> 44 </template>
49 <script> 45 <script>
50 import vueJsonEditor from 'vue-json-editor' 46 import vueJsonEditor from 'vue-json-editor'
51 export default { 47 export default {
52 components: { 48 components: {
53 vueJsonEditor 49 vueJsonEditor
54 }, 50 },
...@@ -62,7 +58,7 @@ export default { ...@@ -62,7 +58,7 @@ export default {
62 default: '' 58 default: ''
63 } 59 }
64 }, 60 },
65 data() { 61 data () {
66 return { 62 return {
67 activeNames: [], 63 activeNames: [],
68 resultInfo: {}, 64 resultInfo: {},
...@@ -75,7 +71,7 @@ export default { ...@@ -75,7 +71,7 @@ export default {
75 }, 71 },
76 watch: { 72 watch: {
77 resultInfos: { 73 resultInfos: {
78 handler: function(val) { 74 handler: function (val) {
79 ++this.key 75 ++this.key
80 this.resultInfo = 76 this.resultInfo =
81 this.resultInfos === '' ? {} : JSON.parse(this.resultInfos) 77 this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
...@@ -86,17 +82,17 @@ export default { ...@@ -86,17 +82,17 @@ export default {
86 } 82 }
87 }, 83 },
88 84
89 mounted() { 85 mounted () {
90 this.resultInfo = 86 this.resultInfo =
91 this.resultInfos === '' ? {} : JSON.parse(this.resultInfos) 87 this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
92 }, 88 },
93 89
94 methods: { 90 methods: {
95 onJsonChange(value) { 91 onJsonChange (value) {
96 // 只有在格式正确的时候进入此事件 92 // 只有在格式正确的时候进入此事件
97 this.hasJsonFlag = true 93 this.hasJsonFlag = true
98 }, 94 },
99 onJsonSave() { 95 onJsonSave () {
100 const value = this.resultInfo 96 const value = this.resultInfo
101 console.log(this.resultInfo, 'resultInfo') 97 console.log(this.resultInfo, 'resultInfo')
102 if (this.hasJsonFlag === false) { 98 if (this.hasJsonFlag === false) {
...@@ -109,19 +105,19 @@ export default { ...@@ -109,19 +105,19 @@ export default {
109 return true 105 return true
110 } 106 }
111 }, 107 },
112 onError(value) { 108 onError (value) {
113 this.hasJsonFlag = false 109 this.hasJsonFlag = false
114 }, 110 },
115 openDialog() { 111 openDialog () {
116 this.dialogVisible = true 112 this.dialogVisible = true
117 }, 113 },
118 cancel() { 114 cancel () {
119 console.log(this.tmpResultInfo, 'tmpResultInfo') 115 console.log(this.tmpResultInfo, 'tmpResultInfo')
120 this.resultInfo = this.tmpResultInfo 116 this.resultInfo = this.tmpResultInfo
121 this.dialogVisible = false 117 this.dialogVisible = false
122 }, 118 },
123 // 放大 119 // 放大
124 enLarge() { 120 enLarge () {
125 const fullarea = document.getElementById('minejson') 121 const fullarea = document.getElementById('minejson')
126 if (fullarea.requestFullscreen) { 122 if (fullarea.requestFullscreen) {
127 fullarea.requestFullscreen() 123 fullarea.requestFullscreen()
...@@ -135,41 +131,57 @@ export default { ...@@ -135,41 +131,57 @@ export default {
135 this.isEnlarge = true 131 this.isEnlarge = true
136 } 132 }
137 } 133 }
138 } 134 }
139 </script> 135 </script>
140 136
141 <style scoped lang="scss"> 137 <style scoped lang="scss">
142 /* jsoneditor右上角默认有一个链接,加css去掉了 */ 138 /* jsoneditor右上角默认有一个链接,加css去掉了 */
143 .icon { 139 .icon {
144 color: #349af3; 140 color: #349af3;
145 } 141 }
146 /deep/ .jsoneditor-vue { 142 /deep/ .jsoneditor-vue {
147 height: 100%; 143 height: 100%;
148 } 144 }
149 .fullScreen { 145 .fullScreen {
150 position: absolute; 146 position: absolute;
151 right: 5%; 147 right: 5%;
152 top: 22%; 148 top: 20%;
153 cursor: pointer; 149 cursor: pointer;
154 color: #fff; 150 color: #fff;
155 } 151 }
156 /deep/ .jsoneditor-modes { 152 /deep/ .jsoneditor-modes {
157 display: none !important; 153 display: none !important;
158 } 154 }
159 .jsoneditor-poweredBy { 155 /deep/.jsoneditor-poweredBy {
160 display: none !important; 156 display: none !important;
161 } 157 }
162 .jsoneditor-menu { 158 .jsoneditor-menu {
163 background-color: #9c9e9f !important; 159 background-color: #9c9e9f !important;
164 border-bottom: 1px solid #9c9e9f !important; 160 border-bottom: 1px solid #9c9e9f !important;
165 } 161 }
166 .jsoneditor { 162 .jsoneditor {
167 border: 1px solid #9c9e9f !important; 163 border: 1px solid #9c9e9f !important;
168 } 164 }
169 .el-collapse { 165 .el-collapse {
170 border: 0; 166 border: 0;
171 } 167 }
172 .el-collapse-item__header { 168 .el-collapse-item__header {
173 height: 44px; 169 height: 44px;
174 } 170 }
171 .configuration {
172 color: white;
173 margin-top: 6vh;
174 /deep/.el-dialog {
175 background-color: #031a46 !important;
176 border: 1px solid #5f82c7;
177 .el-dialog__header {
178 .el-dialog__title {
179 color: white !important;
180 }
181 .el-dialog__headerbtn {
182 top: 20px;
183 }
184 }
185 }
186 }
175 </style> 187 </style>
......
...@@ -525,3 +525,44 @@ tr:hover { ...@@ -525,3 +525,44 @@ tr:hover {
525 .el-select-dropdown__item:hover { 525 .el-select-dropdown__item:hover {
526 background-color: transparent !important; 526 background-color: transparent !important;
527 } 527 }
528
529 // 提示框
530 .el-message-box {
531 background-color: #031a46;
532 border: 1px solid #5f82c7;
533
534 .el-message-box__title{
535 color: white;
536 }
537 .el-message-box__content{
538 color: white;
539 }
540 }
541 // 上级菜单
542 .el-cascader__dropdown {
543 background-color: #031a46;
544 border: 1px solid #5f82c7;
545
546 }
547 .el-cascader-menu{
548 color: white;
549 }
550 .el-radio
551 {
552 .el-cascader-menu:hover{
553 color: white;
554 }
555 }
556 .el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus {
557 background: #F5F7FA;
558 background-image: initial;
559 background-position-x: initial;
560 background-position-y: initial;
561 background-size: initial;
562 background-repeat-x: initial;
563 background-repeat-y: initial;
564 background-attachment: initial;
565 background-origin: initial;
566 background-clip: initial;
567 background-color: rgb(80, 142, 235);
568 }
......
...@@ -199,3 +199,4 @@ ...@@ -199,3 +199,4 @@
199 box-sizing: border-box; 199 box-sizing: border-box;
200 text-align: right; 200 text-align: right;
201 } 201 }
202
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
11 </template> 11 </template>
12 12
13 <script> 13 <script>
14 import maps from "@/components/Echart/Map"; 14 import maps from "@/components/Echart/Map";
15 import brokenline from "@/components/Echart/Brokenline"; 15 import brokenline from "@/components/Echart/Brokenline";
16 export default { 16 export default {
17 data () { 17 data () {
18 return {}; 18 return {};
19 }, 19 },
...@@ -21,15 +21,15 @@ export default { ...@@ -21,15 +21,15 @@ export default {
21 mounted () { }, 21 mounted () { },
22 beforeDestroy () { }, 22 beforeDestroy () { },
23 methods: {}, 23 methods: {},
24 }; 24 };
25 </script> 25 </script>
26 26
27 <style lang="scss" scoped> 27 <style lang="scss" scoped>
28 .centercard { 28 .centercard {
29 width: 44%; 29 width: 44%;
30 height: calc(100vh - 114px); 30 height: calc(100vh - 114px);
31 box-sizing: border-box; 31 box-sizing: border-box;
32 padding: 0 .0521rem; 32 padding: 0 0.0521rem;
33 display: flex; 33 display: flex;
34 flex-direction: column; 34 flex-direction: column;
35 35
...@@ -43,13 +43,13 @@ export default { ...@@ -43,13 +43,13 @@ export default {
43 .title { 43 .title {
44 position: absolute; 44 position: absolute;
45 font-weight: bold; 45 font-weight: bold;
46 color: #02D9FD; 46 color: #02d9fd;
47 line-height: .1354rem; 47 line-height: 0.1354rem;
48 font-size: .1146rem; 48 font-size: 0.1146rem;
49 position: absolute; 49 position: absolute;
50 left: 0; 50 left: 0;
51 right: 0; 51 right: 0;
52 top: .0365rem; 52 top: 0.0365rem;
53 text-align: right; 53 text-align: right;
54 padding-right: 15%; 54 padding-right: 15%;
55 } 55 }
...@@ -65,20 +65,20 @@ export default { ...@@ -65,20 +65,20 @@ export default {
65 .title { 65 .title {
66 position: absolute; 66 position: absolute;
67 font-weight: bold; 67 font-weight: bold;
68 color: #02D9FD; 68 color: #02d9fd;
69 line-height: .1354rem; 69 line-height: 0.1354rem;
70 font-size: .1146rem; 70 font-size: 0.1146rem;
71 position: absolute; 71 position: absolute;
72 left: 0; 72 left: 0;
73 right: 0; 73 right: 0;
74 top: .0365rem; 74 top: 0.0365rem;
75 text-align: center; 75 text-align: center;
76 margin-bottom: .0521rem; 76 margin-bottom: 0.0521rem;
77 } 77 }
78 .brokenline { 78 .brokenline {
79 margin: auto; 79 margin: auto;
80 width: 100%; 80 width: 100%;
81 } 81 }
82 } 82 }
83 } 83 }
84 </style> 84 </style>
......
...@@ -13,31 +13,29 @@ ...@@ -13,31 +13,29 @@
13 <dv-decoration-5 13 <dv-decoration-5
14 :dur="1" 14 :dur="1"
15 class="dv-dec-5" 15 class="dv-dec-5"
16 :color="decorationColor" 16 :color="decorationColor" />
17 />
18 </div> 17 </div>
19 <dv-decoration-8 18 <dv-decoration-8
20 class="dv-dec-8" 19 class="dv-dec-8"
21 :reverse="true" 20 :reverse="true"
22 :color="decorationColor" 21 :color="decorationColor" />
23 />
24 </div> 22 </div>
25 <dv-decoration-10 class="dv-dec-10-s" /> 23 <dv-decoration-10 class="dv-dec-10-s" />
26 </div> 24 </div>
27 </div> 25 </div>
28 <screencontent v-show="isshow"/> 26 <screencontent v-show="isshow" />
29 </div> 27 </div>
30 </div> 28 </div>
31 </div> 29 </div>
32 </template> 30 </template>
33 <script> 31 <script>
34 import drawMixin from "@/utils/drawMixin"; 32 import drawMixin from "@/utils/drawMixin";
35 import screencontent from "./screencontent"; 33 import screencontent from "./screencontent";
36 export default { 34 export default {
37 mixins: [drawMixin], 35 mixins: [drawMixin],
38 data() { 36 data () {
39 return { 37 return {
40 isshow:true, 38 isshow: true,
41 loading: true, 39 loading: true,
42 decorationColor: ["#568aea", "#568aea"], 40 decorationColor: ["#568aea", "#568aea"],
43 }; 41 };
...@@ -45,16 +43,16 @@ export default { ...@@ -45,16 +43,16 @@ export default {
45 components: { 43 components: {
46 screencontent, 44 screencontent,
47 }, 45 },
48 mounted() { 46 mounted () {
49 47
50 // this.timeFn(); 48 // this.timeFn();
51 this.cancelLoading(); 49 this.cancelLoading();
52 }, 50 },
53 beforeDestroy() { 51 beforeDestroy () {
54 clearInterval(this.timing); 52 clearInterval(this.timing);
55 }, 53 },
56 methods: { 54 methods: {
57 cancelLoading() { 55 cancelLoading () {
58 setTimeout(() => { 56 setTimeout(() => {
59 this.loading = false; 57 this.loading = false;
60 }, 500); 58 }, 500);
...@@ -63,9 +61,9 @@ export default { ...@@ -63,9 +61,9 @@ export default {
63 computed: { 61 computed: {
64 ...mapGetters(["products"]), 62 ...mapGetters(["products"]),
65 }, 63 },
66 }; 64 };
67 </script> 65 </script>
68 66
69 <style scoped lang="scss"> 67 <style scoped lang="scss">
70 @import "./index.scss"; 68 @import "./index.scss";
71 </style> 69 </style>
......
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
55 55
56 <script> 56 <script>
57 57
58 import columnar from "@/components/Echart/Columnar"; 58 import columnar from "@/components/Echart/Columnar";
59 import work from "@/api/work"; 59 import work from "@/api/work";
60 export default { 60 export default {
61 data () { 61 data () {
62 return { 62 return {
63 // 日均接入量 63 // 日均接入量
...@@ -93,18 +93,18 @@ export default { ...@@ -93,18 +93,18 @@ export default {
93 XZQDM: "", 93 XZQDM: "",
94 }; 94 };
95 let res = await work.getsthjqxjrtotal(p); 95 let res = await work.getsthjqxjrtotal(p);
96 this.stjrl=res.result.stsum 96 this.stjrl = res.result.stsum
97 this.qxjrl=res.result.qxsum 97 this.qxjrl = res.result.qxsum
98 this.qxerrer=Number(res.result.qxjrerrer) 98 this.qxerrer = Number(res.result.qxjrerrer)
99 this.sterrer=Number(res.result.sthjerrer) 99 this.sterrer = Number(res.result.sthjerrer)
100 if(res.result.sum=="0"){ 100 if (res.result.sum == "0") {
101 this.qxcgl="100%" 101 this.qxcgl = "100%"
102 this.stcgl="100%" 102 this.stcgl = "100%"
103 }else{ 103 } else {
104 let qxcglnum=Number(res.result.qxjrsuccess)/this.qxjrl*100 104 let qxcglnum = Number(res.result.qxjrsuccess) / this.qxjrl * 100
105 let stcgl=Number(res.result.sthjsuccess)/this.qxjrl*100 105 let stcgl = Number(res.result.sthjsuccess) / this.qxjrl * 100
106 this.qxcgl=qxcglnum.toFixed(2)+"%"; 106 this.qxcgl = qxcglnum.toFixed(2) + "%";
107 this.stcgl=stcgl.toFixed(2)+"%"; 107 this.stcgl = stcgl.toFixed(2) + "%";
108 108
109 } 109 }
110 } catch (error) { 110 } catch (error) {
...@@ -113,58 +113,47 @@ export default { ...@@ -113,58 +113,47 @@ export default {
113 }); 113 });
114 }, 114 },
115 }, 115 },
116 }; 116 };
117 </script> 117 </script>
118 118
119 <style lang="scss" scoped> 119 <style lang="scss" scoped>
120 .leftcard { 120 .leftcard {
121 width: 32%; 121 width: 32%;
122 height: calc(100vh -114px);
123 display: flex; 122 display: flex;
123 height: calc(100vh - 114px);
124 flex-direction: column; 124 flex-direction: column;
125 125
126 .card { 126 .card {
127 height: 22%;
127 background: url("~@/image/qxjr.png") no-repeat; 128 background: url("~@/image/qxjr.png") no-repeat;
128 background-size: 100% 100%; 129 background-size: 100% 100%;
129 position: relative; 130 position: relative;
130 text-align: center; 131 text-align: center;
131 width: 100%; 132 width: 100%;
132 height: 22%;
133 } 133 }
134 .carda { 134 .carda {
135 height: 22%;
135 background: url("~@/image/sthj.png") no-repeat; 136 background: url("~@/image/sthj.png") no-repeat;
136 background-size: 100% 100%; 137 background-size: 100% 100%;
137 position: relative; 138 position: relative;
138 text-align: center; 139 text-align: center;
139 width: 100%; 140 width: 100%;
140 height: 22%;
141 } 141 }
142 142
143 // .card1 {
144 // background: url("~@/image/sbtj.png") no-repeat;
145 // background-size: 100% 100%;
146 // position: relative;
147 // text-align: center;
148 // width: 100%;
149 // padding: .0417rem 0;
150 // height: 49%;
151 // }
152
153 .card1 { 143 .card1 {
154 background: url("~@/image/sbtj.png") no-repeat; 144 background: url("~@/image/sbtj.png") no-repeat;
155 background-size: 100% 100%; 145 background-size: 100% 100%;
156 position: relative; 146 position: relative;
157 box-sizing: border-box; 147 box-sizing: border-box;
158 flex: 1; 148 flex: 1;
159 height: 56%;
160 } 149 }
161 150
162 .cardhead { 151 .cardhead {
163 color: #02d9fd; 152 color: #02d9fd;
164 line-height: .125rem; 153 line-height: 0.125rem;
165 letter-spacing: .0104rem; 154 letter-spacing: 0.0104rem;
166 position: absolute; 155 position: absolute;
167 font-size: .1042rem; 156 font-size: 0.1042rem;
168 left: 0; 157 left: 0;
169 right: 0; 158 right: 0;
170 margin: auto; 159 margin: auto;
...@@ -175,7 +164,7 @@ export default { ...@@ -175,7 +164,7 @@ export default {
175 164
176 .rjjrlList { 165 .rjjrlList {
177 display: flex; 166 display: flex;
178 margin-top: .01781rem; 167 margin-top: 0.01781rem;
179 168
180 .qxjr { 169 .qxjr {
181 background: url("~@/image/jrl3.png"); 170 background: url("~@/image/jrl3.png");
...@@ -188,12 +177,12 @@ export default { ...@@ -188,12 +177,12 @@ export default {
188 } 177 }
189 178
190 p { 179 p {
191 margin: 0 .0156rem .0521rem .0156rem; 180 margin: 0 0.0156rem 0.0521rem 0.0156rem;
192 font-weight: 700; 181 font-weight: 700;
193 width: .195rem; 182 width: 0.195rem;
194 height: .2475rem; 183 height: 0.2475rem;
195 font-size: .2863rem; 184 font-size: 0.2863rem;
196 font-size: .2867rem; 185 font-size: 0.2867rem;
197 } 186 }
198 } 187 }
199 188
...@@ -204,35 +193,37 @@ export default { ...@@ -204,35 +193,37 @@ export default {
204 // padding: 35px 20px 20px 20px; 193 // padding: 35px 20px 20px 20px;
205 box-sizing: border-box; 194 box-sizing: border-box;
206 color: #e3f1ff; 195 color: #e3f1ff;
207 margin-top: .1263rem; 196 margin-top: 0.1263rem;
208 197
209 .cardcontent-left { 198 .cardcontent-left {
210 width: 60%; 199 width: 60%;
211 flex-direction: column; 200 flex-direction: column;
212 position: relative; 201 position: relative;
213 li{ 202 li {
214 font-size: .1042rem; 203 font-size: 0.1042rem;
215 } 204 }
216 } 205 }
217 206
218 .cardcontent-left::before { 207 .cardcontent-left::before {
219 position: absolute; 208 position: absolute;
220 right: 0; 209 right: 0;
221 top: .3042rem; 210 top: 0.3042rem;
222 content: ""; 211 content: "";
223 width: .0052rem; 212 width: 0.0052rem;
224 height: .4688rem; 213 height: 0.4688rem;
225 background: linear-gradient(180deg, 214 background: linear-gradient(
215 180deg,
226 #091b4c 0%, 216 #091b4c 0%,
227 #47b5e0 56%, 217 #47b5e0 56%,
228 #091b4c 100%); 218 #091b4c 100%
219 );
229 } 220 }
230 221
231 .cardcontent-right { 222 .cardcontent-right {
232 flex: 1; 223 flex: 1;
233 width: 100%; 224 width: 100%;
234 flex-direction: column; 225 flex-direction: column;
235 font-size: .0833rem; 226 font-size: 0.0833rem;
236 227
237 .bad { 228 .bad {
238 color: #c97168; 229 color: #c97168;
...@@ -243,18 +234,18 @@ export default { ...@@ -243,18 +234,18 @@ export default {
243 } 234 }
244 235
245 p { 236 p {
246 margin-bottom: .0417rem; 237 margin-bottom: 0.0417rem;
247 238
248 span:nth-child(1) { 239 span:nth-child(1) {
249 margin-right: .0781rem; 240 margin-right: 0.0781rem;
250 } 241 }
251 242
252 span:nth-child(2) { 243 span:nth-child(2) {
253 font-size: .1042rem; 244 font-size: 0.1042rem;
254 font-weight: 900; 245 font-weight: 900;
255 } 246 }
256 } 247 }
257 } 248 }
258 } 249 }
259 } 250 }
260 </style> 251 </style>
......
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
19 </template> 19 </template>
20 20
21 <script> 21 <script>
22 import columnarsmat from "@/components/Echart/Columnarsmat"; 22 import columnarsmat from "@/components/Echart/Columnarsmat";
23 import Rose from "@/components/Echart/Rose"; 23 import Rose from "@/components/Echart/Rose";
24 import work from "@/api/work"; 24 import work from "@/api/work";
25 export default { 25 export default {
26 data () { 26 data () {
27 return { 27 return {
28 config: { 28 config: {
...@@ -54,28 +54,28 @@ export default { ...@@ -54,28 +54,28 @@ export default {
54 } 54 }
55 } 55 }
56 } 56 }
57 } 57 }
58 </script> 58 </script>
59 <style lang="scss" scoped> 59 <style lang="scss" scoped>
60 /deep/.row-item:not(:last-child) { 60 /deep/.row-item:not(:last-child) {
61 margin-bottom: .026rem; 61 margin-bottom: 0.026rem;
62 } 62 }
63 63
64 .rightcard { 64 .rightcard {
65 width: 32%; 65 width: 32%;
66 display: flex; 66 display: flex;
67 height: calc(100vh - 114px); 67 height: calc(100vh - 114px);
68 flex-direction: column; 68 flex-direction: column;
69 69
70 .cardhead { 70 .cardhead {
71 font-size: .1042rem; 71 font-size: 0.1042rem;
72 font-weight: bold; 72 font-weight: bold;
73 color: #02D9FD; 73 color: #02d9fd;
74 text-align: center; 74 text-align: center;
75 position: absolute; 75 position: absolute;
76 left: 0; 76 left: 0;
77 right: 0; 77 right: 0;
78 top: .0625rem; 78 top: 0.0625rem;
79 text-align: center; 79 text-align: center;
80 } 80 }
81 81
...@@ -86,8 +86,8 @@ export default { ...@@ -86,8 +86,8 @@ export default {
86 overflow: hidden; 86 overflow: hidden;
87 87
88 .nodata { 88 .nodata {
89 font-size: .1042rem; 89 font-size: 0.1042rem;
90 color: #02D9FD; 90 color: #02d9fd;
91 font-weight: bold; 91 font-weight: bold;
92 margin: auto; 92 margin: auto;
93 margin-top: 120px; 93 margin-top: 120px;
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
95 } 95 }
96 96
97 .cardCon { 97 .cardCon {
98 padding: .0521rem .026rem; 98 padding: 0.0521rem 0.026rem;
99 position: relative; 99 position: relative;
100 text-align: center; 100 text-align: center;
101 width: 100%; 101 width: 100%;
...@@ -105,19 +105,24 @@ export default { ...@@ -105,19 +105,24 @@ export default {
105 height: 33%; 105 height: 33%;
106 background: url("~@/image/xjgyfwxx.png") no-repeat; 106 background: url("~@/image/xjgyfwxx.png") no-repeat;
107 background-size: 100% 100%; 107 background-size: 100% 100%;
108 108 /deep/.dv-scroll-board {
109 .header {
110 height: 0.1875rem;
111 align-items: center;
112 }
113 }
109 .board { 114 .board {
110 width: 90%; 115 width: 90%;
111 margin: 0 auto; 116 margin: 0 auto;
112 height: 1.1031rem; 117 height: 1.1031rem;
113 margin-top: .0521rem; 118 margin-top: 0.0521rem;
114 /deep/.header{ 119 /deep/.header {
115 font-size: .0738rem; 120 font-size: 0.0738rem;
116 } 121 }
117 /deep/.rows{ 122 /deep/.rows {
118 .ceil{ 123 .ceil {
119 font-size: .0738rem; 124 font-size: 0.0738rem;
120 color: #6BC1FC 125 color: #6bc1fc;
121 } 126 }
122 } 127 }
123 } 128 }
...@@ -127,7 +132,7 @@ export default { ...@@ -127,7 +132,7 @@ export default {
127 height: 33%; 132 height: 33%;
128 background: url("~@/image/djywl.png") no-repeat; 133 background: url("~@/image/djywl.png") no-repeat;
129 background-size: 100% 100%; 134 background-size: 100% 100%;
130 padding: .3825rem 0 0 0; 135 padding: 0.3825rem 0 0 0;
131 } 136 }
132 137
133 .card3 { 138 .card3 {
...@@ -138,12 +143,12 @@ export default { ...@@ -138,12 +143,12 @@ export default {
138 padding-bottom: 0; 143 padding-bottom: 0;
139 144
140 .cardhead { 145 .cardhead {
141 top: .0417rem; 146 top: 0.0417rem;
142 } 147 }
143 } 148 }
144 149
145 .cardhead { 150 .cardhead {
146 position: absolute; 151 position: absolute;
147 } 152 }
148 } 153 }
149 </style> 154 </style>
......
...@@ -99,17 +99,17 @@ ...@@ -99,17 +99,17 @@
99 </template> 99 </template>
100 100
101 <script> 101 <script>
102 // 接收报文查询 102 // 接收报文查询
103 // 引入表格头部数据 103 // 引入表格头部数据
104 import data from "./data"; 104 import data from "./data";
105 // 引入table混入方法 105 // 引入table混入方法
106 import tableMixin from "@/mixins/tableMixin.js"; 106 import tableMixin from "@/mixins/tableMixin.js";
107 import { getReceiveDataReportPage } from "@/api/dataReport.js"; 107 import { getReceiveDataReportPage } from "@/api/dataReport.js";
108 // 引入详情弹框 108 // 引入详情弹框
109 import dataDetails from "@/components/EditDialog"; 109 import dataDetails from "@/components/EditDialog";
110 //引入日期处理方法 110 //引入日期处理方法
111 import { timeFormat } from "@/utils/operation"; 111 import { timeFormat } from "@/utils/operation";
112 export default { 112 export default {
113 name: "jsbwcx", 113 name: "jsbwcx",
114 mixins: [tableMixin], 114 mixins: [tableMixin],
115 // 注册组件 115 // 注册组件
...@@ -224,6 +224,7 @@ export default { ...@@ -224,6 +224,7 @@ export default {
224 getReceiveDataReportPage({ ...this.form, ...this.formData }).then( 224 getReceiveDataReportPage({ ...this.form, ...this.formData }).then(
225 (res) => { 225 (res) => {
226 if (res.code === 200) { 226 if (res.code === 200) {
227 console.log("菜单列表", res);
227 let { total, records, current } = res.result; 228 let { total, records, current } = res.result;
228 this.tableData.total = total; 229 this.tableData.total = total;
229 this.tableData.data = records ? records : []; 230 this.tableData.data = records ? records : [];
...@@ -274,12 +275,12 @@ export default { ...@@ -274,12 +275,12 @@ export default {
274 } 275 }
275 }, 276 },
276 } 277 }
277 } 278 }
278 </script> 279 </script>
279 <style scoped lang="scss"> 280 <style scoped lang="scss">
280 // 引入表单整体样式 281 // 引入表单整体样式
281 @import "~@/styles/public.scss"; 282 @import "~@/styles/public.scss";
282 // 引入当前css 283 // 引入当前css
283 @import "./index.scss"; 284 @import "./index.scss";
284 </style> 285 </style>
285 286
......
...@@ -142,8 +142,8 @@ ...@@ -142,8 +142,8 @@
142 padding: 24px 120px 0px; 142 padding: 24px 120px 0px;
143 .el-form-item { 143 .el-form-item {
144 margin-bottom: 24px; 144 margin-bottom: 24px;
145 .el-form-item__label { 145 /deep/.el-form-item__label {
146 color: #747e8c; 146 color: #ffffff;
147 } 147 }
148 ::v-deep .el-input .el-input__inner { 148 ::v-deep .el-input .el-input__inner {
149 padding: 0 8px; 149 padding: 0 8px;
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
15 </div> 15 </div>
16 <div class="from-clues-content"> 16 <div class="from-clues-content">
17 <div class="contentbox"> 17 <div class="contentbox">
18 <base-set v-show="isshow" :userInfo="userData" /> 18 <base-set v-if="isshow" :userInfo="userData" />
19 <password-edit v-show="!isshow" :userInfo="userData" /> 19 <password-edit v-if="!isshow" :userInfo="userData" />
20 </div> 20 </div>
21 </div> 21 </div>
22 </div> 22 </div>
......
...@@ -110,10 +110,10 @@ ...@@ -110,10 +110,10 @@
110 overflow-y: auto; 110 overflow-y: auto;
111 .form-wrapper { 111 .form-wrapper {
112 padding: 24px 120px 0px; 112 padding: 24px 120px 0px;
113 .el-form-item { 113 /deep/.el-form-item {
114 margin-bottom: 24px; 114 margin-bottom: 24px;
115 .el-form-item__label { 115 .el-form-item__label {
116 color: #747e8c; 116 color: #ffffff;
117 } 117 }
118 ::v-deep .el-input .el-input__inner { 118 ::v-deep .el-input .el-input__inner {
119 padding: 0 8px; 119 padding: 0 8px;
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 30
31 </el-row> 31 </el-row>
32 <el-row :gutter="24"> 32 <el-row :gutter="24">
33 <el-col :span="12"> 33 <el-col :span="24">
34 <el-form-item label="代码:" prop="code" label-width="54px"> 34 <el-form-item label="代码:" prop="code" label-width="124px">
35 <el-input 35 <el-input
36 v-model="codeComputed" 36 v-model="codeComputed"
37 placeholder="请输入菜单代码" 37 placeholder="请输入菜单代码"
...@@ -272,4 +272,5 @@ ...@@ -272,4 +272,5 @@
272 /deep/.el-input__inner { 272 /deep/.el-input__inner {
273 background-color: #07388b; 273 background-color: #07388b;
274 } 274 }
275
275 </style> 276 </style>
......
1 import filter from '@/utils/filter.js'
2 class data extends filter {
3 constructor() {
4 super()
5 }
6 columns () {
7 return [
8 {
9 prop: "name",
10 label: "角色名称",
11 width: 330
12 },
13 {
14 prop: "type",
15 label: "类别",
16 width: 400
17 },
18 {
19 prop: "address",
20 label: "备注"
21 }
22 ]
23 }
24 }
25 export default new data()
...@@ -4,39 +4,36 @@ ...@@ -4,39 +4,36 @@
4 :title="dialogTitle" 4 :title="dialogTitle"
5 :show.sync="showAddEditDialog" 5 :show.sync="showAddEditDialog"
6 :width="'767px'" 6 :width="'767px'"
7 @close="handleCloseDialog()" 7 @close="handleCloseDialog()">
8 >
9 <template slot="content"> 8 <template slot="content">
10 <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px"> 9 <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px">
11 <el-row :gutter="24"> 10 <el-row :gutter="24">
12 <el-col :span="12"> 11 <el-col :span="15">
13 <el-form-item label="角色名称:" prop="roleName"> 12 <el-form-item label="角色名称:" prop="roleName">
14 <el-input 13 <el-input
15 v-model="dialogForm.roleName" 14 v-model="dialogForm.roleName"
16 clearable 15 clearable
17 placeholder="角色名称" 16 placeholder="角色名称" />
18 />
19 </el-form-item> 17 </el-form-item>
20 </el-col> 18 </el-col>
21 <el-col :span="12"> 19 </el-row>
20 <el-row :gutter="24">
21 <el-col :span="24">
22 <el-form-item label="角色类型:" prop="roleType"> 22 <el-form-item label="角色类型:" prop="roleType">
23 <el-input 23 <el-input
24 v-model="dialogForm.roleType" 24 v-model="dialogForm.roleType"
25 clearable 25 clearable
26 placeholder="角色类型" 26 placeholder="角色类型" />
27 />
28 </el-form-item> 27 </el-form-item>
29 </el-col> 28 </el-col>
30 </el-row> 29 </el-row>
31 <br>
32 <el-row> 30 <el-row>
33 <el-col :span="24"> 31 <el-col :span="24">
34 <el-form-item label="备注:" class="form-item-mb0"> 32 <el-form-item label="备注:" class="form-item-mb0">
35 <el-input 33 <el-input
36 v-model="dialogForm.roleTextArea" 34 v-model="dialogForm.roleTextArea"
37 type="textarea" 35 type="textarea"
38 placeholder="备注" 36 placeholder="备注" />
39 />
40 </el-form-item> 37 </el-form-item>
41 </el-col> 38 </el-col>
42 </el-row> 39 </el-row>
...@@ -45,25 +42,23 @@ ...@@ -45,25 +42,23 @@
45 <template slot="footer"> 42 <template slot="footer">
46 <el-button 43 <el-button
47 class="cancel-button" 44 class="cancel-button"
48 @click="handleCloseDialog" 45 @click="handleCloseDialog">取消</el-button>
49 >取消</el-button>
50 46
51 <el-button 47 <el-button
52 type="primary" 48 type="primary"
53 @click="handleSaveRole()" 49 @click="handleSaveRole()">保存</el-button>
54 >保存</el-button>
55 </template> 50 </template>
56 </Dialog> 51 </Dialog>
57 </template> 52 </template>
58 53
59 <script> 54 <script>
60 import Dialog from "@/components/Dialog/"; 55 import Dialog from "@/components/Dialog/";
61 import { api, httpAction } from '@/api/manageApi' 56 import { api, httpAction } from '@/api/manageApi'
62 export default { 57 export default {
63 components: { 58 components: {
64 Dialog 59 Dialog
65 }, 60 },
66 data() { 61 data () {
67 return { 62 return {
68 dialogTitle: '', 63 dialogTitle: '',
69 showAddEditDialog: false, 64 showAddEditDialog: false,
...@@ -91,7 +86,7 @@ export default { ...@@ -91,7 +86,7 @@ export default {
91 }, 86 },
92 methods: { 87 methods: {
93 // 保存新增或关闭事件 88 // 保存新增或关闭事件
94 handleSaveRole(val) { 89 handleSaveRole (val) {
95 this.$refs.form.validate((valid) => { 90 this.$refs.form.validate((valid) => {
96 if (valid) { 91 if (valid) {
97 try { 92 try {
...@@ -102,10 +97,8 @@ export default { ...@@ -102,10 +97,8 @@ export default {
102 sort: this.sort, 97 sort: this.sort,
103 type: this.dialogForm.roleType 98 type: this.dialogForm.roleType
104 } 99 }
105 console.log("this.roleId",this.roleId);
106 if (this.roleId) { 100 if (this.roleId) {
107 params.id = this.roleId 101 params.id = this.roleId
108 console.log("修改",params.id,params);
109 httpAction(`${api.roles}/${params.id}`, params, 'post').then( 102 httpAction(`${api.roles}/${params.id}`, params, 'post').then(
110 (res) => { 103 (res) => {
111 if (res.status === 1) { 104 if (res.status === 1) {
...@@ -155,7 +148,7 @@ export default { ...@@ -155,7 +148,7 @@ export default {
155 }) 148 })
156 }, 149 },
157 // 取消事件 150 // 取消事件
158 handleCloseDialog() { 151 handleCloseDialog () {
159 this.$refs.form.resetFields() 152 this.$refs.form.resetFields()
160 this.dialogForm = { 153 this.dialogForm = {
161 roleName: '', 154 roleName: '',
...@@ -164,19 +157,31 @@ export default { ...@@ -164,19 +157,31 @@ export default {
164 this.showAddEditDialog = false 157 this.showAddEditDialog = false
165 } 158 }
166 } 159 }
167 } 160 }
168 </script> 161 </script>
169 <style scoped lang="scss"> 162 <style scoped lang="scss">
170 /deep/.el-input__inner { 163 /deep/.el-input__inner {
171 background: #07388B; 164 background: #07388b;
172 border-radius: 2px; 165 border-radius: 2px;
173 border: 1px solid #6BC1FC; 166 border: 1px solid #6bc1fc;
167 }
168 /deep/.el-textarea__inner {
169 background: #07388b;
170 color: #fff;
174 } 171 }
175 /deep/.el-textarea__inner{ 172 /deep/.el-form-item__label {
176 background: #07388B;
177 color: #fff; 173 color: #fff;
178 } 174 }
179 /deep/.el-form-item__label{ 175 /deep/.el-dialog__headerbtn {
180 color:#fff; 176 position: absolute;
181 } 177 top: 15px;
178 right: 30px;
179 }
180 /deep/.el-dialog__header {
181 text-align: center;
182 margin-bottom: 10px;
183 .el-dialog__title {
184 color: white;
185 }
186 }
182 </style> 187 </style>
......
...@@ -14,15 +14,13 @@ ...@@ -14,15 +14,13 @@
14 </div> 14 </div>
15 <div class="from-clues-content"> 15 <div class="from-clues-content">
16 <lb-table 16 <lb-table
17 :page-size="pageData.size" 17 :pagination="false"
18 :current-page.sync="pageData.current"
19 :total="pageData.total"
20 @size-change="handleSizeChange" 18 @size-change="handleSizeChange"
21 @p-current-change="handleCurrentChange" 19 @p-current-change="handleCurrentChange"
22 :column="tableData.columns" 20 :column="tableData.columns"
23 :data="listdata" 21 :data="listdata"
24 :expand-row-keys="keyList" 22 :expand-row-keys="keyList"
25 row-key="id"> 23 row-key="dictid">
26 </lb-table> 24 </lb-table>
27 </div> 25 </div>
28 <EditDialog ref="addEditDialog" @ok="reloadTableData" /> 26 <EditDialog ref="addEditDialog" @ok="reloadTableData" />
...@@ -219,11 +217,6 @@ ...@@ -219,11 +217,6 @@
219 ]), 217 ]),
220 data: [], 218 data: [],
221 }, 219 },
222 pageData: {
223 total: 5,
224 pageSize: 15,
225 current: 1,
226 },
227 }; 220 };
228 }, 221 },
229 created () { 222 created () {
...@@ -242,6 +235,7 @@ ...@@ -242,6 +235,7 @@
242 Builtinrole = res.content; 235 Builtinrole = res.content;
243 getRolesById(2) 236 getRolesById(2)
244 .then((res) => { 237 .then((res) => {
238 console.log("角色列表", res);
245 Publicrole = res.content; 239 Publicrole = res.content;
246 240
247 this.listdata = Builtinrole.concat(Publicrole); 241 this.listdata = Builtinrole.concat(Publicrole);
...@@ -376,8 +370,6 @@ ...@@ -376,8 +370,6 @@
376 } 370 }
377 371
378 this.$refs.rolesForm.personlist(this.waitMemberList, row.id); 372 this.$refs.rolesForm.personlist(this.waitMemberList, row.id);
379 // this.$refs.rolesForm.getMenuData();
380
381 this.$refs.rolesForm.menulist(this.operationList, row.id, this.selectedSubsystemCode, this.menutablelistData, this.operationCodes); 373 this.$refs.rolesForm.menulist(this.operationList, row.id, this.selectedSubsystemCode, this.menutablelistData, this.operationCodes);
382 } else { 374 } else {
383 this.$message.error({ message: res.message, showClose: true }); 375 this.$message.error({ message: res.message, showClose: true });
...@@ -402,15 +394,15 @@ ...@@ -402,15 +394,15 @@
402 }, 394 },
403 // 上移下移 395 // 上移下移
404 moveUpward (index, row) { 396 moveUpward (index, row) {
405 realMove(row.id, "UP", this.listdata); 397 realMove(row.dictid, "UP", this.listdata);
406 this.key++; 398 this.key++;
407 let id = findParents(this.listdata, row.id); 399 let id = findParents(this.listdata, row.dictid);
408 this.keyList = id; 400 this.keyList = id;
409 }, 401 },
410 moveDown (index, row) { 402 moveDown (index, row) {
411 realMove(row.id, "DOWN", this.listdata); 403 realMove(row.dictid, "DOWN", this.listdata);
412 this.key++; 404 this.key++;
413 let id = findParents(this.listdata, row.id); 405 let id = findParents(this.listdata, row.dictid);
414 this.keyList = id; 406 this.keyList = id;
415 }, 407 },
416 408
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 {{ title || "标题" }} 10 {{ title || "标题" }}
11 </div> 11 </div>
12 <div class="editDialogBox-box"> 12 <div class="editDialogBox-box">
13 <el-tabs v-model="activeName" type="card"> 13 <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
14 <el-tab-pane label="人员配置" name="first"></el-tab-pane> 14 <el-tab-pane label="人员配置" name="first"></el-tab-pane>
15 <el-tab-pane label="菜单配置" name="second"></el-tab-pane> 15 <el-tab-pane label="菜单配置" name="second"></el-tab-pane>
16 </el-tabs> 16 </el-tabs>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 ref="multipleTable" 19 ref="multipleTable"
20 :pagination="false" 20 :pagination="false"
21 :column="usertableData.column" 21 :column="usertableData.column"
22 :data="usertableData.data" 22 :data="lastuserList"
23 @selection-change="handleSelectionChange" 23 @selection-change="handleSelectionChange"
24 @row-click="handleClickTableRow"> 24 @row-click="handleClickTableRow">
25 > 25 >
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
27 <lb-table 27 <lb-table
28 :key="menukey" 28 :key="menukey"
29 v-if="activeName == 'second'" 29 v-if="activeName == 'second'"
30 ref="multipleTable1"
31 :pagination="false" 30 :pagination="false"
32 :column="menutableData.column" 31 :column="menutableData.column"
33 :data="lastMenuList" 32 :data="lastMenuList"
...@@ -99,7 +98,6 @@ ...@@ -99,7 +98,6 @@
99 label: "用户名", 98 label: "用户名",
100 }, 99 },
101 ], 100 ],
102 data: []
103 }, 101 },
104 // 角色id 102 // 角色id
105 roleId: "", 103 roleId: "",
...@@ -107,6 +105,7 @@ ...@@ -107,6 +105,7 @@
107 queryParam: {}, 105 queryParam: {},
108 menukey: 0, 106 menukey: 0,
109 activeName: "first", 107 activeName: "first",
108 lastuserList: [], // 人员表格数据
110 lastMenuList: [], // 重构完成的菜单表格数据 109 lastMenuList: [], // 重构完成的菜单表格数据
111 usermultipleSelection: [], 110 usermultipleSelection: [],
112 // 选中菜单列表 111 // 选中菜单列表
...@@ -132,8 +131,8 @@ ...@@ -132,8 +131,8 @@
132 131
133 // 人员配置点击行勾选数据 132 // 人员配置点击行勾选数据
134 handleClickTableRow (row, event) { 133 handleClickTableRow (row, event) {
135 this.checkNum1 = 0; 134 this.checkNum = 0;
136 this.isCheck1 = false; 135 this.isCheck = false;
137 if (event.label == "操作") { 136 if (event.label == "操作") {
138 return; 137 return;
139 } else { 138 } else {
...@@ -163,10 +162,10 @@ ...@@ -163,10 +162,10 @@
163 } 162 }
164 } 163 }
165 if (this.usermultipleSelection.length > 0) { 164 if (this.usermultipleSelection.length > 0) {
166 this.checkNum1 = this.usermultipleSelection.length; 165 this.checkNum = this.usermultipleSelection.length;
167 this.isCheck1 = true; 166 this.isCheck = true;
168 } else { 167 } else {
169 this.isCheck1 = false; 168 this.isCheck = false;
170 } 169 }
171 }, 170 },
172 // 获取授权主体的菜单权限 171 // 获取授权主体的菜单权限
...@@ -304,19 +303,21 @@ ...@@ -304,19 +303,21 @@
304 personlist (a, rid) { 303 personlist (a, rid) {
305 this.roleId = rid; 304 this.roleId = rid;
306 this.visible = true; 305 this.visible = true;
307 306 this.lastuserList = a;
308 this.usertableData.data = a; 307 this.lastuserList.forEach((item, index) => {
309 this.usertableData.data.forEach((item, index) => {
310 if (item.selectStatus === 0) { 308 if (item.selectStatus === 0) {
311 this.$nextTick(() => { 309 this.$nextTick(async () => {
310 await this.$refs.multipleTable
311 if (this.$refs.multipleTable) {
312 this.$refs.multipleTable.toggleRowSelection( 312 this.$refs.multipleTable.toggleRowSelection(
313 this.usertableData.data[index], 313 this.lastuserList[index],
314 true 314 true
315 ); 315 );
316 }
317
316 }); 318 });
317 } 319 }
318 }); 320 });
319
320 }, 321 },
321 // 关闭事件 322 // 关闭事件
322 close () { 323 close () {
...@@ -351,7 +352,17 @@ ...@@ -351,7 +352,17 @@
351 }, 352 },
352 // 勾选人员事件 353 // 勾选人员事件
353 handleSelectionChange (val) { 354 handleSelectionChange (val) {
355 this.lastuserList.forEach((element, index) => {
356 delete this.lastuserList[index].selectStatus
357 });
354 this.usermultipleSelection = val; 358 this.usermultipleSelection = val;
359 this.lastuserList.forEach((element, index) => {
360 this.usermultipleSelection.forEach(element1 => {
361 if (element.id == element1.id) {
362 this.lastuserList[index].selectStatus = 0
363 }
364 });
365 });
355 }, 366 },
356 // 数据筛选 367 // 数据筛选
357 setarrdata (scope, arr) { 368 setarrdata (scope, arr) {
...@@ -383,6 +394,23 @@ ...@@ -383,6 +394,23 @@
383 ) 394 )
384 this.getAuthorizedInfo() 395 this.getAuthorizedInfo()
385 }, 396 },
397 handleClick (tab, event) {
398 this.lastuserList.forEach((item, index) => {
399 if (item.selectStatus === 0) {
400 this.$nextTick(async () => {
401 await this.$refs.multipleTable
402 if (this.$refs.multipleTable) {
403 this.$refs.multipleTable.toggleRowSelection(
404 this.lastuserList[index],
405 true
406 );
407 }
408
409 });
410 }
411 });
412 }
413
386 }, 414 },
387 }; 415 };
388 </script> 416 </script>
...@@ -566,13 +594,8 @@ ...@@ -566,13 +594,8 @@
566 display: flex; 594 display: flex;
567 margin-bottom: 15px; 595 margin-bottom: 15px;
568 } 596 }
569 597 .el-dialog__footer {
570 .dialog_footer { 598 padding-right: 40px;
571 flex-direction: column;
572
573 .dialog_button {
574 margin-top: 8px;
575 }
576 } 599 }
577 600
578 .divider { 601 .divider {
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 { required: true, message: "请输入用户名", trigger: "blur" }, 114 { required: true, message: "请输入用户名", trigger: "blur" },
115 ], 115 ],
116 }, 116 },
117 title: "", 117 title: "修改",
118 visible: false, 118 visible: false,
119 showLoginName: false, 119 showLoginName: false,
120 sexList: [{ lable: "0", value: "0", name: "男" }, { lable: "1", value: "1", name: "女" }], 120 sexList: [{ lable: "0", value: "0", name: "男" }, { lable: "1", value: "1", name: "女" }],
...@@ -230,4 +230,14 @@ ...@@ -230,4 +230,14 @@
230 /deep/.el-form-item__label { 230 /deep/.el-form-item__label {
231 color: #fff; 231 color: #fff;
232 } 232 }
233 /deep/.el-dialog__body {
234 padding-top: 20px;
235 }
236 /deep/.el-dialog__header {
237 text-align: center;
238 margin-bottom: 10px;
239 .el-dialog__title {
240 color: white;
241 }
242 }
233 </style> 243 </style>
......
...@@ -17,9 +17,7 @@ ...@@ -17,9 +17,7 @@
17 </div> 17 </div>
18 <div class="from-clues-content"> 18 <div class="from-clues-content">
19 <lb-table 19 <lb-table
20 :page-size="pageData.size" 20 :pagination="false"
21 :current-page.sync="pageData.current"
22 :total="pageData.total"
23 @size-change="handleSizeChange" 21 @size-change="handleSizeChange"
24 @p-current-change="handleCurrentChange" 22 @p-current-change="handleCurrentChange"
25 :column="tableData.columns" 23 :column="tableData.columns"
...@@ -182,11 +180,6 @@ ...@@ -182,11 +180,6 @@
182 ]), 180 ]),
183 data: [], 181 data: [],
184 }, 182 },
185 pageData: {
186 total: 5,
187 pageSize: 15,
188 current: 1,
189 },
190 }; 183 };
191 }, 184 },
192 created () { 185 created () {
...@@ -209,6 +202,7 @@ ...@@ -209,6 +202,7 @@
209 departmentId: this.departmentid.departmentId, 202 departmentId: this.departmentid.departmentId,
210 }; 203 };
211 getUserList(this.queryParam).then((res) => { 204 getUserList(this.queryParam).then((res) => {
205 console.log("人员列表", res);
212 if (res.status === 1) { 206 if (res.status === 1) {
213 this.loading = false; 207 this.loading = false;
214 this.tableData.data = res.content; 208 this.tableData.data = res.content;
......