monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit d9b72c68af600841f08dae8fed4abd9711708b6b 2 parents 9ca17219 5391743f

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 30 changed files with 407 additions and 128 deletions
@@ -55,6 +55,30 @@ @@ -55,6 +55,30 @@
55 <ul class="icon_lists dib-box"> 55 <ul class="icon_lists dib-box">
56 56
57 <li class="dib"> 57 <li class="dib">
  58 + <span class="icon iconfont">&#xe67b;</span>
  59 + <div class="name">微信</div>
  60 + <div class="code-name">&amp;#xe67b;</div>
  61 + </li>
  62 +
  63 + <li class="dib">
  64 + <span class="icon iconfont">&#xe908;</span>
  65 + <div class="name">邮箱</div>
  66 + <div class="code-name">&amp;#xe908;</div>
  67 + </li>
  68 +
  69 + <li class="dib">
  70 + <span class="icon iconfont">&#xeb42;</span>
  71 + <div class="name">短信群发</div>
  72 + <div class="code-name">&amp;#xeb42;</div>
  73 + </li>
  74 +
  75 + <li class="dib">
  76 + <span class="icon iconfont">&#xea6f;</span>
  77 + <div class="name">业务资源拓扑</div>
  78 + <div class="code-name">&amp;#xea6f;</div>
  79 + </li>
  80 +
  81 + <li class="dib">
58 <span class="icon iconfont">&#xeb67;</span> 82 <span class="icon iconfont">&#xeb67;</span>
59 <div class="name">仪表盘</div> 83 <div class="name">仪表盘</div>
60 <div class="code-name">&amp;#xeb67;</div> 84 <div class="code-name">&amp;#xeb67;</div>
@@ -1410,9 +1434,9 @@ @@ -1410,9 +1434,9 @@
1410 <pre><code class="language-css" 1434 <pre><code class="language-css"
1411 >@font-face { 1435 >@font-face {
1412 font-family: 'iconfont'; 1436 font-family: 'iconfont';
1413 - src: url('iconfont.woff2?t=1639498542236') format('woff2'),  
1414 - url('iconfont.woff?t=1639498542236') format('woff'),  
1415 - url('iconfont.ttf?t=1639498542236') format('truetype'); 1437 + src: url('iconfont.woff2?t=1654501118919') format('woff2'),
  1438 + url('iconfont.woff?t=1654501118919') format('woff'),
  1439 + url('iconfont.ttf?t=1654501118919') format('truetype');
1416 } 1440 }
1417 </code></pre> 1441 </code></pre>
1418 <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3> 1442 <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1439,6 +1463,42 @@ @@ -1439,6 +1463,42 @@
1439 <ul class="icon_lists dib-box"> 1463 <ul class="icon_lists dib-box">
1440 1464
1441 <li class="dib"> 1465 <li class="dib">
  1466 + <span class="icon iconfont icon-weixin"></span>
  1467 + <div class="name">
  1468 + 微信
  1469 + </div>
  1470 + <div class="code-name">.icon-weixin
  1471 + </div>
  1472 + </li>
  1473 +
  1474 + <li class="dib">
  1475 + <span class="icon iconfont icon-youxiang"></span>
  1476 + <div class="name">
  1477 + 邮箱
  1478 + </div>
  1479 + <div class="code-name">.icon-youxiang
  1480 + </div>
  1481 + </li>
  1482 +
  1483 + <li class="dib">
  1484 + <span class="icon iconfont icon-duanxinqunfa"></span>
  1485 + <div class="name">
  1486 + 短信群发
  1487 + </div>
  1488 + <div class="code-name">.icon-duanxinqunfa
  1489 + </div>
  1490 + </li>
  1491 +
  1492 + <li class="dib">
  1493 + <span class="icon iconfont icon-yewuziyuantuopu"></span>
  1494 + <div class="name">
  1495 + 业务资源拓扑
  1496 + </div>
  1497 + <div class="code-name">.icon-yewuziyuantuopu
  1498 + </div>
  1499 + </li>
  1500 +
  1501 + <li class="dib">
1442 <span class="icon iconfont icon-yibiaopan"></span> 1502 <span class="icon iconfont icon-yibiaopan"></span>
1443 <div class="name"> 1503 <div class="name">
1444 仪表盘 1504 仪表盘
@@ -3474,6 +3534,38 @@ @@ -3474,6 +3534,38 @@
3474 3534
3475 <li class="dib"> 3535 <li class="dib">
3476 <svg class="icon svg-icon" aria-hidden="true"> 3536 <svg class="icon svg-icon" aria-hidden="true">
  3537 + <use xlink:href="#icon-weixin"></use>
  3538 + </svg>
  3539 + <div class="name">微信</div>
  3540 + <div class="code-name">#icon-weixin</div>
  3541 + </li>
  3542 +
  3543 + <li class="dib">
  3544 + <svg class="icon svg-icon" aria-hidden="true">
  3545 + <use xlink:href="#icon-youxiang"></use>
  3546 + </svg>
  3547 + <div class="name">邮箱</div>
  3548 + <div class="code-name">#icon-youxiang</div>
  3549 + </li>
  3550 +
  3551 + <li class="dib">
  3552 + <svg class="icon svg-icon" aria-hidden="true">
  3553 + <use xlink:href="#icon-duanxinqunfa"></use>
  3554 + </svg>
  3555 + <div class="name">短信群发</div>
  3556 + <div class="code-name">#icon-duanxinqunfa</div>
  3557 + </li>
  3558 +
  3559 + <li class="dib">
  3560 + <svg class="icon svg-icon" aria-hidden="true">
  3561 + <use xlink:href="#icon-yewuziyuantuopu"></use>
  3562 + </svg>
  3563 + <div class="name">业务资源拓扑</div>
  3564 + <div class="code-name">#icon-yewuziyuantuopu</div>
  3565 + </li>
  3566 +
  3567 + <li class="dib">
  3568 + <svg class="icon svg-icon" aria-hidden="true">
