monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit bd7071c152833e6f7f28a90a91fe61568cd3f257 2 parents d4c097f0 31f3c06f

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 22 changed files with 114 additions and 47 deletions
@@ -228,15 +228,28 @@ layui.define(['sessions', 'form', 'common'],function (exports) { @@ -228,15 +228,28 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
228 sessionStorage.setItem('roles',roles); 228 sessionStorage.setItem('roles',roles);
229 sessionStorage.setItem('user_id',data.id); //保存用户id joke add 20211206 229 sessionStorage.setItem('user_id',data.id); //保存用户id joke add 20211206
230 // Start Wang 2022/2/8 15:37 用户登录后，获取用户信息时，增加获取用户扩展信息 230 // Start Wang 2022/2/8 15:37 用户登录后，获取用户信息时，增加获取用户扩展信息
231 - var up = data.userProperty;  
232 - if(up){  
233 - up.map(function (v) {  
234 - sessionStorage.setItem(v.property, v.value);  
235 - })  
236 - } else {  
237 - // 兼容没有用户扩展属性时，清空布局设置  
238 - sessionStorage.setItem("userLayout", ''); 231 + function initUserProperty() {
  232 + debugger
  233 + $.ajax({
  234 + type : 'post',
  235 + sync:false,
  236 + url :common.domainName + '/api-web/manage/ddic/findSucDdics/user_property?access_token='+localStorage.getItem("access_token"),
  237 + success : function(resUp) {
  238 + resUp.data.filter(v => {
  239 + debugger
  240 + let code = v.ddicCode;
  241 + let val = '';
  242 + data.userProperty.filter(v1 => {
  243 + if(v1.property == code ){
  244 + val = v1.value;
  245 + }
  246 + });
  247 + sessionStorage.setItem(code, val);
  248 + })
  249 + }
  250 + });
239 } 251 }
  252 + initUserProperty();
240 // End Wang 2022/2/8 15:37 253 // End Wang 2022/2/8 15:37
241 } 254 }
242 }); 255 });
@@ -63,6 +63,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -63,6 +63,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
63 // data.orgId = orgSelect.getValue('valueStr') 63 // data.orgId = orgSelect.getValue('valueStr')
64 data.roleId = roleSelect.getValue('valueStr') 64 data.roleId = roleSelect.getValue('valueStr')
65 delete data['select'] 65 delete data['select']
  66 + var reloadFlg = false;
  67 + if(data.userProperty){
  68 + data.userProperty.forEach(function (v){
  69 + //if(v.username != '' && v.value != ''){
  70 + sessionStorage.setItem(v.property, v.value);
  71 + reloadFlg = true;
  72 + //}
  73 + })
  74 + }
