Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
0752255d by 任超
Options

style:打包

2 parents 8521a4e9 3a6a30f9
Inline Side-by-side
Showing 47 changed files with 241 additions and 503 deletions
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
38 "babel-plugin-dynamic-import-node": "2.3.3", 38 "babel-plugin-dynamic-import-node": "2.3.3",
39 "chalk": "2.4.2", 39 "chalk": "2.4.2",
40 "connect": "3.6.6", 40 "connect": "3.6.6",
41 "copy-webpack-plugin": "^6.0.0",
41 "element-ui": "^2.15.13", 42 "element-ui": "^2.15.13",
42 "html-webpack-plugin": "3.2.0", 43 "html-webpack-plugin": "3.2.0",
43 "runjs": "4.3.2", 44 "runjs": "4.3.2",
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-15 14:48:13
5 -->
1 <!DOCTYPE html> 6 <!DOCTYPE html>
2 <html> 7 <html>
3 8
...@@ -15,14 +20,14 @@ ...@@ -15,14 +20,14 @@
15 20
16 <body> 21 <body>
17 <div id="app"></div> 22 <div id="app"></div>
18 <!-- built files will be auto injected -->
19 </body> 23 </body>
20 24
21 </html> 25 </html>
22 <script> 26 <script>
27 document.write("<s" + "cript type='text/javascript' src='./dist/config.js?" + Math.random().toString(36).substr(2) + "'></scr" + "ipt>");
23 window.baseUrl = location.origin || location.protocol + '//' + location.host 28 window.baseUrl = location.origin || location.protocol + '//' + location.host
24 // window.authorization = 'bearer AT-14-h4UlUGjPvgmrIgnDO-3QgMP0m4YJGQTR'; 29 // window.authorization = 'bearer AT-14-h4UlUGjPvgmrIgnDO-3QgMP0m4YJGQTR';
25 // window.authorization = 'bearer AT-223-c-Q86EHx75m7ig3EDf-SwMWl4U0AKn0b'; 30 // window.authorization = 'bearer AT-223-c-Q86EHx75m7ig3EDf-SwMWl4U0AKn0b';
26 window.timeout = 5000 31 window.timeout = 5000
27 window.authorization = "bearer AT-6-KSOqiWx3hbGL2fsRjyQQUDzPXR8rat-U" 32 window.authorization = "bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6"
28 </script> 33 </script>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,12 +4,9 @@ ...@@ -4,12 +4,9 @@
4 * @LastEditTime: 2023-03-01 15:35:44 4 * @LastEditTime: 2023-03-01 15:35:44
5 */ 5 */
6 export default { 6 export default {
7 // SERVERAPI: '/service-bdcsjsb-th', //浩浩 7 TITLE: '汉中市数据上报系统',
8 // SERVERAPI: '/service-bdcsjsb-zz',
9 SERVERAPI: '/bdcsjsb', //赵千 8 SERVERAPI: '/bdcsjsb', //赵千
10 MANAGEMENTAPI: 'http://192.168.2.236/management' 9 MANAGEMENTAPI: 'http://192.168.2.236/management'
11 // SERVERAPI: '/bdcsjsb-service'
12 // SERVERAPI: '/bdcsjsb-jiao0'
13 } 10 }
14 // 汉中 11 // 汉中
15 // export default { 12 // export default {
......
...@@ -97,6 +97,10 @@ export default { ...@@ -97,6 +97,10 @@ export default {
97 type: String, 97 type: String,
98 default: 'left', 98 default: 'left',
99 }, 99 },
100 calcHeight: {
101 type: Number,
102 default: 230
103 },
100 merge: Array, 104 merge: Array,
101 }, 105 },
102 components: { 106 components: {
...@@ -137,9 +141,9 @@ export default { ...@@ -137,9 +141,9 @@ export default {
137 _this.$nextTick(() => { 141 _this.$nextTick(() => {
138 142
139 window.addEventListener('resize', () => { 143 window.addEventListener('resize', () => {
140 _this.tableHeight = _this.calcHeightx(230) 144 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
141 }); 145 });
142 _this.tableHeight = _this.calcHeightx(230) 146 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
143 }) 147 })
144 } else { 148 } else {
145 _this.tableHeight = window.innerHeight - _this.heightNum 149 _this.tableHeight = window.innerHeight - _this.heightNum
......

1.74 MB | W: | H:

1.67 MB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

256 KB | W: | H:

258 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-10 16:43:16 4 * @LastEditTime: 2023-03-15 11:17:28
5 */ 5 */
6 import router from "./router"; 6 import router from "./router";
7 import store from "./store"; 7 import store from "./store";
......
...@@ -222,7 +222,7 @@ export const asyncRoutes = [ ...@@ -222,7 +222,7 @@ export const asyncRoutes = [
222 path: 'validationRule', 222 path: 'validationRule',
223 component: () => import('@/views/system/validationRule/index'), 223 component: () => import('@/views/system/validationRule/index'),
224 name: 'validationRule', 224 name: 'validationRule',
225 meta: { title: '上报效验规则配置' } 225 meta: { title: '上报校验规则配置' }
226 }, 226 },
227 { 227 {
228 path: 'timedTask', 228 path: 'timedTask',
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-15 11:08:56
5 */
1 module.exports = { 6 module.exports = {
2 title: '', 7 title: '数据上报系统',
3 /** 8 /**
4 * @type {boolean} true | false 9 * @type {boolean} true | false
5 * @description Whether show the settings right-panel 10 * @description Whether show the settings right-panel
......
...@@ -221,7 +221,7 @@ table td { ...@@ -221,7 +221,7 @@ table td {
221 cursor: pointer; 221 cursor: pointer;
222 } 222 }
223 223
224 .el-table__body tr:hover { 224 .el-table__body-wrapper .el-table__body tr:hover {
225 background: #063160 !important; 225 background: #063160 !important;
226 box-shadow: inset 0px 0px 20px 0px #03DBFF !important; 226 box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
227 } 227 }
...@@ -233,9 +233,9 @@ table td { ...@@ -233,9 +233,9 @@ table td {
233 233
234 // table 固定列样式 234 // table 固定列样式
235 // tr:hover { 235 // tr:hover {
236 // background: #063160 !important; 236 // background: #063160 !important;
237 // box-shadow: inset 0px 0px 20px 0px #03DBFF !important; 237 // box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
238 // } 238 // }
239 // .el-table__fixed-right-patch { 239 // .el-table__fixed-right-patch {
240 // background-color: #073781 240 // background-color: #073781
241 // } 241 // }
......
...@@ -338,12 +338,61 @@ aside { ...@@ -338,12 +338,61 @@ aside {
338 338
339 // 操作按钮样式 339 // 操作按钮样式
340 .btnColor { 340 .btnColor {
341 color: #8DEAF9; 341 color: #02D9FD;
342 width: 64px;
343 height: 28px;
344 background: rgba(255, 255, 255, 0.1);
345 border-radius: 16px;
342 } 346 }
347
348 .btnColor:hover {
349 color: #02D9FD;
350 width: 64px;
351 height: 28px;
352 background: rgba(255, 255, 255, 0.1);
353 border-radius: 16px;
354 }
355
343 .successColor { 356 .successColor {
344 color:#67C23A 357 width: 64px;
358 height: 28px;
359 background: rgba(255, 255, 255, 0.1);
360 border-radius: 16px;
361 color: #0097FF;
362 }
363
364 .successColor:hover {
365 width: 64px;
366 height: 28px;
367 background: rgba(255, 255, 255, 0.1);
368 border-radius: 16px;
369 color: #0097FF;
345 } 370 }
346 371
372 .delColor {
373 width: 64px;
374 height: 28px;
375 background: rgba(255, 255, 255, 0.1);
376 border-radius: 16px;
377 color: #B06974;
378 }
379
380 .delColor:hover {
381 width: 64px;
382 height: 28px;
383 background: rgba(255, 255, 255, 0.1);
384 border-radius: 16px;
385 color: #B06974;
386 }
387
388 // 弹框中间区域样式
389 .dialogCon {
390 background: #031A46;
391 box-shadow: inset 0px 0px 12px 0px #02D9FD;
392 border-radius: 0px 2px 2px 2px;
393 border: 1px solid #6BC1FC;
394 padding: 15px;
395 }
347 396
348 // 通过 入库 样式 397 // 通过 入库 样式
349 .adopt, 398 .adopt,
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-15 14:37:05
5 */
1 // 获取浏览器便签标题 6 // 获取浏览器便签标题
2 import defaultSettings from '@/settings' 7 import defaultSettings from '@/settings'
8 import config from '@/api/config'
3 9
4 const title = defaultSettings.title || '厦门市房屋数据服务平台' 10 const title = config.TITLE
5 11
6 export default function getPageTitle(pageTitle) { 12 export default function getPageTitle (pageTitle) {
7 if (pageTitle) { 13 if (pageTitle) {
8 return `${pageTitle} - ${title}` 14 return `${pageTitle} - ${title}`
9 } 15 }
......
...@@ -125,7 +125,6 @@ export default { ...@@ -125,7 +125,6 @@ export default {
125 onClick={() => { this.handleEdit(scope.row) }} 125 onClick={() => { this.handleEdit(scope.row) }}
126 > 126 >
127 详情 127 详情
128 <i class="el-icon-d-arrow-right"></i>
129 </el-button> 128 </el-button>
130 </div> 129 </div>
131 ) 130 )
......
...@@ -115,11 +115,9 @@ export default { ...@@ -115,11 +115,9 @@ export default {
115 <el-button 115 <el-button
116 type="text" 116 type="text"
117 class='btnColor' 117 class='btnColor'
118 size="mini"
119 onClick={() => { this.handleEdit(scope.row) }} 118 onClick={() => { this.handleEdit(scope.row) }}
120 > 119 >
121 详情 120 详情
122 <i class="el-icon-d-arrow-right"></i>
123 </el-button> 121 </el-button>
124 </div> 122 </div>
125 ) 123 )
......
...@@ -126,7 +126,6 @@ export default { ...@@ -126,7 +126,6 @@ export default {
126 onClick={() => { this.handleEdit(scope.row) }} 126 onClick={() => { this.handleEdit(scope.row) }}
127 > 127 >
128 详情 128 详情
129 <i class="el-icon-d-arrow-right"></i>
130 </el-button> 129 </el-button>
131 </div> 130 </div>
132 ) 131 )
......
...@@ -116,7 +116,6 @@ export default { ...@@ -116,7 +116,6 @@ export default {
116 }} 116 }}
117 > 117 >
118 详情 118 详情
119 <i class="el-icon-d-arrow-right"></i>
120 </el-button> 119 </el-button>
121 </div> 120 </div>
122 ); 121 );
......
...@@ -84,7 +84,6 @@ export default { ...@@ -84,7 +84,6 @@ export default {
84 }} 84 }}
85 > 85 >
86 详情 86 详情
87 <i class="el-icon-d-arrow-right"></i>
88 </el-button> 87 </el-button>
89 </div> 88 </div>
90 ); 89 );
......
...@@ -116,7 +116,6 @@ export default { ...@@ -116,7 +116,6 @@ export default {
116 }} 116 }}
117 > 117 >
118 详情 118 详情
119 <i class="el-icon-d-arrow-right"></i>
120 </el-button> 119 </el-button>
121 </div> 120 </div>
122 ); 121 );
......
...@@ -112,7 +112,6 @@ export default { ...@@ -112,7 +112,6 @@ export default {
112 }} 112 }}
113 > 113 >
114 详情 114 详情
115 <i class="el-icon-d-arrow-right"></i>
116 </el-button> 115 </el-button>
117 </div> 116 </div>
118 ); 117 );
......
...@@ -113,7 +113,6 @@ export default { ...@@ -113,7 +113,6 @@ export default {
113 }} 113 }}
114 > 114 >
115 详情 115 详情
116 <i class="el-icon-d-arrow-right"></i>
117 </el-button> 116 </el-button>
118 </div> 117 </div>
119 ); 118 );
......
...@@ -110,7 +110,6 @@ export default { ...@@ -110,7 +110,6 @@ export default {
110 }} 110 }}
111 > 111 >
112 详情 112 详情
113 <i class="el-icon-d-arrow-right"></i>
114 </el-button> 113 </el-button>
115 </div> 114 </div>
116 ); 115 );
......
...@@ -107,7 +107,6 @@ export default { ...@@ -107,7 +107,6 @@ export default {
107 }} 107 }}
108 > 108 >
109 详情 109 详情
110 <i class="el-icon-d-arrow-right"></i>
111 </el-button> 110 </el-button>
112 </div> 111 </div>
113 ); 112 );
......
...@@ -112,7 +112,6 @@ export default { ...@@ -112,7 +112,6 @@ export default {
112 }} 112 }}
113 > 113 >
114 详情 114 详情
115 <i class="el-icon-d-arrow-right"></i>
116 </el-button> 115 </el-button>
117 </div> 116 </div>
118 ); 117 );
......
...@@ -108,7 +108,6 @@ export default { ...@@ -108,7 +108,6 @@ export default {
108 }} 108 }}
109 > 109 >
110 详情 110 详情
111 <i class="el-icon-d-arrow-right"></i>
112 </el-button> 111 </el-button>
113 </div> 112 </div>
114 ); 113 );
......
...@@ -118,7 +118,6 @@ export default { ...@@ -118,7 +118,6 @@ export default {
118 onClick={() => { this.handleEdit(scope.row) }} 118 onClick={() => { this.handleEdit(scope.row) }}
119 > 119 >
120 详情 120 详情
121 <i class="el-icon-d-arrow-right"></i>
122 </el-button> 121 </el-button>
123 </div> 122 </div>
124 ) 123 )
......
...@@ -106,7 +106,6 @@ export default { ...@@ -106,7 +106,6 @@ export default {
106 onClick={() => { this.handleEdit(scope.row) }} 106 onClick={() => { this.handleEdit(scope.row) }}
107 > 107 >
108 详情 108 详情
109 <i class="el-icon-d-arrow-right"></i>
110 </el-button> 109 </el-button>
111 </div> 110 </div>
112 ) 111 )
......
...@@ -109,7 +109,6 @@ export default { ...@@ -109,7 +109,6 @@ export default {
109 }} 109 }}
110 > 110 >
111 详情 111 详情
112 <i class="el-icon-d-arrow-right"></i>
113 </el-button> 112 </el-button>
114 </div> 113 </div>
115 ); 114 );
......
...@@ -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 // 日均接入量
...@@ -113,11 +113,11 @@ ...@@ -113,11 +113,11 @@
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 display: flex; 122 display: flex;
123 height: calc(100vh - 114px); 123 height: calc(100vh - 114px);
...@@ -131,6 +131,7 @@ ...@@ -131,6 +131,7 @@
131 text-align: center; 131 text-align: center;
132 width: 100%; 132 width: 100%;
133 } 133 }
134
134 .carda { 135 .carda {
135 height: 22%; 136 height: 22%;
136 background: url("~@/image/sthj.png") no-repeat; 137 background: url("~@/image/sthj.png") no-repeat;
...@@ -169,20 +170,21 @@ ...@@ -169,20 +170,21 @@
169 .qxjr { 170 .qxjr {
170 background: url("~@/image/jrl3.png"); 171 background: url("~@/image/jrl3.png");
171 background-size: 100% 100%; 172 background-size: 100% 100%;
173 width: 29px;
174 height: 46px;
172 } 175 }
173 176
174 .sthj { 177 .sthj {
175 background: url("~@/image/jh.png"); 178 background: url("~@/image/jh.png");
176 background-size: 100% 100%; 179 background-size: 100% 100%;
180 width: 29px;
181 height: 46px;
177 } 182 }
178 183
179 p { 184 p {
180 margin: 0 0.0156rem 0.0521rem 0.0156rem; 185 margin: 0 0.0156rem 0.0521rem 0.0156rem;
181 font-weight: 700; 186 font-weight: 700;
182 width: 0.195rem; 187 font-size: 30px;
183 height: 0.2475rem;
184 font-size: 0.2863rem;
185 font-size: 0.2867rem;
186 } 188 }
187 } 189 }
188 190
...@@ -201,6 +203,7 @@ ...@@ -201,6 +203,7 @@
201 position: relative; 203 position: relative;
202 flex: 1; 204 flex: 1;
203 height: 100%; 205 height: 100%;
206
204 li { 207 li {
205 font-size: 0.1042rem; 208 font-size: 0.1042rem;
206 } 209 }
...@@ -209,16 +212,14 @@ ...@@ -209,16 +212,14 @@
209 .cardcontent-left::before { 212 .cardcontent-left::before {
210 position: absolute; 213 position: absolute;
211 right: 0; 214 right: 0;
212 top: 0.3042rem; 215 top: 0.24rem;
213 content: ""; 216 content: "";
214 width: 0.0052rem; 217 width: 0.0052rem;
215 height: 0.4688rem; 218 height: 0.4688rem;
216 background: linear-gradient( 219 background: linear-gradient(180deg,
217 180deg,
218 #091b4c 0%, 220 #091b4c 0%,
219 #47b5e0 56%, 221 #47b5e0 56%,
220 #091b4c 100% 222 #091b4c 100%);
221 );
222 } 223 }
223 224
224 .cardcontent-right { 225 .cardcontent-right {
...@@ -244,11 +245,11 @@ ...@@ -244,11 +245,11 @@
244 } 245 }
245 246
246 span:nth-child(2) { 247 span:nth-child(2) {
247 font-size: 0.1142rem; 248 font-size: 20px;
248 font-weight: 900; 249 font-weight: 900;
249 } 250 }
250 } 251 }
251 } 252 }
252 } 253 }
253 } 254 }
254 </style> 255 </style>
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-15 14:08:59
5 */
1 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
2 class data extends filter { 7 class data extends filter {
3 constructor() { 8 constructor() {
...@@ -12,9 +17,9 @@ class data extends filter { ...@@ -12,9 +17,9 @@ class data extends filter {
12 render: (h, scope) => { 17 render: (h, scope) => {
13 return ( 18 return (
14 <div> 19 <div>
15 <span class='adopt' v-show={scope.row.receiveState == 0}>未效验</span> 20 <span class='adopt' v-show={scope.row.receiveState == 0}>未校验</span>
16 <span class='adopt' v-show={scope.row.receiveState == 1}>效验成功</span> 21 <span class='adopt' v-show={scope.row.receiveState == 1}>校验成功</span>
17 <span class='warehousing' v-show={scope.row.receiveState == 2}>效验失败</span> 22 <span class='warehousing' v-show={scope.row.receiveState == 2}>校验失败</span>
18 </div> 23 </div>
19 ) 24 )
20 } 25 }
...@@ -46,7 +51,7 @@ class data extends filter { ...@@ -46,7 +51,7 @@ class data extends filter {
46 { 51 {
47 prop: "bizMsgid", 52 prop: "bizMsgid",
48 label: "业务报文ID", 53 label: "业务报文ID",
49 width: 98, 54 minWidth: 100,
50 }, 55 },
51 { 56 {
52 prop: "createdate", 57 prop: "createdate",
...@@ -56,12 +61,12 @@ class data extends filter { ...@@ -56,12 +61,12 @@ class data extends filter {
56 { 61 {
57 prop: "recflowid", 62 prop: "recflowid",
58 label: "业务流水号", 63 label: "业务流水号",
59 width: 100, 64 minWidth: 100,
60 }, 65 },
61 { 66 {
62 prop: "estatenum", 67 prop: "estatenum",
63 label: "不动产单元号", 68 label: "不动产单元号",
64 width: 240, 69 minWidth: 160,
65 }, 70 },
66 { 71 {
67 prop: "rectype", 72 prop: "rectype",
......
...@@ -199,7 +199,6 @@ export default { ...@@ -199,7 +199,6 @@ export default {
199 }} 199 }}
200 > 200 >
201 修改 201 修改
202 <i class="el-icon-d-arrow-right"></i>
203 </el-button> : 202 </el-button> :
204 <el-button 203 <el-button
205 type="text" 204 type="text"
...@@ -209,7 +208,6 @@ export default { ...@@ -209,7 +208,6 @@ export default {
209 }} 208 }}
210 > 209 >
211 详情 210 详情
212 <i class="el-icon-d-arrow-right"></i>
213 </el-button> 211 </el-button>
214 } 212 }
215 </div> 213 </div>
......
...@@ -156,8 +156,8 @@ ...@@ -156,8 +156,8 @@
156 .login-logo { 156 .login-logo {
157 background: url(../../image/loginLogo.png) no-repeat; 157 background: url(../../image/loginLogo.png) no-repeat;
158 background-size: 100% 100%; 158 background-size: 100% 100%;
159 width: 28%; 159 width: 580px;
160 height: 52%; 160 height: 540px;
161 position: absolute; 161 position: absolute;
162 top: 25%; 162 top: 25%;
163 left: 19%; 163 left: 19%;
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
171 min-width: 360px; 171 min-width: 360px;
172 min-height: 380px; 172 min-height: 380px;
173 top: 30%; 173 top: 30%;
174 right: 20%; 174 right: 18%;
175 position: absolute; 175 position: absolute;
176 background-size: 100% 100%; 176 background-size: 100% 100%;
177 box-sizing: border-box; 177 box-sizing: border-box;
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
33 </div> 33 </div>
34 <!-- 列表区域 --> 34 <!-- 列表区域 -->
35 <div class="from-clues-content"> 35 <div class="from-clues-content">
36 <lb-table ref="table" :header-cell-style="headerStyle1" :pagination="false" :column="tableData.columns" 36 <lb-table ref="table" :header-cell-style="headerStyle1" :calcHeight="200" :pagination="false"
37 :data="tableData.data"> 37 :column="tableData.columns" :data="tableData.data">
38 </lb-table> 38 </lb-table>
39 39
40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :header-cell-style="headerStyle" 40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :header-cell-style="headerStyle"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 </div> 34 </div>
35 <!-- 列表区域 --> 35 <!-- 列表区域 -->
36 <div class="from-clues-content"> 36 <div class="from-clues-content">
37 <lb-table ref="table" :pagination="false" :column="tableData.columns" :data="tableData.data"> 37 <lb-table ref="table" :pagination="false" :calcHeight="200" :column="tableData.columns" :data="tableData.data">
38 </lb-table> 38 </lb-table>
39 39
40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false" 40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false"
...@@ -157,5 +157,9 @@ export default { ...@@ -157,5 +157,9 @@ export default {
157 // 引入表单整体样式 157 // 引入表单整体样式
158 // @import "~@/styles/public.scss"; 158 // @import "~@/styles/public.scss";
159 @import "../css/index.scss"; 159 @import "../css/index.scss";
160
161 /deep/.el-table thead.is-group th.el-table__cell {
162 height: 14px !important;
163 }
160 </style> 164 </style>
161 165
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-17 16:32:50 3 * @Date: 2023-02-17 16:32:50
4 * @LastEditors: Please set LastEditors 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-14 13:19:18 5 * @LastEditTime: 2023-03-15 10:42:21
6 * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue 6 * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
43 </div> 43 </div>
44 <!-- 列表区域 --> 44 <!-- 列表区域 -->
45 <div class="from-clues-content"> 45 <div class="from-clues-content">
46 <lb-table ref="table" :pagination="false" :border="true" :header-cell-style="headerStyle" 46 <lb-table ref="table" :pagination="false" :border="true" :calcHeight="200" :header-cell-style="headerStyle"
47 :column="tableData.columns" :data="tableData.data"> 47 :column="tableData.columns" :data="tableData.data">
48 </lb-table> 48 </lb-table>
49 <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true" 49 <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true"
......
...@@ -193,13 +193,12 @@ class data { ...@@ -193,13 +193,12 @@ class data {
193 <div> 193 <div>
194 <el-button 194 <el-button
195 type="text" 195 type="text"
196 style="color:#67C23A" 196 class='successColor'
197 onClick={() => { 197 onClick={() => {
198 vm.handleEdit(scope.row); 198 vm.handleEdit(scope.row);
199 }} 199 }}
200 > 200 >
201 修改 201 修改
202 <i class="el-icon-d-arrow-right"></i>
203 </el-button> 202 </el-button>
204 </div> 203 </div>
205 ); 204 );
......
...@@ -159,25 +159,22 @@ export default { ...@@ -159,25 +159,22 @@ export default {
159 { 159 {
160 scope.row.exchangeState == 2 ? 160 scope.row.exchangeState == 2 ?
161 <el-button 161 <el-button
162 size="mini"
163 type="text" 162 type="text"
164 style="color:#67C23A" 163 class='successColor'
165 onClick={() => { 164 onClick={() => {
166 this.handleDetail(scope.row); 165 this.handleDetail(scope.row);
167 }} 166 }}
168 > 167 >
169 修改 168 修改
170 <i class="el-icon-d-arrow-right"></i>
171 </el-button> : 169 </el-button> :
172 <el-button 170 <el-button
173 size="mini" 171 class='btnColor'
174 type="text" 172 type="text"
175 onClick={() => { 173 onClick={() => {
176 this.handleDetail(scope.row); 174 this.handleDetail(scope.row);
177 }} 175 }}
178 > 176 >
179 详情 177 详情
180 <i class="el-icon-d-arrow-right"></i>
181 </el-button> 178 </el-button>
182 } 179 }
183 180
......
1 <template> 1 <template>
2 <!-- 编辑 --> 2 <!-- 编辑 -->
3 <dialogBox ref="addTask" width="60%" @submitForm="handleSubmit" @closeDialog="handleClose" v-model="myValue" 3 <dialogBox ref="addTask" width="50%" :isMain="true" @submitForm="handleSubmit" @closeDialog="handleClose"
4 customClass="editValidRule" title="新增定时任务"> 4 v-model="myValue" customClass="editValidRule" title="新增定时任务">
5 <div class="dialogCon" style="height:360px">
5 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"> 6 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
6 <el-row :gutter="20"> 7 <el-row :gutter="20">
7 <el-col :span="12"> 8 <el-col :span="12">
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
35 </el-col> 36 </el-col>
36 </el-row> 37 </el-row>
37 </el-form> 38 </el-form>
39 </div>
38 <message-tips :message="message" ref="msg" /> 40 <message-tips :message="message" ref="msg" />
39 </dialogBox> 41 </dialogBox>
40 </template> 42 </template>
...@@ -125,10 +127,10 @@ export default { ...@@ -125,10 +127,10 @@ export default {
125 } 127 }
126 }, 128 },
127 watch: { 129 watch: {
128 value(val) { 130 value (val) {
129 this.myValue = val 131 this.myValue = val
130 }, 132 },
131 taskData(val) { 133 taskData (val) {
132 if (val != null) { 134 if (val != null) {
133 this.ruleForm = val 135 this.ruleForm = val
134 } else { 136 } else {
...@@ -146,23 +148,30 @@ export default { ...@@ -146,23 +148,30 @@ export default {
146 } 148 }
147 </script> 149 </script>
148 <style rel="stylesheet/scss" lang="scss" scoped> 150 <style rel="stylesheet/scss" lang="scss" scoped>
149 // @import "~@/styles/public.scss"; 151 /deep/.dialogBox .dialog_title {
150 .editDialogBox-box { 152 margin-left: 5px !important;
153 }
154
155 /deep/.el-dialog__headerbtn {
156 margin-top: -12px;
157 }
158
159 .editDialogBox-box {
151 margin: 14px 18px 30px 18px !important 160 margin: 14px 18px 30px 18px !important
152 } 161 }
153 162
154 /deep/.el-form-item__label { 163 /deep/.el-form-item__label {
155 color: #fff; 164 color: #fff;
156 } 165 }
157 166
158 /deep/.el-form-item { 167 /deep/.el-form-item {
159 color: #fff; 168 color: #fff;
160 margin-bottom: 10px; 169 margin-bottom: 10px;
161 } 170 }
162 171
163 /deep/ .el-input__inner { 172 /deep/ .el-input__inner {
164 background-color: transparent; 173 background-color: transparent;
165 border: 1px solid #458ACF; 174 border: 1px solid #458ACF;
166 } 175 }
167 </style> 176 </style>
168 177
......
1 <template>
2 <!-- 编辑 -->
3 <dialogBox ref="edit" width="60%" :closed="true" @closeDialog="handleClose" @submitForm="handleSubmit"
4 customClass="editDictionary" multiple title="字典信息">
5 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
6 <el-row :gutter="20">
7 <el-col :span="12">
8 <el-form-item label="字典类型编码" prop="DCODE">
9 <el-input v-model.trim="ruleForm.DCODE" placeholder="字典类型编码"></el-input>
10 </el-form-item>
11 </el-col>
12 <el-col :span="12">
13 <el-form-item label="字典类型名称" prop="DNAME">
14 <el-input v-model.trim="ruleForm.DNAME" placeholder="字典类型名称"></el-input>
15 </el-form-item>
16 </el-col>
17 </el-row>
18 <el-row :gutter="20">
19 <el-col :span="12">
20 <el-form-item label="字典结构" prop="ISTREE">
21 <el-radio-group v-model="ruleForm.ISTREE">
22 <el-radio label="1">树形</el-radio>
23 <el-radio label="0">列表</el-radio>
24 </el-radio-group>
25 </el-form-item>
26 </el-col>
27 </el-row>
28 </el-form>
29 <lb-table :column="column" :heightNum="550" :key="key" :expand-row-keys="keyList" row-key="DICTID"
30 :tree-props="{ children: 'children' }" :pagination="false" :data="tableData">
31 </lb-table>
32 </dialogBox>
33 </template>
34
35 <script>
36 import dictionaries from '@/api/dictionaries'
37 import { getUuid } from '@/utils/tools'
38 export default {
39 props: {
40 dictList: Array,
41 dicData: Object
42 },
43 data () {
44 return {
45 key: 0,
46 message: '',
47 keyList: [],
48 ruleForm: {
49 DCODE: '',
50 DNAME: '',
51 ISTREE: '1'
52 },
53 column: [
54 {
55 width: '60',
56 renderHeader: (h, scope) => {
57 return <i class="el-icon-plus" onClick={() => { this.handleAdd() }} style="cursor:pointer;color:#409EFF">增加</i>
58 },
59 render: (h, scope) => {
60 return (
61 <span>{scope.row.index}</span>
62 )
63 }
64 },
65 {
66 prop: 'DCODE',
67 label: '字典项编码',
68 render: (h, scope) => {
69 return (
70 <div>
71 <el-input placeholder="字典项编码" v-show={scope.row.codeShow} v-fo value={scope.row[scope.column.property]}
72 onFocus={() => { this.itemShowFalse(); scope.row.codeShow = true; }}
73 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
74
75
76 <el-input placeholder="字典项编码" v-show={!scope.row.codeShow} value={scope.row[scope.column.property]}
77 onFocus={() => { this.itemShowFalse(); scope.row.codeShow = true; }}
78 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
79 </div>
80 )
81 }
82 },
83 {
84 prop: 'DNAME',
85 label: '字典项名称',
86 render: (h, scope) => {
87 return (
88 <div>
89 <el-input placeholder="字典项编码" v-show={scope.row.nameShow} v-fo value={scope.row[scope.column.property]}
90 onFocus={() => { this.itemShowFalse(); scope.row.nameShow = true; }}
91 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
92
93 <el-input placeholder="字典项名称" v-show={!scope.row.nameShow} value={scope.row[scope.column.property]}
94 onFocus={() => { this.itemShowFalse(); scope.row.nameShow = true; }}
95 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
96 </div>
97 )
98 }
99 },
100 {
101 width: '130px',
102 label: '移动',
103 render: (h, scope) => {
104 return (
105 <div>
106 <el-button type='text' disabled={scope.$index == 0} onClick={() => { this.moveUpward(scope.$index, scope.row) }}>上移</el-button>
107 <el-button type='text' disabled={(scope.$index + 1) == this.tableData.length} onClick={() => { this.moveDown(scope.$index, scope.row) }}>下移</el-button >
108 </div >
109 )
110 }
111 },
112 {
113 width: '150px',
114 label: '操作',
115 render: (h, scope) => {
116 return (
117 <div>
118 <el-button type="text" style="margin-right:10px" v-show={this.ruleForm.ISTREE == '1'} onClick={() => { this.handleAddSubordinate(scope.row) }}>增加下级</el-button>
119 <el-button type="text" style="margin-left:0" onClick={() => { this.handleMinus(scope.$index, scope.row) }}>删除</el-button>
120 </div>
121 )
122 }
123 }
124 ],
125 tableData: [],
126 rules: {
127 DCODE: [
128 { required: true, message: '字典类型编码', trigger: 'blur' }
129 ],
130 }
131 }
132 },
133 methods: {
134 isShow () {
135 this.$refs.edit.isShow()
136 setTimeout(() => {
137 this.tableData = _.cloneDeep(this.dictList)
138 this.addIndexes()
139 let { DCODE, DNAME, ISTREE } = this.dicData
140 this.ruleForm = {
141 DCODE,
142 DNAME,
143 ISTREE
144 }
145 }, 0)
146 },
147 // 添加索引
148 addIndexes () {
149 this.tableData.forEach((item, index) => {
150 if (index == 0) {
151 item.codeShow = true
152 } else {
153 item.codeShow = false
154 item.nameShow = false
155 }
156 item.index = index + 1
157 })
158 },
159 itemShowFalse () {
160 this.tableData.forEach((item, index) => {
161 item.codeShow = false
162 item.nameShow = false
163 })
164 },
165 handleMinus (index, row) {
166 this.removeTreeListItem(this.tableData, row.DICTID)
167 },
168 removeTreeListItem (treeList, DICTID) {
169 if (!treeList || !treeList.length) {
170 return
171 }
172 for (let i = 0; i < treeList.length; i++) {
173 if (treeList[i].DICTID === DICTID) {
174 treeList.splice(i, 1);
175 break;
176 }
177 this.removeTreeListItem(treeList[i].children, DICTID)
178 }
179 },
180 async handleSubmit () {
181 let submitData = _.cloneDeep(this.tableData)
182 this.ruleForm.DICTID = this.dicData.DICTID
183 this.ruleForm.PARENTID = null
184 this.ruleForm.TYPEID = this.dicData.TYPEID
185 submitData.forEach((item) => {
186 item.ISTREE = this.ruleForm.ISTREE
187 })
188 submitData.unshift(this.ruleForm)
189 try {
190 let res = await dictionaries.editSysDict({ 'editDicts': submitData })
191 if (res.code == 200) {
192 this.$message({
193 message: res.message,
194 type: 'success'
195 })
196 this.handleClose()
197 this.$parent.featchData()
198 }
199 } catch (error) {
200 this.message = error
201 this.$refs.msg.messageShow()
202 }
203 },
204 handleClose () {
205 this.$refs['ruleForm'].resetFields();
206 this.$refs.edit.isHide()
207 },
208 // 增加下级
209 handleAddSubordinate (row) {
210 if (!row.children) {
211 row.children = []
212 }
213 row.children.push(
214 {
215 DCODE: '',
216 DNAME: '',
217 DICTID: getUuid(32),
218 TYPEID: row.TYPEID,
219 PARENTID: row.DICTID,
220 children: null,
221 ISTREE: this.ruleForm.ISTREE
222 }
223 )
224 this.keyList = [];
225 this.keyList.push(row.DICTID)
226 },
227 // 增加
228 handleAdd () {
229 this.$nextTick(() => {
230 let container = this.$el.querySelector('.el-table__body-wrapper');
231 container.scrollTop = container.scrollHeight;
232 })
233 this.tableData.push(
234 {
235 DCODE: '',
236 DNAME: '',
237 DICTID: getUuid(32),
238 TYPEID: this.dicData.TYPEID,
239 PARENTID: this.dicData.DICTID,
240 children: null,
241 ISTREE: this.ruleForm.ISTREE
242 }
243 )
244 this.addIndexes()
245 },
246 // 上移下移
247 moveUpward (index, row) {
248 if (index > 0) {
249 let upData = this.tableData[index - 1];
250 this.tableData.splice(index - 1, 1);
251 this.tableData.splice(index, 0, upData);
252 } else {
253 this.$message({
254 message: '已经是第一条，上移失败',
255 type: 'warning'
256 });
257 }
258 this.key++
259 },
260 moveDown (index, row) {
261 if ((index + 1) == this.tableData.length) {
262 this.$message({
263 message: '已经是最后一条，下移失败',
264 type: 'warning'
265 });
266 } else {
267 let downData = this.tableData[index + 1];
268 this.tableData.splice(index + 1, 1);
269 this.tableData.splice(index, 0, downData);
270 }
271 this.key++
272 }
273 }
274 }
275 </script>
276 <style rel="stylesheet/less" lang="less" scoped>
277
278 </style>
279
1 <template> 1 <template>
2 <!-- 编辑 --> 2 <!-- 编辑 -->
3 <dialogBox ref="validRule" width="60%" @submitForm="handleSubmit" :closed="true" @closeDialog="handleClose" 3 <dialogBox ref="validRule" width="60%" @submitForm="handleSubmit" :closed="true" @closeDialog="handleClose"
4 customClass="editValidRule" multiple title="上报效验规则设置"> 4 customClass="editValidRule" multiple title="上报校验规则设置">
5 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 5 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
6 <el-row :gutter="20"> 6 <el-row :gutter="20">
7 <el-col :span="12"> 7 <el-col :span="12">
...@@ -84,10 +84,10 @@ export default { ...@@ -84,10 +84,10 @@ export default {
84 ) 84 )
85 } 85 }
86 }, 86 },
87 // 效验表达式 87 // 校验表达式
88 { 88 {
89 prop: 'EXPRESSION', 89 prop: 'EXPRESSION',
90 label: '效验表达式', 90 label: '校验表达式',
91 render: (h, scope) => { 91 render: (h, scope) => {
92 return ( 92 return (
93 <el-select value={scope.row[scope.column.property]} clearable 93 <el-select value={scope.row[scope.column.property]} clearable
...@@ -204,7 +204,5 @@ export default { ...@@ -204,7 +204,5 @@ export default {
204 } 204 }
205 } 205 }
206 </script> 206 </script>
207 <style rel="stylesheet/less" lang="less" scoped> 207 <style rel="stylesheet/less" lang="less" scoped></style>
208
209 </style>
210 208
......
...@@ -69,7 +69,9 @@ export default { ...@@ -69,7 +69,9 @@ export default {
69 label: "操作", 69 label: "操作",
70 render: (h, scope) => { 70 render: (h, scope) => {
71 return ( 71 return (
72 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { this.editClick(scope.row, 1) }}>修改</el-button> 72 <el-button type="text"
73 class='successColor'
74 onClick={() => { this.editClick(scope.row, 1) }}>修改</el-button>
73 ) 75 )
74 } 76 }
75 } 77 }
...@@ -128,4 +130,8 @@ export default { ...@@ -128,4 +130,8 @@ export default {
128 </script> 130 </script>
129 <style scoped lang="scss"> 131 <style scoped lang="scss">
130 // @import "~@/styles/public.scss"; 132 // @import "~@/styles/public.scss";
133 /deep/.dialogBox .dialog_title {
134 top: 0;
135 margin-left: 5px;
136 }
131 </style> 137 </style>
......
1 <template> 1 <template>
2 <dialogBox class="modifydialog" :isMain="true" :title="2222" @closeDialog="close" @submitForm="submitForm" v-model="myValue"> 2 <dialogBox class="modifydialog" :isMain="true" :title="2222" @closeDialog="close" @submitForm="submitForm"
3 <div class="modifydialog-con"> 3 v-model="myValue">
4 <div class="dialogCon">
4 <el-form ref="form" :model="form" :rules="rules"> 5 <el-form ref="form" :model="form" :rules="rules">
5 <el-row :gutter="24"> 6 <el-row :gutter="24">
6 <el-col :span="12"> 7 <el-col :span="12">
...@@ -217,15 +218,8 @@ export default { ...@@ -217,15 +218,8 @@ export default {
217 }, 218 },
218 close () { 219 close () {
219 this.resetForm() 220 this.resetForm()
220 this.visible = false 221 this.$emit('input', false)
221 } 222 }
222 } 223 }
223 } 224 }
224 </script> 225 </script>
225 <style scoped lang="scss">
226 .modifydialog {
227 &-con {
228 background: #031A46;
229 }
230 }
231 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
13 </el-form> 13 </el-form>
14 </div> 14 </div>
15 <div class="from-clues-content"> 15 <div class="from-clues-content">
16 <lb-table :pagination="false" :column="tableData.columns" :data="tablelistData" row-key="id" default-expand-all 16 <lb-table :pagination="false" :column="tableData.columns" :calcHeight="200" :data="tablelistData" row-key="id"
17 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"> 17 default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
18 </lb-table> 18 </lb-table>
19 </div> 19 </div>
20 <edit-dialog ref="dialogForm" v-model="isDialog" :product-id="productId" :resource-category-id="resourceCategoryId" 20 <edit-dialog ref="dialogForm" v-model="isDialog" :product-id="productId" :resource-category-id="resourceCategoryId"
...@@ -36,12 +36,10 @@ import { ...@@ -36,12 +36,10 @@ import {
36 findParents, 36 findParents,
37 removeTreeListItem, 37 removeTreeListItem,
38 } from "@/utils/operation"; 38 } from "@/utils/operation";
39 // import authorizationdiglog from "./authorizationdiglog.vue";
40 export default { 39 export default {
41 name: "menus", 40 name: "menus",
42 components: { 41 components: {
43 EditDialog, 42 EditDialog,
44 // authorizationdiglog,
45 }, 43 },
46 data () { 44 data () {
47 return { 45 return {
...@@ -74,8 +72,7 @@ export default { ...@@ -74,8 +72,7 @@ export default {
74 <div> 72 <div>
75 <el-button 73 <el-button
76 type="text" 74 type="text"
77 size="mini" 75 class='successColor'
78 icon="el-icon-edit"
79 onClick={() => { 76 onClick={() => {
80 this.handleEdit(scope.row); 77 this.handleEdit(scope.row);
81 }} 78 }}
...@@ -85,9 +82,7 @@ export default { ...@@ -85,9 +82,7 @@ export default {
85 82
86 <el-button 83 <el-button
87 type="text" 84 type="text"
88 size="mini" 85 class='delColor'
89 icon="el-icon-delete"
90 style="color:#F56C6C"
91 onClick={() => { 86 onClick={() => {
92 this.handleDelete(scope.row.id, scope.row.name); 87 this.handleDelete(scope.row.id, scope.row.name);
93 }} 88 }}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 </el-form> 13 </el-form>
14 </div> 14 </div>
15 <div class="from-clues-content"> 15 <div class="from-clues-content">
16 <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 16 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200" @p-current-change="handleCurrentChange"
17 :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" row-key="dictid"> 17 :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" row-key="dictid">
18 </lb-table> 18 </lb-table>
19 </div> 19 </div>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 24 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
25 :data="tableData.data"> 25 :data="tableData.data">
26 </lb-table> 26 </lb-table>
27 <add-task ref="task" :taskData="taskData" v-model="isDialog"/> 27 <add-task ref="task" :taskData="taskData" v-model="isDialog" />
28 </div> 28 </div>
29 </div> 29 </div>
30 </template> 30 </template>
...@@ -62,22 +62,26 @@ export default { ...@@ -62,22 +62,26 @@ export default {
62 render: (h, scope) => { 62 render: (h, scope) => {
63 return ( 63 return (
64 <div> 64 <div>
65 <el-button type="text" size="mini" 65 <el-button type="text"
66 v-show={scope.row.jobStatus === 0} 66 v-show={scope.row.jobStatus === 0}
67 class='btnColor'
67 icon="el-icon-video-pause" 68 icon="el-icon-video-pause"
68 onClick={() => { this.handleActive(scope.row) }}>激活 69 onClick={() => { this.handleActive(scope.row) }}>激活
69 </el-button> 70 </el-button>
70 <el-button type="text" size="mini" 71 <el-button type="text"
71 v-show={scope.row.jobStatus === -1} 72 v-show={scope.row.jobStatus === -1}
73 class='btnColor'
72 icon="el-icon-video-pause" 74 icon="el-icon-video-pause"
73 onClick={() => { this.recover(scope.row) }}>恢复 75 onClick={() => { this.recover(scope.row) }}>恢复
74 </el-button> 76 </el-button>
75 <el-button type="text" size="mini" 77 <el-button type="text"
76 icon="el-icon-edit" 78 icon="el-icon-edit"
79 class='btnColor'
77 onClick={() => { this.handleEdit(scope.row) }}>编辑 80 onClick={() => { this.handleEdit(scope.row) }}>编辑
78 </el-button> 81 </el-button>
79 <el-button type="text" size="mini" 82 <el-button type="text"
80 icon="el-icon-delete" style="color:#F56C6C" 83 icon="el-icon-delete"
84 class='successColor'
81 v-show={scope.row.jobStatus !== -1} 85 v-show={scope.row.jobStatus !== -1}
82 onClick={() => { this.handleDel(scope.row) }}>删除 86 onClick={() => { this.handleDel(scope.row) }}>删除
83 </el-button> 87 </el-button>
...@@ -100,7 +104,7 @@ export default { ...@@ -100,7 +104,7 @@ export default {
100 this.taskData = null 104 this.taskData = null
101 this.isDialog = true 105 this.isDialog = true
102 }, 106 },
103 resetSe() { 107 resetSe () {
104 this.form.jobName = '' 108 this.form.jobName = ''
105 this.featchData() 109 this.featchData()
106 }, 110 },
...@@ -114,7 +118,7 @@ export default { ...@@ -114,7 +118,7 @@ export default {
114 this.message = error 118 this.message = error
115 } 119 }
116 }, 120 },
117 recover(row) { 121 recover (row) {
118 this.$confirm('此操将进行恢复操作, 是否继续?', '提示', { 122 this.$confirm('此操将进行恢复操作, 是否继续?', '提示', {
119 confirmButtonText: '确定', 123 confirmButtonText: '确定',
120 cancelButtonText: '取消', 124 cancelButtonText: '取消',
...@@ -146,7 +150,7 @@ export default { ...@@ -146,7 +150,7 @@ export default {
146 }) 150 })
147 }, 151 },
148 152
149 handleActive(row) { 153 handleActive (row) {
150 this.$confirm('此操将进行激活操作, 是否继续?', '提示', { 154 this.$confirm('此操将进行激活操作, 是否继续?', '提示', {
151 confirmButtonText: '确定', 155 confirmButtonText: '确定',
152 cancelButtonText: '取消', 156 cancelButtonText: '取消',
......
1 <template> 1 <template>
2 <Dialog :title="title" class="modifydialog" :show.sync="visible" :width="'715px'" @close="close()"> 2 <dialogBox :title="title" class="modifydialog" @closeDialog="close" :isMain="true" @submitForm="submitForm"
3 <template slot="content"> 3 v-model="myValue">
4 <div class="dialogCon">
4 <el-form ref="form" :model="form" :rules="rules"> 5 <el-form ref="form" :model="form" :rules="rules">
5 <el-row :gutter="24"> 6 <el-row :gutter="24">
6 <el-col :span="11"> 7 <el-col :span="11">
...@@ -11,11 +12,8 @@ ...@@ -11,11 +12,8 @@
11 <el-col :span="13"> 12 <el-col :span="13">
12 <el-col :span="18" class="col-pd0"> 13 <el-col :span="18" class="col-pd0">
13 <el-form-item label="性别:" label-width="72px"> 14 <el-form-item label="性别:" label-width="72px">
14 <el-radio 15 <el-radio v-for="(item, index) in sexList" :key="index" v-model="form.sex" :label="item.value">{{
15 v-for="(item, index) in sexList" 16 item.name }}</el-radio>
16 :key="index"
17 v-model="form.sex"
18 :label="item.value">{{ item.name }}</el-radio>
19 </el-form-item> 17 </el-form-item>
20 </el-col> 18 </el-col>
21 <el-col :span="6"> 19 <el-col :span="6">
...@@ -31,10 +29,7 @@ ...@@ -31,10 +29,7 @@
31 </el-col> 29 </el-col>
32 <el-col :span="13"> 30 <el-col :span="13">
33 <el-form-item label="用户名:" prop="loginName" label-width="72px"> 31 <el-form-item label="用户名:" prop="loginName" label-width="72px">
34 <el-input 32 <el-input v-model="form.loginName" :disabled="showLoginName" placeholder="用户名" />
35 v-model="form.loginName"
36 :disabled="showLoginName"
37 placeholder="用户名" />
38 </el-form-item> 33 </el-form-item>
39 </el-col> 34 </el-col>
40 </el-row> 35 </el-row>
...@@ -45,27 +40,16 @@ ...@@ -45,27 +40,16 @@
45 </el-form-item> 40 </el-form-item>
46 </el-col> 41 </el-col>
47 <el-col :span="13"> 42 <el-col :span="13">
48 <el-form-item 43 <el-form-item label="手机号码:" prop="mobilePhone" label-width="72px">
49 label="手机号码:" 44 <el-input v-model="form.mobilePhone" placeholder="手机号码" />
50 prop="mobilePhone"
51 label-width="72px">
52 <el-input
53 v-model="form.mobilePhone"
54 placeholder="手机号码" />
55 </el-form-item> 45 </el-form-item>
56 </el-col> 46 </el-col>
57 </el-row> 47 </el-row>
58 <el-row :gutter="24"> 48 <el-row :gutter="24">
59 <el-col :span="11"> 49 <el-col :span="11">
60 <el-form-item label="最高职务级别:" label-width="100px"> 50 <el-form-item label="最高职务级别:" label-width="100px">
61 <el-select 51 <el-select v-model="form.jobLevel" placeholder="最高职务级别">
62 v-model="form.jobLevel" 52 <el-option v-for="item in levelList" :key="item.value" :label="item.name" :value="item.value" />
63 placeholder="最高职务级别">
64 <el-option
65 v-for="item in levelList"
66 :key="item.value"
67 :label="item.name"
68 :value="item.value" />
69 </el-select> 53 </el-select>
70 </el-form-item> 54 </el-form-item>
71 </el-col> 55 </el-col>
...@@ -77,32 +61,26 @@ ...@@ -77,32 +61,26 @@
77 </el-row> 61 </el-row>
78 <el-row :gutter="24"> 62 <el-row :gutter="24">
79 <el-col :span="24"> 63 <el-col :span="24">
80 <el-form-item 64 <el-form-item label="办公地点:" label-width="100px" class="form-item-mb0">
81 label="办公地点:"
82 label-width="100px"
83 class="form-item-mb0">
84 <el-input v-model="form.address" placeholder="办公地点" /> 65 <el-input v-model="form.address" placeholder="办公地点" />
85 </el-form-item> 66 </el-form-item>
86 </el-col> 67 </el-col>
87 </el-row> 68 </el-row>
88 </el-form> 69 </el-form>
89 </template> 70 </div>
90 <template slot="footer"> 71 </dialogBox>
91 <el-button type="primary" class="save" @click="submitForm(1)">保存</el-button>
92 <el-button class="cancel-button" @click="close()">取消</el-button>
93 </template>
94 </Dialog>
95 </template> 72 </template>
96 73
97 <script> 74 <script>
98 import { api, httpAction } from '@/api/manageApi' 75 import { api, httpAction } from '@/api/manageApi'
99 import Dialog from "@/components/Dialog/"; 76 export default {
100 export default {
101 name: "", 77 name: "",
102 components: { Dialog }, 78 props: {
103 props: {}, 79 value: { type: Boolean, default: false },
80 },
104 data () { 81 data () {
105 return { 82 return {
83 myValue: this.value,
106 form: { 84 form: {
107 sex: "0", 85 sex: "0",
108 }, 86 },
...@@ -115,7 +93,6 @@ ...@@ -115,7 +93,6 @@
115 ], 93 ],
116 }, 94 },
117 title: "修改", 95 title: "修改",
118 visible: false,
119 showLoginName: false, 96 showLoginName: false,
120 sexList: [{ lable: "0", value: "0", name: "男" }, { lable: "1", value: "1", name: "女" }], 97 sexList: [{ lable: "0", value: "0", name: "男" }, { lable: "1", value: "1", name: "女" }],
121 levelList: [{ lable: "0", value: "0", name: "干事" }, { lable: "1", value: "1", name: "经理" }], 98 levelList: [{ lable: "0", value: "0", name: "干事" }, { lable: "1", value: "1", name: "经理" }],
...@@ -127,35 +104,18 @@ ...@@ -127,35 +104,18 @@
127 return this.$store.state.user.userInfo; 104 return this.$store.state.user.userInfo;
128 }, 105 },
129 }, 106 },
130 watch: {}, 107 watch: {
131 created () { }, 108 value (val) {
132 mounted () { }, 109 this.myValue = val
110 }
111 },
133 methods: { 112 methods: {
134 // initDictConfig() {
135 // getDictItems('XB').then((res) => {
136 // if (res.status === 1) {
137 // this.sexList = res.content
138 // } else {
139 // this.$message.error({ message: res.message, showClose: true })
140 // }
141 // })
142 // getDictItems('ZWJB').then((res) => {
143 // if (res.status === 1) {
144 // this.levelList = res.content
145 // } else {
146 // this.$message.error({ message: res.message, showClose: true })
147 // }
148 // })
149 // },
150 // 添加人员 113 // 添加人员
151 adds () { 114 adds () {
152 this.visible = true;
153 // this.type = 0
154 this.showLoginName = false 115 this.showLoginName = false
155 }, 116 },
156 // 编辑 117 // 编辑
157 edit (record) { 118 edit (record) {
158 // this.initDictConfig()
159 this.showLoginName = true 119 this.showLoginName = true
160 // 若有id为编辑 120 // 若有id为编辑
161 if (record) { 121 if (record) {
...@@ -163,7 +123,6 @@ ...@@ -163,7 +123,6 @@
163 this.form = Object.assign({}, record) 123 this.form = Object.assign({}, record)
164 }) 124 })
165 } 125 }
166 this.visible = true
167 }, 126 },
168 handleChange (value) { 127 handleChange (value) {
169 this.form.departmentId = value; 128 this.form.departmentId = value;
...@@ -199,7 +158,6 @@ ...@@ -199,7 +158,6 @@
199 } 158 }
200 }) 159 })
201 } else { 160 } else {
202 console.log('提交错误!!!')
203 return false 161 return false
204 } 162 }
205 }) 163 })
...@@ -212,10 +170,9 @@ ...@@ -212,10 +170,9 @@
212 }, 170 },
213 close () { 171 close () {
214 this.resetForm() 172 this.resetForm()
215 this.visible = false 173 this.$emit('input', false)
216 } 174 }
217 }, 175 }
218 }; 176 }
219 </script> 177 </script>
220 <style scoped lang="scss"> 178 <style scoped lang="scss"></style>
221 </style>
......
...@@ -16,38 +16,32 @@ ...@@ -16,38 +16,32 @@
16 </el-form> 16 </el-form>
17 </div> 17 </div>
18 <div class="from-clues-content"> 18 <div class="from-clues-content">
19 <lb-table 19 <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
20 :pagination="false" 20 :column="tableData.columns" :data="tableData.data" :expand-row-keys="keyList" row-key="dictid">
21 @size-change="handleSizeChange"
22 @p-current-change="handleCurrentChange"
23 :column="tableData.columns"
24 :data="tableData.data"
25 :expand-row-keys="keyList"
26 row-key="dictid">
27 </lb-table> 21 </lb-table>
28 </div> 22 </div>
29 <EditDialog ref="dialogForm" @ok="reloadTableData" /> 23 <EditDialog ref="dialogForm" v-model="isDialog" @ok="reloadTableData" />
30 </div> 24 </div>
31 </template> 25 </template>
32 <script> 26 <script>
33 import { 27 import {
34 getUuid, 28 getUuid,
35 judgeSort, 29 judgeSort,
36 realMove, 30 realMove,
37 findParents, 31 findParents,
38 removeTreeListItem, 32 removeTreeListItem,
39 } from "@/utils/operation"; 33 } from "@/utils/operation";
40 import { 34 import {
41 resetPassword, 35 resetPassword,
42 getUserList, 36 getUserList,
43 } from "@/api/personnelManage"; 37 } from "@/api/personnelManage";
44 import { api, deleteAction } from '@/api/manageApi' 38 import { api, deleteAction } from '@/api/manageApi'
45 import data from "./data"; 39 import data from "./data";
46 import { deleteDomStr } from '@/utils/proDomStr' 40 import { deleteDomStr } from '@/utils/proDomStr'
47 import tableMixin from "@/mixins/tableMixin.js"; 41 import tableMixin from "@/mixins/tableMixin.js";
48 import EditDialog from "./edit-dialog.vue"; 42 import EditDialog from "./edit-dialog.vue";
49 import {updateOrder} from "@/api/orders" 43 import { updateOrder } from "@/api/orders"
50 export default { 44 export default {
51 name: "menus", 45 name: "menus",
52 mixins: [tableMixin], 46 mixins: [tableMixin],
53 components: { 47 components: {
...@@ -55,6 +49,7 @@ ...@@ -55,6 +49,7 @@
55 }, 49 },
56 data () { 50 data () {
57 return { 51 return {
52 isDialog: false,
58 taskData: null, 53 taskData: null,
59 keyList: [], 54 keyList: [],
60 form: { 55 form: {
...@@ -118,7 +113,7 @@ ...@@ -118,7 +113,7 @@
118 type="text" 113 type="text"
119 disabled={scope.row.isTop} 114 disabled={scope.row.isTop}
120 onClick={() => { 115 onClick={() => {
121 this.updateOrder(scope.row,'TOP'); 116 this.updateOrder(scope.row, 'TOP');
122 }} 117 }}
123 > 118 >
124 置顶 119 置顶
...@@ -127,7 +122,7 @@ ...@@ -127,7 +122,7 @@
127 type="text" 122 type="text"
128 disabled={scope.row.isTop} 123 disabled={scope.row.isTop}
129 onClick={() => { 124 onClick={() => {
130 this.updateOrder(scope.row,'UP'); 125 this.updateOrder(scope.row, 'UP');
131 }} 126 }}
132 > 127 >
133 上移 128 上移
...@@ -136,7 +131,7 @@ ...@@ -136,7 +131,7 @@
136 type="text" 131 type="text"
137 disabled={scope.row.isBottom} 132 disabled={scope.row.isBottom}
138 onClick={() => { 133 onClick={() => {
139 this.updateOrder(scope.row,'DOWN'); 134 this.updateOrder(scope.row, 'DOWN');
140 }} 135 }}
141 > 136 >
142 下移 137 下移
...@@ -145,7 +140,7 @@ ...@@ -145,7 +140,7 @@
145 type="text" 140 type="text"
146 disabled={scope.row.isBottom} 141 disabled={scope.row.isBottom}
147 onClick={() => { 142 onClick={() => {
148 this.updateOrder(scope.row,'BOTTOM'); 143 this.updateOrder(scope.row, 'BOTTOM');
149 }} 144 }}
150 > 145 >
151 置底 146 置底
...@@ -210,6 +205,7 @@ ...@@ -210,6 +205,7 @@
210 }, 205 },
211 methods: { 206 methods: {
212 handleAdd () { 207 handleAdd () {
208 this.isDialog = true
213 this.$refs.dialogForm.adds(); 209 this.$refs.dialogForm.adds();
214 this.$refs.dialogForm.title = "添加"; 210 this.$refs.dialogForm.title = "添加";
215 }, 211 },
...@@ -220,7 +216,6 @@ ...@@ -220,7 +216,6 @@
220 departmentId: this.departmentid.departmentId, 216 departmentId: this.departmentid.departmentId,
221 }; 217 };
222 getUserList(this.queryParam).then((res) => { 218 getUserList(this.queryParam).then((res) => {
223 console.log("人员列表", res);
224 if (res.status === 1) { 219 if (res.status === 1) {
225 this.loading = false; 220 this.loading = false;
226 this.tableData.data = res.content; 221 this.tableData.data = res.content;
...@@ -277,7 +272,7 @@ ...@@ -277,7 +272,7 @@
277 .catch(() => { }) 272 .catch(() => { })
278 }, 273 },
279 //排序 274 //排序
280 updateOrder(record, operate){ 275 updateOrder (record, operate) {
281 const findIndex = this.tableData.data.findIndex(item => item.id === record.id) 276 const findIndex = this.tableData.data.findIndex(item => item.id === record.id)
282 let swapId = '' 277 let swapId = ''
283 if (operate === 'UP') { 278 if (operate === 'UP') {
...@@ -296,6 +291,7 @@ ...@@ -296,6 +291,7 @@
296 }, 291 },
297 // 修改人员信息 292 // 修改人员信息
298 handleEdit (row) { 293 handleEdit (row) {
294 this.isDialog = true
299 this.$refs.dialogForm.edit(row); 295 this.$refs.dialogForm.edit(row);
300 this.$refs.dialogForm.title = "修改"; 296 this.$refs.dialogForm.title = "修改";
301 }, 297 },
...@@ -325,10 +321,10 @@ ...@@ -325,10 +321,10 @@
325 this.getTableList() 321 this.getTableList()
326 }, 322 },
327 }, 323 },
328 }; 324 };
329 </script> 325 </script>
330 <style scoped lang="scss"> 326 <style scoped lang="scss">
331 @import "~@/styles/mixin.scss"; 327 @import "~@/styles/mixin.scss";
332 @import "~@/styles/public.scss"; 328 @import "~@/styles/public.scss";
333 @import "./index.scss"; 329 @import "./index.scss";
334 </style> 330 </style>
......
...@@ -8,6 +8,8 @@ function resolve (dir) { ...@@ -8,6 +8,8 @@ function resolve (dir) {
8 const name = defaultSettings.title 8 const name = defaultSettings.title
9 const port = process.env.port || process.env.npm_config_port || 8888 // dev port 9 const port = process.env.port || process.env.npm_config_port || 8888 // dev port
10 10
11 const CopyWebpackPlugin = require('copy-webpack-plugin')
12
11 // All configuration item explanations can be find in https://cli.vuejs.org/config/ 13 // All configuration item explanations can be find in https://cli.vuejs.org/config/
12 module.exports = { 14 module.exports = {
13 /** 15 /**
...@@ -68,6 +70,7 @@ module.exports = { ...@@ -68,6 +70,7 @@ module.exports = {
68 '@': resolve('src') 70 '@': resolve('src')
69 } 71 }
70 }, 72 },
73 plugins: [new CopyWebpackPlugin({ patterns: [{ from: 'src/api/config.js', to: 'config.js'}] })],
71 devtool: '#eval-source-map' //测试 74 devtool: '#eval-source-map' //测试
72 }, 75 },
73 // chainWebpack通过链式编程的形式，来修改默认的webpack配置 76 // chainWebpack通过链式编程的形式，来修改默认的webpack配置
......