3477 <use xlink:href="#icon-yibiaopan"></use> 3569 <use xlink:href="#icon-yibiaopan"></use>
3478 </svg> 3570 </svg>
3479 <div class="name">仪表盘</div> 3571 <div class="name">仪表盘</div>
1 @font-face { 1 @font-face {
2 font-family: "iconfont"; /* Project id 2843738 */ 2 font-family: "iconfont"; /* Project id 2843738 */
3 - src: url('iconfont.woff2?t=1639498542236') format('woff2'),  
4 - url('iconfont.woff?t=1639498542236') format('woff'),  
5 - url('iconfont.ttf?t=1639498542236') format('truetype'); 3 + src: url('iconfont.woff2?t=1654501118919') format('woff2'),
  4 + url('iconfont.woff?t=1654501118919') format('woff'),
  5 + url('iconfont.ttf?t=1654501118919') format('truetype');
6 } 6 }
7 7
8 .iconfont { 8 .iconfont {
@@ -13,6 +13,22 @@ @@ -13,6 +13,22 @@
13 -moz-osx-font-smoothing: grayscale; 13 -moz-osx-font-smoothing: grayscale;
14 } 14 }
15 15
  16 +.icon-weixin:before {
  17 + content: "\e67b";
  18 +}
  19 +
  20 +.icon-youxiang:before {
  21 + content: "\e908";
  22 +}
  23 +
  24 +.icon-duanxinqunfa:before {
  25 + content: "\eb42";
  26 +}
  27 +
  28 +.icon-yewuziyuantuopu:before {
  29 + content: "\ea6f";
  30 +}
  31 +
16 .icon-yibiaopan:before { 32 .icon-yibiaopan:before {
17 content: "\eb67"; 33 content: "\eb67";
18 } 34 }
@@ -6,6 +6,34 @@ @@ -6,6 +6,34 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
  9 + "icon_id": "1206404",
  10 + "name": "微信",
  11 + "font_class": "weixin",
  12 + "unicode": "e67b",
  13 + "unicode_decimal": 59003
  14 + },
  15 + {
  16 + "icon_id": "4552970",
  17 + "name": "邮箱",
  18 + "font_class": "youxiang",
  19 + "unicode": "e908",
  20 + "unicode_decimal": 59656
  21 + },
  22 + {
  23 + "icon_id": "5387727",
  24 + "name": "短信群发",
  25 + "font_class": "duanxinqunfa",
  26 + "unicode": "eb42",
  27 + "unicode_decimal": 60226
  28 + },
  29 + {
  30 + "icon_id": "742139",
  31 + "name": "业务资源拓扑",
  32 + "font_class": "yewuziyuantuopu",
  33 + "unicode": "ea6f",
  34 + "unicode_decimal": 60015
  35 + },
  36 + {
9 "icon_id": "3868284", 37 "icon_id": "3868284",
10 "name": "仪表盘", 38 "name": "仪表盘",
11 "font_class": "yibiaopan", 39 "font_class": "yibiaopan",
@@ -19,6 +19,9 @@ @@ -19,6 +19,9 @@
19 </div> 19 </div>
20 </el-col> 20 </el-col>
21 </el-row> 21 </el-row>
  22 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  23 + {{item.ddicDesc}}
  24 +</el-row>
22 <el-row class="margin-bottom-50" style="margin-top: 3px"> 25 <el-row class="margin-bottom-50" style="margin-top: 3px">
23 <el-col :span="24" class="table-height"> 26 <el-col :span="24" class="table-height">
24 <cm-table-page :columns="data.columns" 27 <cm-table-page :columns="data.columns"
@@ -8,7 +8,12 @@ export default { @@ -8,7 +8,12 @@ export default {
8 }, 8 },
9 data() { 9 data() {
10 }, 10 },
11 - props: {}, 11 + props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
  16 + },
