monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 4931dea8f60747d2c6067379cc5bfcf8ab086680 2 parents 329530ec ab80ae80

Merge branch 'master-V32-XuHaoJie' into 'master' 

杭州-业务类型-添加是否是乙方运维



See merge request !3
Inline Side-by-side
Showing 2 changed files with 14 additions and 3 deletions
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
5 5
6 @SpringBootApplication 6 @SpringBootApplication
7 public class HGMonitorZJWebApplication { 7 public class HGMonitorZJWebApplication {
8 - 8 +
9 public static void main(String[] args) { 9 public static void main(String[] args) {
10 SpringApplication.run(HGMonitorZJWebApplication.class, args); 10 SpringApplication.run(HGMonitorZJWebApplication.class, args);
11 } 11 }
@@ -111,7 +111,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -111,7 +111,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
111 }, { 111 }, {
112 field: 'busTypeDesc', title: '业务类型描述', align: 'left' 112 field: 'busTypeDesc', title: '业务类型描述', align: 'left'
113 }, { 113 }, {
114 - field: 'isUse', title: '是否使用', align: 'center', width: 120, 114 + field: 'isOps', title: '乙方运维', align: 'center',width: 120,
  115 + templet: function (d) {
  116 + if(d.isOps==0){
  117 + return '否';
  118 + }else{
  119 + return '是';
  120 + }
  121 +
  122 + }
  123 + }, {
  124 + field: 'isUse', title: '是否使用', align: 'center',width: 120,
115 templet: function (d) { 125 templet: function (d) {
116 switch (d.isUse) { 126 switch (d.isUse) {
117 case 0: 127 case 0:
@@ -289,9 +299,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -289,9 +299,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
289 ,closeBtn: false 299 ,closeBtn: false
290 ,area: ['80%', '60%'] 300 ,area: ['80%', '60%']
291 ,shade: 0.8 301 ,shade: 0.8
292 - , btn:["关闭"] 302 + ,btn:["","关闭"]
293 ,id: 'operationMaintenance-config' //设定一个id，防止重复弹出 303 ,id: 'operationMaintenance-config' //设定一个id，防止重复弹出
294 ,content:`/vue3/index.html#/operationMaintenance/config` 304 ,content:`/vue3/index.html#/operationMaintenance/config`
  305 +
295 ,yes: function(index, layero){ 306 ,yes: function(index, layero){
296 layer.closeAll(); 307 layer.closeAll();
297 return false; 308 return false;