66 $.ajax({ 75 $.ajax({
67 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken, 76 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken,
68 data: JSON.stringify(data), 77 data: JSON.stringify(data),
@@ -70,7 +79,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -70,7 +79,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
70 contentType: "application/json; charset=utf-8", 79 contentType: "application/json; charset=utf-8",
71 success: function (res) { 80 success: function (res) {
72 if (res.resp_code == 0) { 81 if (res.resp_code == 0) {
73 - layer.msg(res.resp_msg, { 82 + var msg = res.resp_msg;
  83 + if(reloadFlg){
  84 + msg += "，扩展信息更新，即将刷新页面！";
  85 + }
  86 + layer.msg(msg, {
74 offset: '15px', 87 offset: '15px',
75 icon: 1, 88 icon: 1,
76 time: 2000, 89 time: 2000,
@@ -78,6 +91,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -78,6 +91,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
78 layer.closeAll() 91 layer.closeAll()
79 table.reload('user_table', {}); 92 table.reload('user_table', {});
80 form.render(); 93 form.render();
  94 +
  95 + if(reloadFlg){
  96 + window.location.reload();
  97 + }
81 }) 98 })
82 } else { 99 } else {
83 layer.msg(res.resp_msg, { 100 layer.msg(res.resp_msg, {
@@ -99,13 +99,17 @@ @@ -99,13 +99,17 @@
99 </a> 99 </a>
100 </li>--> 100 </li>-->
101 101
102 - <li class="layui-nav-item" lay-unselect> 102 + <li class="layui-nav-item" lay-unselect id="systems-select">
103 <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems" 103 <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems"
104 lay-done="layui.element.render('nav', 'layadmin-systems');"> 104 lay-done="layui.element.render('nav', 'layadmin-systems');">
105 <a href="javascript:;" title="第三方系统"> 105 <a href="javascript:;" title="第三方系统">
106 <span class="layui-icon layui-icon-slider"></span> 106 <span class="layui-icon layui-icon-slider"></span>
107 </a> 107 </a>
108 <dl class="layui-nav-child"> 108 <dl class="layui-nav-child">
  109 + {{# if(d.data && d.data.length == 0){ }}
  110 + {{# var sysObj = document.querySelector('#systems-select'); }}
  111 + {{# sysObj != null ? sysObj.remove() :''; }}
  112 + {{# } }}
109 {{# layui.each(d.data, function(index, item){ }} 113 {{# layui.each(d.data, function(index, item){ }}
110 <dd style="text-align: left;" lay-filter="layadmin-systems"> 114 <dd style="text-align: left;" lay-filter="layadmin-systems">
111 <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}" title="{{item.ddicName}}"> 115 <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}" title="{{item.ddicName}}">
@@ -43,6 +43,9 @@ @@ -43,6 +43,9 @@
43 <div class="layui-form-item"> 43 <div class="layui-form-item">
44 <span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span> 44 <span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
45 </div> 45 </div>
  46 + <div style="font-size: 12px;text-align: center;color: #c1c1c1">
  47 + 技术支持：北京鸿果秋实科技有限公司
  48 + </div>
46 </div> 49 </div>
47 </div> 50 </div>
48 51
@@ -43,6 +43,10 @@ @@ -43,6 +43,10 @@
43 <div class="layui-form-item"> 43 <div class="layui-form-item">
44 <span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span> 44 <span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
45 </div> 45 </div>
  46 +
  47 + <div style="font-size: 12px;text-align: center;color: #c1c1c1">
  48 + 技术支持：北京鸿果秋实科技有限公司
  49 + </div>
46 </div> 50 </div>
47 </div> 51 </div>
48 52
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 9
10 </div> 10 </div>
11 <div class="layadmin-user-login-main"> 11 <div class="layadmin-user-login-main">
12 - <img src="/src/style/img/login/skin/2/22.png" style="border: none;position: absolute;margin-left: calc(100% - 663px);margin-top: 145px;"> 12 + <img src="/src/style/img/login/skin/2/22.png" style="border: none;position: absolute;margin-left: calc(100% - 650px);margin-top: 175px;width: 500px;">
13 <div class="layadmin-user-login-box layadmin-user-login-body layui-form"> 13 <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
14 <div class="layui-form-item" style="color: #2887FD;font-weight: bold;text-align: center;font-size: 18px;"> 14 <div class="layui-form-item" style="color: #2887FD;font-weight: bold;text-align: center;font-size: 18px;">
15 <h2>用户登录</h2> 15 <h2>用户登录</h2>
@@ -44,6 +44,9 @@ @@ -44,6 +44,9 @@
44 <div class="layui-form-item"> 44 <div class="layui-form-item">
45 <span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span> 45 <span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
46 </div> 46 </div>
  47 + <div style="font-size: 12px;text-align: center;color: #c1c1c1">
  48 + 技术支持：北京鸿果秋实科技有限公司
  49 + </div>
47 </div> 50 </div>
48 </div> 51 </div>
49 52
@@ -90,13 +90,17 @@ @@ -90,13 +90,17 @@
90 <i class="layui-icon layui-icon-theme"></i> 90 <i class="layui-icon layui-icon-theme"></i>
91 </a> 91 </a>
92 </li>--> 92 </li>-->
93 - <li class="layui-nav-item" lay-unselect> 93 + <li class="layui-nav-item" lay-unselect id="systems-select">
94 <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems" 94 <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems"
95 lay-done="layui.element.render('nav', 'layadmin-systems');"> 95 lay-done="layui.element.render('nav', 'layadmin-systems');">
96 <a href="javascript:;" title="第三方系统"> 96 <a href="javascript:;" title="第三方系统">
97 <span class="layui-icon layui-icon-slider"></span> 97 <span class="layui-icon layui-icon-slider"></span>
98 </a> 98 </a>
99 <dl class="layui-nav-child"> 99 <dl class="layui-nav-child">
  100 + {{# if(d.data && d.data.length == 0){ }}
  101 + {{# var sysObj = document.querySelector('#systems-select'); }}
  102 + {{# sysObj != null ? sysObj.remove() :''; }}
  103 + {{# } }}
100 {{# layui.each(d.data, function(index, item){ }} 104 {{# layui.each(d.data, function(index, item){ }}
101 <dd style="text-align: left;" lay-filter="layadmin-systems"> 105 <dd style="text-align: left;" lay-filter="layadmin-systems">
102 <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}" title="{{item.ddicName}}"> 106 <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}" title="{{item.ddicName}}">
@@ -44,9 +44,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -44,9 +44,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
44 //回显用户属性 44 //回显用户属性
45 evaluation(res.userProperty); 45 evaluation(res.userProperty);
46 //用户扩展属性展开 46 //用户扩展属性展开
47 - $("#user_property_html_id").removeClass('hide');  
48 - $("#userPropertyBelow").addClass('hide');  
49 - $("#userPropertyUP").removeClass('hide'); 47 + // $("#user_property_html_id").removeClass('hide');
  48 + $("#userPropertyUP").addClass('hide');
  49 + $("#userPropertyBelow").removeClass('hide');
50 form.render(); 50 form.render();
51 } 51 }
52 } 52 }
@@ -69,6 +69,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -69,6 +69,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
69 return false; 69 return false;
70 } 70 }
71 delete data['select'] 71 delete data['select']
  72 + var reloadFlg = false;
  73 + if(data.userProperty){
  74 + data.userProperty.forEach(function (v){
  75 + //if(v.username != '' && v.value != ''){
  76 + sessionStorage.setItem(v.property, v.value);
  77 + reloadFlg = true;
  78 + //}
  79 + })
  80 + }
72 $.ajax({ 81 $.ajax({
73 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken, 82 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken,
74 data: JSON.stringify(data), 83 data: JSON.stringify(data),
@@ -76,7 +85,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -76,7 +85,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
76 contentType: "application/json; charset=utf-8", 85 contentType: "application/json; charset=utf-8",
77 success: function (res) { 86 success: function (res) {
78 if (res.resp_code == 0) { 87 if (res.resp_code == 0) {
79 - layer.msg(res.resp_msg, { 88 + var msg = res.resp_msg;
  89 + if(reloadFlg){
  90 + msg += "，扩展信息更新，即将刷新页面！";
  91 + }
  92 + layer.msg(msg, {
80 offset: '15px', 93 offset: '15px',
81 icon: 1, 94 icon: 1,
82 time: 2000, 95 time: 2000,
@@ -84,6 +97,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -84,6 +97,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
84 layer.closeAll() 97 layer.closeAll()
85 table.reload('user_table', {}); 98 table.reload('user_table', {});
86 form.render(); 99 form.render();
  100 + if(reloadFlg){
  101 + window.location.reload();
  102 + }
87 }) 103 })
88 } else { 104 } else {
89 layer.msg(res.resp_msg, { 105 layer.msg(res.resp_msg, {
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 <button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存 73 <button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存
74 </button> 74 </button>
75 </form> 75 </form>
76 -<fieldset class="layui-elem-field layui-field-title hide" style="margin-top: 10px;min-width: 200px"> 76 +<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;min-width: 200px">
77 <legend> 77 <legend>
78 扩展信息 &nbsp; 78 扩展信息 &nbsp;
79 <a href="javascript:void(0);" class="layui-btn layui-btn-normal layui-btn-xs" id="addUserProperty" 79 <a href="javascript:void(0);" class="layui-btn layui-btn-normal layui-btn-xs" id="addUserProperty"
@@ -91,13 +91,17 @@ @@ -91,13 +91,17 @@
91 <i class="layui-icon layui-icon-theme"></i> 91 <i class="layui-icon layui-icon-theme"></i>
92 </a> 92 </a>
93 </li>--> 93 </li>-->
94 - <li class="layui-nav-item" lay-unselect> 94 + <li class="layui-nav-item" lay-unselect id="systems-select">
95 <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems" 95 <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems"
96 lay-done="layui.element.render('nav', 'layadmin-systems');"> 96 lay-done="layui.element.render('nav', 'layadmin-systems');">
97 <a href="javascript:;" title="第三方系统"> 97 <a href="javascript:;" title="第三方系统">
98 <span class="layui-icon layui-icon-slider"></span> 98 <span class="layui-icon layui-icon-slider"></span>
99 </a> 99 </a>
100 <dl class="layui-nav-child"> 100 <dl class="layui-nav-child">
  101 + {{# if(d.data && d.data.length == 0){ }}
  102 + {{# var sysObj = document.querySelector('#systems-select'); }}
  103 + {{# sysObj != null ? sysObj.remove() :''; }}
  104 + {{# } }}
101 {{# layui.each(d.data, function(index, item){ }} 105 {{# layui.each(d.data, function(index, item){ }}
102 <dd style="text-align: left;" lay-filter="layadmin-systems"> 106 <dd style="text-align: left;" lay-filter="layadmin-systems">
103 <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}" title="{{item.ddicName}}"> 107 <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}" title="{{item.ddicName}}">
@@ -76,11 +76,14 @@ @@ -76,11 +76,14 @@
76 .yfyw-user .zc-view .zc-info { 76 .yfyw-user .zc-view .zc-info {
77 width: calc(100% - 120px); 77 width: calc(100% - 120px);
78 text-align: left; 78 text-align: left;
  79 + display: flex;
  80 + justify-content: space-between;
79 } 81 }
80 82
81 .yfyw-user .zc-view .zc-item { 83 .yfyw-user .zc-view .zc-item {
82 display: flex; 84 display: flex;
83 - flex-wrap: wrap 85 + flex-wrap: wrap;
  86 + flex: 1;
84 } 87 }
85 88
86 .yfyw-user .zc-view .zc-item .zc-item-label { 89 .yfyw-user .zc-view .zc-item .zc-item-label {
@@ -102,7 +105,9 @@ @@ -102,7 +105,9 @@
102 105
103 .yfyw-user .zc-view .zc-info .zc-item-tools { 106 .yfyw-user .zc-view .zc-info .zc-item-tools {
104 text-align: right; 107 text-align: right;
105 - padding: 3px 108 + padding: 3px;
  109 + display: flex;
  110 + align-items: end;
106 } 111 }
107 112
108 /*-------------------------------------*/ 113 /*-------------------------------------*/
@@ -46,14 +46,25 @@ export default { @@ -46,14 +46,25 @@ export default {
46 46
47 let init = () => { 47 let init = () => {
48 //如果是日常资料，不能点击 48 //如果是日常资料，不能点击
49 - if("TWO_DAY_MATERIAL"== props.treeNode.map.nodeType.code){ 49 + if ("TWO_DAY_MATERIAL" == props.treeNode.map.nodeType.code) {
50 return true; 50 return true;
51 } 51 }
  52 + let code = '';
  53 + let personId = '';
  54 + //点击运维人员或项目
  55 + if ('COLLECT_ALL' == props.treeNode.map.nodeType.view.code || ('COLLECT_USER' == props.treeNode.map.nodeType.view.code && props.treeNode.map.nodeType.code == "ONE_USER")) {
  56 + code = props.docType;
  57 + }
  58 + //点击用户
  59 + if ('COLLECT_USER' == props.treeNode.map.nodeType.view.code && 'TWO_SPECIFIC' == props.treeNode.map.nodeType.code) {
  60 + code = props.docType;
  61 + personId = props.treeNode.id
  62 + }
52 // 查询绑定的文件列表 63 // 查询绑定的文件列表
53 let params = { 64 let params = {
54 opsId: props.projectId, 65 opsId: props.projectId,
55 - personId: props.parentNode.id,  
56 - code: props.treeNode.map.nodeType.code 66 + personId: personId,
  67 + code: code ? code : props.treeNode.map.nodeType.code
57 } 68 }
58 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) { 69 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) {
59 if (res && res.code == 0 && res.data && res.data.length > 0) { 70 if (res && res.code == 0 && res.data && res.data.length > 0) {
@@ -74,11 +85,11 @@ export default { @@ -74,11 +85,11 @@ export default {
74 * @param docIds 文档id集合 85 * @param docIds 文档id集合
75 */ 86 */
76 let delDocRel = (docIds) => { 87 let delDocRel = (docIds) => {
77 - console.log("delDocRel",docIds)  
78 - let param={  
79 - id:docIds.join(','), 88 + console.log("delDocRel", docIds)
  89 + let param = {
  90 + id: docIds.join(','),
80 } 91 }
81 - proxy.$http.get('/api-web/bOpsFile/deleteSearch',param, function (res){ 92 + proxy.$http.get('/api-web/bOpsFile/deleteSearch', param, function (res) {
82 93
83 }) 94 })
84 } 95 }
@@ -102,7 +113,6 @@ export default { @@ -102,7 +113,6 @@ export default {
102 } 113 }
103 114
104 115
105 -  
106 // 监听编辑状态 116 // 监听编辑状态
107 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => { 117 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
108 initFlg.value = false; 118 initFlg.value = false;
@@ -46,31 +46,14 @@ export default { @@ -46,31 +46,14 @@ export default {
46 46
47 let init = () => { 47 let init = () => {
48 //如果是日常资料，不能点击 48 //如果是日常资料，不能点击
49 - if ("TWO_DAY_MATERIAL" == props.treeNode.map.nodeType.code) { 49 + if("TWO_DAY_MATERIAL"== props.treeNode.map.nodeType.code){
50 return true; 50 return true;
51 } 51 }
52 - let code = '';  
53 - let personId = '';  
54 - //项目统计  
55 - if ('COLLECT_ALL' == props.treeNode.map.nodeType.view.code) {  
56 - code = props.docType;  
57 - // personId = '';  
58 - }  
59 - //用户统计  
60 - if('COLLECT_USER'== props.treeNode.map.nodeType.view.code){  
61 - code = props.docType;  
62 - // props.treeNode.children.forEach(item => {  
63 - // personId += item.id +',';  
64 - // });  
65 - // if();  
66 - }  
67 // 查询绑定的文件列表 52 // 查询绑定的文件列表
68 let params = { 53 let params = {
69 opsId: props.projectId, 54 opsId: props.projectId,
70 personId: props.parentNode.id, 55 personId: props.parentNode.id,
71 - code: code? code:props.treeNode.map.nodeType.code  
72 - // code: "THREE_PERSONAGE_NDA" != props.docType?props.treeNode.map.nodeType.code:"THREE_PERSONAGE_NDA"  
73 - //code: props.treeNode.map.nodeType.view.code 56 + code: props.treeNode.map.nodeType.code
74 } 57 }
75 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) { 58 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) {
76 if (res && res.code == 0 && res.data && res.data.length > 0) { 59 if (res && res.code == 0 && res.data && res.data.length > 0) {
@@ -119,6 +102,7 @@ export default { @@ -119,6 +102,7 @@ export default {
119 } 102 }
120 103
121 104
  105 +
122 // 监听编辑状态 106 // 监听编辑状态
123 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => { 107 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
124 initFlg.value = false; 108 initFlg.value = false;