12 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
13 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
14 //列表高度 19 //列表高度
@@ -54,51 +59,43 @@ export default { @@ -54,51 +59,43 @@ export default {
54 }, { 59 }, {
55 prop: "subWay", 60 prop: "subWay",
56 label: "通知类型", 61 label: "通知类型",
57 - width: "200", 62 + width: "120",
58 sortable: true, 63 sortable: true,
59 align: 'center', 64 align: 'center',
60 render: function (row) { 65 render: function (row) {
61 switch (row.subWay){ 66 switch (row.subWay){
62 case 'wechat': 67 case 'wechat':
63 - return '<div class="small-icon small-icon-wechat"></div>' 68 + return '<div class="iconfont icon-weixin" style="font-size: 22px"></div>'
64 break; 69 break;
65 case 'email': 70 case 'email':
66 - return '<div class="small-icon small-icon-email"></div>' 71 + return '<div class="iconfont icon-youxiang" style="font-size: 22px"></div>'
67 break; 72 break;
68 case 'message': 73 case 'message':
69 - return '<div class="small-icon small-icon-msg"></div>' 74 + return '<div class="iconfont icon-duanxinqunfa" style="font-size: 22px"></div>'
70 break; 75 break;
71 } 76 }
72 } 77 }
73 - }, {  
74 - prop: "alarmTempTotal",  
75 - label: "订阅对象",  
76 - sortable: true,  
77 - align: 'center',  
78 - // render: (row) => {  
79 - // switch (row.alarmTempTotal) {  
80 - // case 0:  
81 - // return '否';  
82 - // case 1:  
83 - // return '是';  
84 - // default:  
85 - // return '';  
86 - // }  
87 - // }  
88 - }, { 78 + },{
89 prop: "tempType", 79 prop: "tempType",
90 label: "通知说明", 80 label: "通知说明",
  81 + width: "300",
91 sortable: true, 82 sortable: true,
92 align: 'center', 83 align: 'center',
93 - render: (row) => {  
94 - switch (row.tempType) { 84 + render: (d) => {
  85 + var sendWay = '';
  86 + switch (d.subWay){
95 case 'wechat': 87 case 'wechat':
96 - return '微信' 88 + sendWay = '微信'
  89 + break;
97 case 'email': 90 case 'email':
98 - return '邮箱';  
99 - case 'msg':  
100 - return '短信'; 91 + sendWay = '邮箱';
  92 + break;
  93 + case 'message':
  94 + sendWay = '短信';
  95 + break;
101 } 96 }
  97 + var unit = d.sentFrequency && d.sentFrequency.indexOf("?")>0?"":"分钟一次";
  98 + return `${sendWay}通知${d.sendTotal}次；频率${d.sentFrequency}${unit}`;
102 } 99 }
103 }, { 100 }, {
104 prop: "userTotal", 101 prop: "userTotal",
@@ -199,7 +196,7 @@ export default { @@ -199,7 +196,7 @@ export default {
199 196
200 data.value.searchParams.subId = arr.join(',') 197 data.value.searchParams.subId = arr.join(',')
201 proxy.$global.confirm("确定取消相关资源？", function () { 198 proxy.$global.confirm("确定取消相关资源？", function () {
202 - proxy.$global.showMsg('取消成功！'); 199 +
203 proxy.$http.post(`/api-web/personnelChange/remove/alarmSubPer`, data.value.searchParams , function (res) { 200 proxy.$http.post(`/api-web/personnelChange/remove/alarmSubPer`, data.value.searchParams , function (res) {
204 if (res && res.success) { 201 if (res && res.success) {
205 proxy.$global.showMsg('取消成功！'); 202 proxy.$global.showMsg('取消成功！');
@@ -19,6 +19,9 @@ @@ -19,6 +19,9 @@
19 </div> 19 </div>
20 </el-col> 20 </el-col>
21 </el-row> 21 </el-row>
  22 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  23 + {{item.ddicDesc}}
  24 +</el-row>
22 <el-row class="margin-bottom-50" style="margin-top: 3px"> 25 <el-row class="margin-bottom-50" style="margin-top: 3px">
23 <el-col :span="24" class="table-height"> 26 <el-col :span="24" class="table-height">
24 <cm-table-page :columns="data.columns" 27 <cm-table-page :columns="data.columns"
@@ -8,7 +8,12 @@ export default { @@ -8,7 +8,12 @@ export default {
8 }, 8 },
9 data() { 9 data() {
10 }, 10 },
11 - props: {}, 11 + props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
  16 + },
12 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
13 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
14 //列表高度 19 //列表高度
@@ -26,41 +31,69 @@ export default { @@ -26,41 +31,69 @@ export default {
26 columns: [{ 31 columns: [{
27 prop: "docName", 32 prop: "docName",
28 label: "文档名称", 33 label: "文档名称",
29 - width: "350", 34 + width: "300",
30 sortable: true, 35 sortable: true,
31 align: 'center' 36 align: 'center'
32 }, { 37 }, {
33 - prop: "frequency",  
34 - label: "CRON表达式",  
35 - width: "170",  
36 - sortable: true,  
37 - align: 'center'  
38 - },{  
39 -  
40 - prop: "handleHour",  
41 - label: "处理时常（时）",  
42 - width: "150", 38 + prop: "frequencyType",
  39 + label: "调度类型",
  40 + width: "120",
43 sortable: true, 41 sortable: true,
44 - align: 'center' 42 + align: 'center',
  43 + render:(d)=>{
  44 + switch (d.frequencyType) {
  45 + case 'quarter':
  46 + return '季度'
  47 + case 'month':
  48 + return '每月'
  49 + case 'day':
  50 + return '每日'
  51 + case 'hour':
  52 + return '小时'
  53 + case 'year':
  54 + return '每年'
  55 + case 'week':
  56 + return '每周'
  57 + }
  58 + }
45 }, { 59 }, {
46 prop: "inspectionType", 60 prop: "inspectionType",
47 - label: "巡检类型", 61 + label: "报表类型",
48 width: "100", 62 width: "100",
49 sortable: true, 63 sortable: true,
50 align: 'center', 64 align: 'center',
51 - render: (row) => {  
52 - switch (row.important) {  
53 - case '0':  
54 - return '自动巡检';  
55 - case '1':  
56 - return '人工巡检';  
57 - default:  
58 - return ''; 65 + render: (d) => {
  66 + switch (d.reportType) {
  67 + case 'yxjk':
  68 + return '运行监控'
  69 + case 'jkjc':
  70 + return '健康检查'
  71 + case 'lxwh':
  72 + return '例行维护'
  73 + case 'gzfx':
  74 + return '故障分析'
  75 + case 'fxbg':
  76 + return '分析报告'
59 } 77 }
60 } 78 }
61 }, { 79 }, {
  80 + prop: "runningFlag",
  81 + label: "启用/禁用",
  82 + width: "120",
  83 + sortable: true,
  84 + align: 'center',
  85 + render: (d) => {
  86 + switch (d.runningFlag) {
  87 + case '1':
  88 + return '启用'
  89 + default :
  90 + return '禁用'
  91 + }
  92 + }
  93 +
  94 + },{
62 prop: "templatePath", 95 prop: "templatePath",
63 - label: "文档地址", 96 + label: "模板地址",
64 sortable: true, 97 sortable: true,
65 align: 'left' 98 align: 'left'
66 }], 99 }],
@@ -139,7 +172,6 @@ export default { @@ -139,7 +172,6 @@ export default {
139 172
140 data.value.searchParams.reportId = arr.join(',') 173 data.value.searchParams.reportId = arr.join(',')
141 proxy.$global.confirm("确定取消相关资源？", function () { 174 proxy.$global.confirm("确定取消相关资源？", function () {
142 - proxy.$global.showMsg('取消成功！');  
143 proxy.$http.post(`/api-web/personnelChange/remove/autoPatrolPortPer`, data.value.searchParams, function (res) { 175 proxy.$http.post(`/api-web/personnelChange/remove/autoPatrolPortPer`, data.value.searchParams, function (res) {
144 if (res && res.success) { 176 if (res && res.success) {
145 proxy.$global.showMsg('取消成功！'); 177 proxy.$global.showMsg('取消成功！');
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 - <el-form-item style="margin-right: 6px;margin-bottom: 10px;">  
6 - <el-input v-model="search.keyword" placeholder="请输入业务名称"></el-input> 5 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
  6 + <el-input v-model="search.keyword" placeholder="关键字支持：业务名称"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <!--<el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <!--<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型"> 9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
@@ -16,17 +16,23 @@ @@ -16,17 +16,23 @@
16 </el-select> 16 </el-select>
17 </el-form-item>--> 17 </el-form-item>-->
18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
19 - <el-button @click="getListData" type="primary">查询</el-button> 19 + <el-button @click="getListData" >查询</el-button>
  20 + </el-form-item>
  21 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
  22 + <el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
20 </el-form-item> 23 </el-form-item>
21 </el-form> 24 </el-form>
22 </div> 25 </div>
23 </el-col> 26 </el-col>
24 </el-row> 27 </el-row>
25 -<el-row style="margin-bottom: 10px;"> 28 +<!--<el-row style="margin-bottom: 10px;">
26 <div class="flex-div-start"> 29 <div class="flex-div-start">
27 -<!-- <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>--> 30 +&lt;!&ndash; <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>&ndash;&gt;
28 <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button> 31 <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>
29 </div> 32 </div>
  33 +</el-row>-->
  34 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  35 + {{item.ddicDesc}}
30 </el-row> 36 </el-row>
31 <el-row class="margin-bottom-50" style="margin-top: 3px"> 37 <el-row class="margin-bottom-50" style="margin-top: 3px">
32 <el-col :span="24" class="table-height"> 38 <el-col :span="24" class="table-height">
@@ -9,6 +9,10 @@ export default { @@ -9,6 +9,10 @@ export default {
9 data() { 9 data() {
10 }, 10 },
11 props: { 11 props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
12 }, 16 },
13 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
14 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
@@ -259,4 +263,4 @@ export default { @@ -259,4 +263,4 @@ export default {
259 userName 263 userName
260 } 264 }
261 } 265 }
262 -}  
  266 +}
@@ -19,11 +19,13 @@ @@ -19,11 +19,13 @@
19 </div> 19 </div>
20 </el-col> 20 </el-col>
21 </el-row> 21 </el-row>
  22 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  23 + {{item.ddicDesc}}
  24 +</el-row>
22 <el-row class="margin-bottom-50" style="margin-top: 3px"> 25 <el-row class="margin-bottom-50" style="margin-top: 3px">
23 - <el-col :span="24" class="table-height"> 26 + <el-col :span="24" class="table-height tree-table">
24 <cm-table-page :columns="data.columns" 27 <cm-table-page :columns="data.columns"
25 :dataList="data.tableData" 28 :dataList="data.tableData"
26 - :treeProps="{ children: 'children', hasChildren: 'hasChildren' }"  
27 :total="data.count" 29 :total="data.count"
28 :pageSize="pageSize" 30 :pageSize="pageSize"
29 @loaddata="loadTableDataList" 31 @loaddata="loadTableDataList"
@@ -34,6 +36,8 @@ @@ -34,6 +36,8 @@
34 :loading="loading" 36 :loading="loading"
35 :showPage="true" 37 :showPage="true"
36 :showTools="false" 38 :showTools="false"
  39 + :getRowKeys="'busId'"
  40 + :defaultExpand="true"
37 :height="(height - 200)"> 41 :height="(height - 200)">
38 <template #default="{row,prop,column}"> 42 <template #default="{row,prop,column}">
39 </template> 43 </template>
@@ -8,7 +8,12 @@ export default { @@ -8,7 +8,12 @@ export default {
8 }, 8 },
9 data() { 9 data() {
10 }, 10 },
11 - props: {}, 11 + props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
  16 + },
12 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
13 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
14 //列表高度 19 //列表高度
@@ -28,7 +33,7 @@ export default { @@ -28,7 +33,7 @@ export default {
28 label: "名称", 33 label: "名称",
29 width: "250", 34 width: "250",
30 sortable: true, 35 sortable: true,
31 - align: 'center' 36 + align: 'left'
32 }, { 37 }, {
33 prop: "nickname", 38 prop: "nickname",
34 label: "负责人", 39 label: "负责人",
@@ -111,7 +116,6 @@ export default { @@ -111,7 +116,6 @@ export default {
111 }).sort(function (a, b) { 116 }).sort(function (a, b) {
112 return a.sort - b.sort 117 return a.sort - b.sort
113 }) 118 })
114 -  
115 dataVal.tableData = tableData; 119 dataVal.tableData = tableData;
116 dataVal.count = count; 120 dataVal.count = count;
117 } 121 }
@@ -174,7 +178,6 @@ export default { @@ -174,7 +178,6 @@ export default {
174 178
175 data.value.searchParams.busId = arr.join(',') 179 data.value.searchParams.busId = arr.join(',')
176 proxy.$global.confirm("确定取消相关资源？", function () { 180 proxy.$global.confirm("确定取消相关资源？", function () {
177 - proxy.$global.showMsg('取消成功！');  
178 proxy.$http.post(`/api-web/personnelChange/remove/bizPer`, data.value.searchParams , function (res) { 181 proxy.$http.post(`/api-web/personnelChange/remove/bizPer`, data.value.searchParams , function (res) {
179 if (res && res.success) { 182 if (res && res.success) {
180 proxy.$global.showMsg('取消成功！'); 183 proxy.$global.showMsg('取消成功！');
@@ -19,6 +19,9 @@ @@ -19,6 +19,9 @@
19 </div> 19 </div>
20 </el-col> 20 </el-col>
21 </el-row> 21 </el-row>
  22 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  23 + {{item.ddicDesc}}
  24 +</el-row>
22 <el-row class="margin-bottom-50" style="margin-top: 3px"> 25 <el-row class="margin-bottom-50" style="margin-top: 3px">
23 <el-col :span="24" class="table-height"> 26 <el-col :span="24" class="table-height">
24 <cm-table-page :columns="data.columns" 27 <cm-table-page :columns="data.columns"
@@ -8,7 +8,12 @@ export default { @@ -8,7 +8,12 @@ export default {
8 }, 8 },
9 data() { 9 data() {
10 }, 10 },
11 - props: {}, 11 + props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
  16 + },
12 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
13 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
14 //列表高度 19 //列表高度
@@ -122,7 +127,6 @@ export default { @@ -122,7 +127,6 @@ export default {
122 127
123 data.value.searchParams.docId = arr.join(',') 128 data.value.searchParams.docId = arr.join(',')
124 proxy.$global.confirm("确定取消相关资源？", function () { 129 proxy.$global.confirm("确定取消相关资源？", function () {
125 - proxy.$global.showMsg('取消成功！');  
126 proxy.$http.post(`/api-web/personnelChange/remove/fileManagePer`, data.value.searchParams, function (res) { 130 proxy.$http.post(`/api-web/personnelChange/remove/fileManagePer`, data.value.searchParams, function (res) {
127 if (res && res.success) { 131 if (res && res.success) {
128 proxy.$global.showMsg('取消成功！'); 132 proxy.$global.showMsg('取消成功！');
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 </el-row> 52 </el-row>
53 <el-row> 53 <el-row>
54 <el-col :span="24"> 54 <el-col :span="24">
55 - <component :is="activeName" ref="roomDetail" /> 55 + <component :is="activeName" :item="itemInfo" ref="roomDetail" />
56 </el-col> 56 </el-col>
57 </el-row> 57 </el-row>
58 </div> 58 </div>
@@ -88,4 +88,4 @@ @@ -88,4 +88,4 @@
88 </el-row> 88 </el-row>
89 89
90 </template> 90 </template>
91 -</cm-dialog>  
  91 +</cm-dialog>
@@ -42,13 +42,20 @@ export default { @@ -42,13 +42,20 @@ export default {
42 const {proxy} = Vue.getCurrentInstance(); 42 const {proxy} = Vue.getCurrentInstance();
43 const tabData=Vue.ref();//页签列表数据 43 const tabData=Vue.ref();//页签列表数据
44 const activeName = Vue.ref('');//标签页显示的页签名称 44 const activeName = Vue.ref('');//标签页显示的页签名称
  45 + let itemInfo = Vue.ref({});
45 let selectModel=Vue.ref([]);//导出列表选中的数据 46 let selectModel=Vue.ref([]);//导出列表选中的数据
46 let title=Vue.ref('导出列表');//导出列表弹框名称 47 let title=Vue.ref('导出列表');//导出列表弹框名称
47 let show=Vue.ref(false);//导出列表弹框是否显示 48 let show=Vue.ref(false);//导出列表弹框是否显示
48 let isAll=Vue.ref(1);//导出全部或者部分 49 let isAll=Vue.ref(1);//导出全部或者部分
49 //页签点击事件 50 //页签点击事件
50 const handleClick = (tab, event) => { 51 const handleClick = (tab, event) => {
51 - console.log(tab, event) 52 + //console.log(tab, event)
  53 + let code = tab.props.name;
  54 + tabData.value.filter((item) =>{
  55 + if(item.ddicCode == code) {
  56 + itemInfo.value = item;
  57 + }
  58 + })
52 } 59 }
53 //导出点击事件 60 //导出点击事件
54 const exportClick=()=>{ 61 const exportClick=()=>{
@@ -89,6 +96,7 @@ export default { @@ -89,6 +96,7 @@ export default {
89 if (res && res.data && res.data.length>0) { 96 if (res && res.data && res.data.length>0) {
90 tabData.value = res.data.sort((a,b)=>a.ddicSort-b.ddicSort); 97 tabData.value = res.data.sort((a,b)=>a.ddicSort-b.ddicSort);
91 activeName.value=tabData.value[0].ddicCode; 98 activeName.value=tabData.value[0].ddicCode;
  99 + itemInfo.value = tabData.value[0];
92 } 100 }
93 }) 101 })
94 } 102 }
@@ -108,7 +116,8 @@ export default { @@ -108,7 +116,8 @@ export default {
108 hidedialog, 116 hidedialog,
109 okExport, 117 okExport,
110 clickAll, 118 clickAll,
111 - isAll 119 + isAll,
  120 + itemInfo
112 } 121 }
113 } 122 }
114 -}  
  123 +}
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 - <el-form-item style="margin-right: 6px;margin-bottom: 10px;">  
6 - <el-input v-model="search.keyword" placeholder="请输入资源名称/ip"></el-input> 5 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
  6 + <el-input v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型"> 9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
@@ -16,17 +16,28 @@ @@ -16,17 +16,28 @@
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
19 - <el-button @click="getListData" type="primary">查询</el-button> 19 + <el-button @click="getListData">查询</el-button>
  20 + </el-form-item>
  21 +
  22 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
  23 + <el-button type="primary" @click="changeCancel()" >取消</el-button>
  24 + </el-form-item>
  25 +
  26 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
  27 + <el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
20 </el-form-item> 28 </el-form-item>
21 </el-form> 29 </el-form>
22 </div> 30 </div>
23 </el-col> 31 </el-col>
24 </el-row> 32 </el-row>
25 -<el-row style="margin-bottom: 10px;"> 33 +<!--<el-row style="margin-bottom: 10px;">
26 <div class="flex-div-start"> 34 <div class="flex-div-start">
27 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button> 35 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>
28 <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button> 36 <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>
29 </div> 37 </div>
  38 +</el-row>-->
  39 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  40 + {{item.ddicDesc}}
30 </el-row> 41 </el-row>
31 <el-row class="margin-bottom-50" style="margin-top: 3px"> 42 <el-row class="margin-bottom-50" style="margin-top: 3px">
32 <el-col :span="24" class="table-height"> 43 <el-col :span="24" class="table-height">
@@ -9,6 +9,10 @@ export default { @@ -9,6 +9,10 @@ export default {
9 data() { 9 data() {
10 }, 10 },
11 props: { 11 props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
12 }, 16 },
13 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
14 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
@@ -44,6 +48,12 @@ export default { @@ -44,6 +48,12 @@ export default {
44 label: '资源名称', 48 label: '资源名称',
45 sortable: true, 49 sortable: true,
46 align: 'center', 50 align: 'center',
  51 + render: function (row) {
  52 + if(!row.resName){
  53 + return row.resCode;
  54 + }
  55 + return row.resName;
  56 + }
47 }, 57 },
48 { 58 {
49 prop: 'ip', 59 prop: 'ip',
@@ -59,15 +69,29 @@ export default { @@ -59,15 +69,29 @@ export default {
59 }, 69 },
60 { 70 {
61 prop: 'resMainAdmin', 71 prop: 'resMainAdmin',
62 - label: '主负责人',  
63 - sortable: true,  
64 - align: 'center',  
65 - },  
66 - {  
67 - prop: 'resAuxiliaryAdmin',  
68 - label: '辅负责人', 72 + label: '负责人',
69 sortable: true, 73 sortable: true,
70 align: 'center', 74 align: 'center',
  75 + render: function (row) {
  76 + let text = "";
  77 + let preFix = "";
  78 + if(row.resMainAdmin && row.resMainAdmin.includes(userName.value)){
  79 + // 主要负责人
  80 + text = row.resMainAdmin
  81 + preFix = "主";
  82 + } else {
  83 + // 辅负责人
  84 + text = row.resAuxiliaryAdmin
  85 + preFix = "辅";
  86 + }
  87 +
  88 + return `<div style="display: flex">
  89 + <div style='width: 22px;height: 22px;border-radius: 50%;line-height: 22px;border: solid 1px #5fafff;font-size: 12px;font-weight: bold;margin-right: 3px'>
  90 + ${preFix}
  91 + </div>
  92 + ${text}
  93 + </div>`;
  94 + }
71 }, 95 },
72 { 96 {
73 prop: 'resTypeName', 97 prop: 'resTypeName',
@@ -94,8 +118,8 @@ export default { @@ -94,8 +118,8 @@ export default {
94 } 118 }
95 }, 119 },
96 { 120 {
97 - prop: 'paramDesc',  
98 - label: '展示类型', 121 + prop: 'resCategory',
  122 + label: '资源分类',
99 sortable: true, 123 sortable: true,
100 align: 'center', 124 align: 'center',
101 /* render: function (row) { 125 /* render: function (row) {
@@ -140,23 +164,6 @@ export default { @@ -140,23 +164,6 @@ export default {
140 arr.push(item.resId) 164 arr.push(item.resId)
141 }) 165 })
142 resIds.value=arr.join(",");//选中的值 166 resIds.value=arr.join(",");//选中的值
143 - /*proxy.resourceData.map((v, i) => {  
144 - v.checked = false;  
145 - });  
146 - let selectData = val;  
147 - if (selectData.length > 0) {  
148 - selectData.map((item, index) => {  
149 - proxy.resourceData.map((v, i) => {  
150 - if (item.id == v.id) {  
151 - v.checked = true;  
152 - }  
153 - })  
154 - })  
155 - } else {  
156 - proxy.resourceData.map((v, i) => {  
157 - v.checked = false;  
158 - })  
159 - }*/  
160 } 167 }
161 //获取资源类型数据 168 //获取资源类型数据
162 let getResourceTypoe=()=>{ 169 let getResourceTypoe=()=>{
@@ -269,4 +276,4 @@ export default { @@ -269,4 +276,4 @@ export default {
269 userName 276 userName
270 } 277 }
271 } 278 }
272 -}  
  279 +}
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 - <el-form-item style="margin-right: 6px;margin-bottom: 10px;">  
6 - <el-input v-model="search.keyword" placeholder="请输入资源名称/ip"></el-input> 5 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
  6 + <el-input v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型"> 9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
@@ -16,17 +16,26 @@ @@ -16,17 +16,26 @@
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
19 - <el-button @click="getListData" type="primary">查询</el-button> 19 + <el-button @click="getListData" >查询</el-button>
  20 + </el-form-item>
  21 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
  22 + <el-button type="primary" @click="changeCancel()">取消</el-button>
  23 + </el-form-item>
  24 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
  25 + <el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
20 </el-form-item> 26 </el-form-item>
21 </el-form> 27 </el-form>
22 </div> 28 </div>
23 </el-col> 29 </el-col>
24 </el-row> 30 </el-row>
25 -<el-row style="margin-bottom: 10px;"> 31 +<!--<el-row style="margin-bottom: 10px;">
26 <div class="flex-div-start"> 32 <div class="flex-div-start">
27 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button> 33 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>
28 <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button> 34 <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>
29 </div> 35 </div>
  36 +</el-row>-->
  37 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  38 + {{item.ddicDesc}}
30 </el-row> 39 </el-row>
31 <el-row class="margin-bottom-50" style="margin-top: 3px"> 40 <el-row class="margin-bottom-50" style="margin-top: 3px">
32 <el-col :span="24" class="table-height"> 41 <el-col :span="24" class="table-height">
@@ -9,6 +9,10 @@ export default { @@ -9,6 +9,10 @@ export default {
9 data() { 9 data() {
10 }, 10 },
11 props: { 11 props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
12 }, 16 },
13 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
14 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
@@ -264,4 +268,4 @@ export default { @@ -264,4 +268,4 @@ export default {
264 userName 268 userName
265 } 269 }
266 } 270 }
267 -}  
  271 +}
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 - <el-form-item style="margin-right: 6px;margin-bottom: 10px;">  
6 - <el-input v-model="search.keyword" placeholder="请输入资源类型"></el-input> 5 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
  6 + <el-input v-model="search.keyword" placeholder="关键字支持：资源类型名称"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <!-- <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <!-- <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型"> 9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
@@ -16,17 +16,26 @@ @@ -16,17 +16,26 @@
16 </el-select> 16 </el-select>
17 </el-form-item>--> 17 </el-form-item>-->
18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
19 - <el-button @click="getListData" type="primary">查询</el-button> 19 + <el-button @click="getListData">查询</el-button>
  20 + </el-form-item>
  21 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
  22 + <el-button type="primary" @click="changeCancel()" >取消</el-button>
  23 + </el-form-item>
  24 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
  25 + <el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
20 </el-form-item> 26 </el-form-item>
21 </el-form> 27 </el-form>
22 </div> 28 </div>
23 </el-col> 29 </el-col>
24 </el-row> 30 </el-row>
25 -<el-row style="margin-bottom: 10px;"> 31 +<!--<el-row style="margin-bottom: 10px;">
26 <div class="flex-div-start"> 32 <div class="flex-div-start">
27 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button> 33 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>
28 <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button> 34 <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>
29 </div> 35 </div>
  36 +</el-row>-->
  37 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  38 + {{item.ddicDesc}}
30 </el-row> 39 </el-row>
31 <el-row class="margin-bottom-50" style="margin-top: 3px"> 40 <el-row class="margin-bottom-50" style="margin-top: 3px">
32 <el-col :span="24" class="table-height tree-table"> 41 <el-col :span="24" class="table-height tree-table">
@@ -9,6 +9,10 @@ export default { @@ -9,6 +9,10 @@ export default {
9 data() { 9 data() {
10 }, 10 },
11 props: { 11 props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
12 }, 16 },
13 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
14 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
@@ -323,4 +327,4 @@ export default { @@ -323,4 +327,4 @@ export default {
323 loadTableDataList, 327 loadTableDataList,
324 } 328 }
325 } 329 }
326 -}  
  330 +}
1 -<!--<el-row> 1 +<el-row>
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
  5 + <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
  6 + <el-input v-model="search.keyword" placeholder="关键字支持：角色名称"></el-input>
  7 + </el-form-item>
5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
6 - <el-input v-model="search.keyword" placeholder="请输入角色名称"></el-input> 9 + <el-button @click="getListData" >查询</el-button>
7 </el-form-item> 10 </el-form-item>
8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 - <el-button @click="getListData" type="primary">查询</el-button> 12 + <el-button type="primary" @click="changeCancel()" >取消</el-button>
10 </el-form-item> 13 </el-form-item>
11 </el-form> 14 </el-form>
12 </div> 15 </div>
13 </el-col> 16 </el-col>
14 -</el-row>-->  
15 -<el-row style="margin-bottom: 10px;"> 17 +</el-row>
  18 +<!--<el-row style="margin-bottom: 10px;">
16 <div class="flex-div-start"> 19 <div class="flex-div-start">
17 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button> 20 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>
18 -<!-- <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>--> 21 +&lt;!&ndash; <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>&ndash;&gt;
19 </div> 22 </div>
  23 +</el-row>-->
  24 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  25 + {{item.ddicDesc}}
20 </el-row> 26 </el-row>
21 <el-row class="margin-bottom-50" style="margin-top: 3px"> 27 <el-row class="margin-bottom-50" style="margin-top: 3px">
22 <el-col :span="24" class="table-height"> 28 <el-col :span="24" class="table-height">
@@ -9,6 +9,10 @@ export default { @@ -9,6 +9,10 @@ export default {
9 data() { 9 data() {
10 }, 10 },
11 props: { 11 props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
12 }, 16 },
13 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
14 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
@@ -42,6 +46,18 @@ export default { @@ -42,6 +46,18 @@ export default {
42 label: '角色名称', 46 label: '角色名称',
43 sortable: true, 47 sortable: true,
44 align: 'center', 48 align: 'center',
  49 + },
  50 + {
  51 + prop: 'code',
  52 + label: '角色编码',
  53 + sortable: true,
  54 + align: 'center',
  55 + },
  56 + {
  57 + prop: 'remark',
  58 + label: '角色备注',
  59 + sortable: true,
  60 + align: 'center',
45 } 61 }
46 ]; 62 ];
47 63
@@ -161,4 +177,4 @@ export default { @@ -161,4 +177,4 @@ export default {
161 userName 177 userName
162 } 178 }
163 } 179 }
164 -}  
  180 +}
@@ -19,6 +19,9 @@ @@ -19,6 +19,9 @@
19 </div> 19 </div>
20 </el-col> 20 </el-col>
21 </el-row> 21 </el-row>
  22 +<el-row style="font-size: 12px;color: grey;padding: 6px;">
  23 + {{item.ddicDesc}}
  24 +</el-row>
22 <el-row class="margin-bottom-50" style="margin-top: 3px"> 25 <el-row class="margin-bottom-50" style="margin-top: 3px">
23 <el-col :span="24" class="table-height"> 26 <el-col :span="24" class="table-height">
24 <cm-table-page :columns="data.columns" 27 <cm-table-page :columns="data.columns"
@@ -8,7 +8,12 @@ export default { @@ -8,7 +8,12 @@ export default {
8 }, 8 },
9 data() { 9 data() {
10 }, 10 },
11 - props: {}, 11 + props: {
  12 + item:{
  13 + type:Object,
  14 + default:{}
  15 + }
  16 + },
12 setup: function (props, {attrs, slots, emit}) { 17 setup: function (props, {attrs, slots, emit}) {
13 const {proxy} = Vue.getCurrentInstance(); 18 const {proxy} = Vue.getCurrentInstance();
14 //列表高度 19 //列表高度
@@ -174,7 +179,6 @@ export default { @@ -174,7 +179,6 @@ export default {
174 179
175 data.value.searchParams.busId = arr.join(',') 180 data.value.searchParams.busId = arr.join(',')
176 proxy.$global.confirm("确定取消相关资源？", function () { 181 proxy.$global.confirm("确定取消相关资源？", function () {
177 - proxy.$global.showMsg('取消成功！');  
178 proxy.$http.post(`/api-web/personnelChange/remove/topoPer`, data.value.searchParams , function (res) { 182 proxy.$http.post(`/api-web/personnelChange/remove/topoPer`, data.value.searchParams , function (res) {
179 if (res && res.success) { 183 if (res && res.success) {
180 proxy.$global.showMsg('取消成功！'); 184 proxy.$global.showMsg('取消成功！');
1 -  
2 spring: 1 spring:
3 application: 2 application:
4 name: zjweb 3 name: zjweb
@@ -22,6 +21,8 @@ url: @@ -22,6 +21,8 @@ url:
22 workflow: http://192.168.0.248:8002 21 workflow: http://192.168.0.248:8002
23 # 积木报表工具 22 # 积木报表工具
24 jimuReport: http://192.168.0.41:8085 23 jimuReport: http://192.168.0.41:8085
  24 + # aj配置
  25 + ajWeb: http://127.0.0.1:9528
25 config: 26 config:
26 layer: 27 layer:
27 load: 28 load:
@@ -31,4 +32,5 @@ config: @@ -31,4 +32,5 @@ config:
31 tingyun: 32 tingyun:
32 api_key: aZipZbC18BhpG5GrjtiFAtThL1I0OUfn 33 api_key: aZipZbC18BhpG5GrjtiFAtThL1I0OUfn
33 secret_key: nbxay44wx8c3x4n5wcxe63mp87a72xed 34 secret_key: nbxay44wx8c3x4n5wcxe63mp87a72xed
  35 + # 停机模式正则剔除特殊字符(添加时在“]/g”之前添加)
34 regular: /[`~!@#$^&*()=|{}':;',\\\[\]\.<>\/?~！@#￥……&*（）——|{}【】'；：""'。，、？\s ]/g 36 regular: /[`~!@#$^&*()=|{}':;',\\\[\]\.<>\/?~！@#￥……&*（）——|{}【】'；：""'。，、？\s ]/g