monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit f6196617f8ba2cbd56a4d5bc3d6b4229a88cf88b 1 parent d01fcf8a

【1162】实现页面批量更改主辅负责人的操作，在各组更换业务相关负责人时，能在页面进行批量更改

Inline Side-by-side
Showing 19 changed files with 308 additions and 115 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",
@@ -54,51 +54,43 @@ export default { @@ -54,51 +54,43 @@ export default {
54 }, { 54 }, {
55 prop: "subWay", 55 prop: "subWay",
56 label: "通知类型", 56 label: "通知类型",
57 - width: "200", 57 + width: "120",
58 sortable: true, 58 sortable: true,
59 align: 'center', 59 align: 'center',
60 render: function (row) { 60 render: function (row) {
61 switch (row.subWay){ 61 switch (row.subWay){
62 case 'wechat': 62 case 'wechat':
63 - return '<div class="small-icon small-icon-wechat"></div>' 63 + return '<div class="iconfont icon-weixin" style="font-size: 22px"></div>'
64 break; 64 break;
65 case 'email': 65 case 'email':
66 - return '<div class="small-icon small-icon-email"></div>' 66 + return '<div class="iconfont icon-youxiang" style="font-size: 22px"></div>'
67 break; 67 break;
68 case 'message': 68 case 'message':
69 - return '<div class="small-icon small-icon-msg"></div>' 69 + return '<div class="iconfont icon-duanxinqunfa" style="font-size: 22px"></div>'
70 break; 70 break;
71 } 71 }
72 } 72 }
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 - }, { 73 + },{
89 prop: "tempType", 74 prop: "tempType",
90 label: "通知说明", 75 label: "通知说明",
  76 + width: "300",
91 sortable: true, 77 sortable: true,
92 align: 'center', 78 align: 'center',
93 - render: (row) => {  
94 - switch (row.tempType) { 79 + render: (d) => {
  80 + var sendWay = '';
  81 + switch (d.subWay){
95 case 'wechat': 82 case 'wechat':
96 - return '微信' 83 + sendWay = '微信'
  84 + break;
97 case 'email': 85 case 'email':
98 - return '邮箱';  
99 - case 'msg':  
100 - return '短信'; 86 + sendWay = '邮箱';
  87 + break;
  88 + case 'message':
  89 + sendWay = '短信';
  90 + break;
101 } 91 }
  92 + var unit = d.sentFrequency && d.sentFrequency.indexOf("?")>0?"":"分钟一次";
  93 + return `${sendWay}通知${d.sendTotal}次；频率${d.sentFrequency}${unit}`;
102 } 94 }
103 }, { 95 }, {
104 prop: "userTotal", 96 prop: "userTotal",
@@ -199,7 +191,7 @@ export default { @@ -199,7 +191,7 @@ export default {
199 191
200 data.value.searchParams.subId = arr.join(',') 192 data.value.searchParams.subId = arr.join(',')
201 proxy.$global.confirm("确定取消相关资源？", function () { 193 proxy.$global.confirm("确定取消相关资源？", function () {
202 - proxy.$global.showMsg('取消成功！'); 194 +
203 proxy.$http.post(`/api-web/personnelChange/remove/alarmSubPer`, data.value.searchParams , function (res) { 195 proxy.$http.post(`/api-web/personnelChange/remove/alarmSubPer`, data.value.searchParams , function (res) {
204 if (res && res.success) { 196 if (res && res.success) {
205 proxy.$global.showMsg('取消成功！'); 197 proxy.$global.showMsg('取消成功！');
@@ -26,41 +26,69 @@ export default { @@ -26,41 +26,69 @@ export default {
26 columns: [{ 26 columns: [{
27 prop: "docName", 27 prop: "docName",
28 label: "文档名称", 28 label: "文档名称",
29 - width: "350", 29 + width: "300",
30 sortable: true, 30 sortable: true,
31 align: 'center' 31 align: 'center'
32 }, { 32 }, {
33 - prop: "frequency",  
34 - label: "CRON表达式",  
35 - width: "170", 33 + prop: "frequencyType",
  34 + label: "调度类型",
  35 + width: "120",
36 sortable: true, 36 sortable: true,
37 - align: 'center'  
38 - },{  
39 -  
40 - prop: "handleHour",  
41 - label: "处理时常（时）",  
42 - width: "150",  
43 - sortable: true,  
44 - align: 'center' 37 + align: 'center',
  38 + render:(d)=>{
  39 + switch (d.frequencyType) {
  40 + case 'quarter':
  41 + return '季度'
  42 + case 'month':
  43 + return '每月'
  44 + case 'day':
  45 + return '每日'
  46 + case 'hour':
  47 + return '小时'
  48 + case 'year':
  49 + return '每年'
  50 + case 'week':
  51 + return '每周'
  52 + }
  53 + }
45 }, { 54 }, {
46 prop: "inspectionType", 55 prop: "inspectionType",
47 - label: "巡检类型", 56 + label: "报表类型",
48 width: "100", 57 width: "100",
49 sortable: true, 58 sortable: true,
50 align: 'center', 59 align: 'center',
51 - render: (row) => {  
52 - switch (row.important) {  
53 - case '0':  
54 - return '自动巡检';  
55 - case '1':  
56 - return '人工巡检';  
57 - default:  
58 - return ''; 60 + render: (d) => {
  61 + switch (d.reportType) {
  62 + case 'yxjk':
  63 + return '运行监控'
  64 + case 'jkjc':
  65 + return '健康检查'
  66 + case 'lxwh':
  67 + return '例行维护'
  68 + case 'gzfx':
  69 + return '故障分析'
  70 + case 'fxbg':
  71 + return '分析报告'
59 } 72 }
60 } 73 }
61 }, { 74 }, {
  75 + prop: "runningFlag",
  76 + label: "启用/禁用",
  77 + width: "120",
  78 + sortable: true,
  79 + align: 'center',
  80 + render: (d) => {
  81 + switch (d.runningFlag) {
  82 + case '1':
  83 + return '启用'
  84 + default :
  85 + return '禁用'
  86 + }
  87 + }
  88 +
  89 + },{
62 prop: "templatePath", 90 prop: "templatePath",
63 - label: "文档地址", 91 + label: "模板地址",
64 sortable: true, 92 sortable: true,
65 align: 'left' 93 align: 'left'
66 }], 94 }],
@@ -139,7 +167,6 @@ export default { @@ -139,7 +167,6 @@ export default {
139 167
140 data.value.searchParams.reportId = arr.join(',') 168 data.value.searchParams.reportId = arr.join(',')
141 proxy.$global.confirm("确定取消相关资源？", function () { 169 proxy.$global.confirm("确定取消相关资源？", function () {
142 - proxy.$global.showMsg('取消成功！');  
143 proxy.$http.post(`/api-web/personnelChange/remove/autoPatrolPortPer`, data.value.searchParams, function (res) { 170 proxy.$http.post(`/api-web/personnelChange/remove/autoPatrolPortPer`, data.value.searchParams, function (res) {
144 if (res && res.success) { 171 if (res && res.success) {
145 proxy.$global.showMsg('取消成功！'); 172 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,18 +16,21 @@ @@ -16,18 +16,21 @@
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>
30 -</el-row> 33 +</el-row>-->
31 <el-row class="margin-bottom-50" style="margin-top: 3px"> 34 <el-row class="margin-bottom-50" style="margin-top: 3px">
32 <el-col :span="24" class="table-height"> 35 <el-col :span="24" class="table-height">
33 <cm-table-page :columns="columns" 36 <cm-table-page :columns="columns"
@@ -174,7 +174,6 @@ export default { @@ -174,7 +174,6 @@ export default {
174 174
175 data.value.searchParams.busId = arr.join(',') 175 data.value.searchParams.busId = arr.join(',')
176 proxy.$global.confirm("确定取消相关资源？", function () { 176 proxy.$global.confirm("确定取消相关资源？", function () {
177 - proxy.$global.showMsg('取消成功！');  
178 proxy.$http.post(`/api-web/personnelChange/remove/bizPer`, data.value.searchParams , function (res) { 177 proxy.$http.post(`/api-web/personnelChange/remove/bizPer`, data.value.searchParams , function (res) {
179 if (res && res.success) { 178 if (res && res.success) {
180 proxy.$global.showMsg('取消成功！'); 179 proxy.$global.showMsg('取消成功！');
@@ -122,7 +122,6 @@ export default { @@ -122,7 +122,6 @@ export default {
122 122
123 data.value.searchParams.docId = arr.join(',') 123 data.value.searchParams.docId = arr.join(',')
124 proxy.$global.confirm("确定取消相关资源？", function () { 124 proxy.$global.confirm("确定取消相关资源？", function () {
125 - proxy.$global.showMsg('取消成功！');  
126 proxy.$http.post(`/api-web/personnelChange/remove/fileManagePer`, data.value.searchParams, function (res) { 125 proxy.$http.post(`/api-web/personnelChange/remove/fileManagePer`, data.value.searchParams, function (res) {
127 if (res && res.success) { 126 if (res && res.success) {
128 proxy.$global.showMsg('取消成功！'); 127 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="请输入资源名称/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,18 +16,26 @@ @@ -16,18 +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 +
  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>
30 -</el-row> 38 +</el-row>-->
31 <el-row class="margin-bottom-50" style="margin-top: 3px"> 39 <el-row class="margin-bottom-50" style="margin-top: 3px">
32 <el-col :span="24" class="table-height"> 40 <el-col :span="24" class="table-height">
33 <cm-table-page :columns="columns" 41 <cm-table-page :columns="columns"
@@ -44,6 +44,12 @@ export default { @@ -44,6 +44,12 @@ export default {
44 label: '资源名称', 44 label: '资源名称',
45 sortable: true, 45 sortable: true,
46 align: 'center', 46 align: 'center',
  47 + render: function (row) {
  48 + if(!row.resName){
  49 + return row.resCode;
  50 + }
  51 + return row.resName;
  52 + }
47 }, 53 },
48 { 54 {
49 prop: 'ip', 55 prop: 'ip',
@@ -59,15 +65,29 @@ export default { @@ -59,15 +65,29 @@ export default {
59 }, 65 },
60 { 66 {
61 prop: 'resMainAdmin', 67 prop: 'resMainAdmin',
62 - label: '主负责人',  
63 - sortable: true,  
64 - align: 'center',  
65 - },  
66 - {  
67 - prop: 'resAuxiliaryAdmin',  
68 - label: '辅负责人', 68 + label: '负责人',
69 sortable: true, 69 sortable: true,
70 align: 'center', 70 align: 'center',
  71 + render: function (row) {
  72 + let text = "";
  73 + let preFix = "";
  74 + if(row.resMainAdmin && row.resMainAdmin.includes(userName.value)){
  75 + // 主要负责人
  76 + text = row.resMainAdmin
  77 + preFix = "主";
  78 + } else {
  79 + // 辅负责人
  80 + text = row.resAuxiliaryAdmin
  81 + preFix = "辅";
  82 + }
  83 +
  84 + return `<div style="display: flex">
  85 + <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'>
  86 + ${preFix}
  87 + </div>
  88 + ${text}
  89 + </div>`;
  90 + }
71 }, 91 },
72 { 92 {
73 prop: 'resTypeName', 93 prop: 'resTypeName',
@@ -94,8 +114,8 @@ export default { @@ -94,8 +114,8 @@ export default {
94 } 114 }
95 }, 115 },
96 { 116 {
97 - prop: 'paramDesc',  
98 - label: '展示类型', 117 + prop: 'resCategory',
  118 + label: '资源分类',
99 sortable: true, 119 sortable: true,
100 align: 'center', 120 align: 'center',
101 /* render: function (row) { 121 /* render: function (row) {
@@ -140,23 +160,6 @@ export default { @@ -140,23 +160,6 @@ export default {
140 arr.push(item.resId) 160 arr.push(item.resId)
141 }) 161 })
142 resIds.value=arr.join(",");//选中的值 162 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 } 163 }
161 //获取资源类型数据 164 //获取资源类型数据
162 let getResourceTypoe=()=>{ 165 let getResourceTypoe=()=>{
@@ -269,4 +272,4 @@ export default { @@ -269,4 +272,4 @@ export default {
269 userName 272 userName
270 } 273 }
271 } 274 }
272 -}  
  275 +}
@@ -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,18 +16,24 @@ @@ -16,18 +16,24 @@
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>
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">
33 <cm-table-page :columns="columns" 39 <cm-table-page :columns="columns"
@@ -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,18 +16,24 @@ @@ -16,18 +16,24 @@
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>
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 tree-table"> 38 <el-col :span="24" class="table-height tree-table">
33 <cm-table-page :columns="columns" 39 <cm-table-page :columns="columns"
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>
20 -</el-row> 23 +</el-row>-->
21 <el-row class="margin-bottom-50" style="margin-top: 3px"> 24 <el-row class="margin-bottom-50" style="margin-top: 3px">
22 <el-col :span="24" class="table-height"> 25 <el-col :span="24" class="table-height">
23 <cm-table-page :columns="columns" 26 <cm-table-page :columns="columns"
@@ -42,6 +42,18 @@ export default { @@ -42,6 +42,18 @@ export default {
42 label: '角色名称', 42 label: '角色名称',
43 sortable: true, 43 sortable: true,
44 align: 'center', 44 align: 'center',
  45 + },
  46 + {
  47 + prop: 'code',
  48 + label: '角色编码',
  49 + sortable: true,
  50 + align: 'center',
  51 + },
  52 + {
  53 + prop: 'remark',
  54 + label: '角色备注',
  55 + sortable: true,
  56 + align: 'center',
45 } 57 }
46 ]; 58 ];
47 59
@@ -161,4 +173,4 @@ export default { @@ -161,4 +173,4 @@ export default {
161 userName 173 userName
162 } 174 }
163 } 175 }
164 -}  
  176 +}
@@ -174,7 +174,6 @@ export default { @@ -174,7 +174,6 @@ export default {
174 174
175 data.value.searchParams.busId = arr.join(',') 175 data.value.searchParams.busId = arr.join(',')
176 proxy.$global.confirm("确定取消相关资源？", function () { 176 proxy.$global.confirm("确定取消相关资源？", function () {
177 - proxy.$global.showMsg('取消成功！');  
178 proxy.$http.post(`/api-web/personnelChange/remove/topoPer`, data.value.searchParams , function (res) { 177 proxy.$http.post(`/api-web/personnelChange/remove/topoPer`, data.value.searchParams , function (res) {
179 if (res && res.success) { 178 if (res && res.success) {
180 proxy.$global.showMsg('取消成功！'); 179 proxy.$global.showMsg('取消成功！');