b13ffcef by renchao@pashanhoo.com

Merge branch 'dev'

2 parents d32e5582 7b080944
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 10:15:00 4 * @LastEditTime: 2023-09-19 13:13:16
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 style="width: 100%; margin-top: 10px">申请材料目录</el-button> 16 style="width: 100%; margin-top: 10px">申请材料目录</el-button>
17 <div class="item"> 17 <div class="item">
18 材料目录({{ tableData.length }}) 18 材料目录({{ tableData.length }})
19 <div style="margin-top: 10px"> 19 <div class="tableList">
20 <div 20 <div
21 style=" 21 style="
22 text-align: center; 22 text-align: center;
...@@ -401,7 +401,9 @@ ...@@ -401,7 +401,9 @@
401 width: 100%; 401 width: 100%;
402 height: 100%; 402 height: 100%;
403 display: flex; 403 display: flex;
404 404 .tableList {
405 margin-top: 10px;
406 }
405 .menu-tree { 407 .menu-tree {
406 width: 20%; 408 width: 20%;
407 min-width: 160px; 409 min-width: 160px;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div style="width:100%;height:100%;"> 7 <div style="width:100%;height:100%;">
8 <canvas id="mxcad" style="width:100%;height:100%; position: relative;top:0"> 8 <canvas id="mxcad" style="width:100%;height:100%;">
9 </canvas> 9 </canvas>
10 </div> 10 </div>
11 </template> 11 </template>
...@@ -33,6 +33,11 @@ ...@@ -33,6 +33,11 @@
33 isNewFile: true // 是否新建文件 33 isNewFile: true // 是否新建文件
34 }) 34 })
35 }) 35 })
36 } 36 },
37 } 37 }
38 </script>
...\ No newline at end of file ...\ No newline at end of file
38 </script>
39 <style scoped lang="scss">
40 #mxcad {
41 pointer-events: none;
42 }
43 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-14 17:19:40 4 * @LastEditTime: 2023-09-19 10:56:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -289,6 +289,17 @@ ...@@ -289,6 +289,17 @@
289 export default { 289 export default {
290 data () { 290 data () {
291 return { 291 return {
292 // 键名转换,方法默认是label和children进行树状渲染
293 normalizer (node) {
294 //方法
295 if (node.children == null || node.children == "null") {
296 delete node.children;
297 }
298 return {
299 id: node.dcode,
300 label: node.dname,
301 };
302 },
292 //表单是否可操作 303 //表单是否可操作
293 viewEdit: false, 304 viewEdit: false,
294 disabled: true, 305 disabled: true,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 10:44:12 4 * @LastEditTime: 2023-09-19 10:56:41
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -410,6 +410,17 @@ ...@@ -410,6 +410,17 @@
410 }, 410 },
411 data () { 411 data () {
412 return { 412 return {
413 // 键名转换,方法默认是label和children进行树状渲染
414 normalizer (node) {
415 //方法
416 if (node.children == null || node.children == "null") {
417 delete node.children;
418 }
419 return {
420 id: node.dcode,
421 label: node.dname,
422 };
423 },
413 loading: false, 424 loading: false,
414 //表单是否可操作 425 //表单是否可操作
415 viewEdit: true, 426 viewEdit: true,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 10:44:26 4 * @LastEditTime: 2023-09-19 10:56:59
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -285,6 +285,17 @@ ...@@ -285,6 +285,17 @@
285 }, 285 },
286 data () { 286 data () {
287 return { 287 return {
288 // 键名转换,方法默认是label和children进行树状渲染
289 normalizer (node) {
290 //方法
291 if (node.children == null || node.children == "null") {
292 delete node.children;
293 }
294 return {
295 id: node.dcode,
296 label: node.dname,
297 };
298 },
288 loading: false, 299 loading: false,
289 //表单是否可操作 300 //表单是否可操作
290 viewEdit: false, 301 viewEdit: false,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 10:28:39 4 * @LastEditTime: 2023-09-19 10:57:23
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -295,6 +295,17 @@ ...@@ -295,6 +295,17 @@
295 }, 295 },
296 data () { 296 data () {
297 return { 297 return {
298 // 键名转换,方法默认是label和children进行树状渲染
299 normalizer (node) {
300 //方法
301 if (node.children == null || node.children == "null") {
302 delete node.children;
303 }
304 return {
305 id: node.dcode,
306 label: node.dname,
307 };
308 },
298 loading: false, 309 loading: false,
299 mjdw: "1", 310 mjdw: "1",
300 //表单是否可操作 311 //表单是否可操作
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-09-19 10:44:45 5 * @LastEditTime: 2023-09-19 10:57:35
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -264,6 +264,17 @@ ...@@ -264,6 +264,17 @@
264 }, 264 },
265 data () { 265 data () {
266 return { 266 return {
267 // 键名转换,方法默认是label和children进行树状渲染
268 normalizer (node) {
269 //方法
270 if (node.children == null || node.children == "null") {
271 delete node.children;
272 }
273 return {
274 id: node.dcode,
275 label: node.dname,
276 };
277 },
267 //表单是否可操作 278 //表单是否可操作
268 viewEdit: false, 279 viewEdit: false,
269 disabled: true, 280 disabled: true,
......
...@@ -356,6 +356,17 @@ ...@@ -356,6 +356,17 @@
356 }, 356 },
357 data () { 357 data () {
358 return { 358 return {
359 // 键名转换,方法默认是label和children进行树状渲染
360 normalizer (node) {
361 //方法
362 if (node.children == null || node.children == "null") {
363 delete node.children;
364 }
365 return {
366 id: node.dcode,
367 label: node.dname,
368 };
369 },
359 loading: false, 370 loading: false,
360 disabled: true, 371 disabled: true,
361 //持证人选项 372 //持证人选项
......
...@@ -367,6 +367,17 @@ ...@@ -367,6 +367,17 @@
367 }, 367 },
368 data () { 368 data () {
369 return { 369 return {
370 // 键名转换,方法默认是label和children进行树状渲染
371 normalizer (node) {
372 //方法
373 if (node.children == null || node.children == "null") {
374 delete node.children;
375 }
376 return {
377 id: node.dcode,
378 label: node.dname,
379 };
380 },
370 //表单是否可操作 381 //表单是否可操作
371 viewEdit: true, 382 viewEdit: true,
372 disabled: true, 383 disabled: true,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 10:45:32 4 * @LastEditTime: 2023-09-19 10:58:26
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -395,6 +395,17 @@ ...@@ -395,6 +395,17 @@
395 }, 395 },
396 data () { 396 data () {
397 return { 397 return {
398 // 键名转换,方法默认是label和children进行树状渲染
399 normalizer (node) {
400 //方法
401 if (node.children == null || node.children == "null") {
402 delete node.children;
403 }
404 return {
405 id: node.dcode,
406 label: node.dname,
407 };
408 },
398 mjdw: "1", 409 mjdw: "1",
399 value2: { 410 value2: {
400 id: "520000198407304275", 411 id: "520000198407304275",
......