monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit c5799ed835e2f0e898e1f7e810a19435647fd032 2 parents afc7b5ae ef022f4d

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

…master-v32-lushangqing
Inline Side-by-side
Showing 4 changed files with 47 additions and 14 deletions
... ... @@ -211,7 +211,7 @@ MODIFY COLUMN `state` int NULL DEFAULT 0 COMMENT '0:正常，1:延期，3:预留
UPDATE `itsm_demo`.`system_handler` SET `system_type`=0 ,`isvirtual`=1 WHERE `system_id` = OLD.busId;
ELSE
-- 修改项目时修改是否是虚拟
UPDATE `itsm_demo`.`system_handler` SET `isvirtual`=NEW.isvirtual WHERE `system_id` = OLD.busId;
UPDATE `itsm_demo`.`system_handler` SET `system_type`=1 ,`isvirtual`=0 WHERE `system_id` = OLD.busId;
END IF;
end$$
DELIMITER ;
... ...
... ... @@ -592,13 +592,18 @@ export default {
let arr = getCheckedFile();
let info = [];
let fileNameData=[];
arr.map(function (v) {
info.push(`${v.id}__${v.type}`);
if (v.checked != undefined && v.checked == true) {
fileNameData.push(v.fileName)
}
})
alert(fileNameData)
let params = {
info: info.join(","),
fileName: ''
fileName:fileNameData
}
proxy.$http.downloadFile('/inspection-report/file/download', params);
... ...
... ... @@ -72,7 +72,27 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
form.val('form-bustype-edit', busType);
$('form[lay-filter="form-bustype-edit"] input[name="busTypeCode"]').attr('readonly', true);
userSelect.setValue([busType.admin]);
opsSelect.setValue(busType.principal.split(","));
let principal = busType.principal;
let principalLi = principal ? principal.split(",") : [];
opsSelect.setValue(principalLi);
//是否启用 1启用 0不启用
let isUse = busType.isUse || busType.isUse == 0 ? busType.isUse : 1;
if (isUse != 1) {//不启用
layui.jquery('input[name="isUse"]').removeAttr('checked'); //改变开关为 关
}
//是否是乙方运维 1是，0不是
let system_type = busType.isOps || busType.isOps == 0 ? busType.isOps : 1;
if (system_type != 1) {//不是乙方运维 隐藏项目 是否虚拟可以点击
layui.jquery('input[name="system_type"]').removeAttr('checked'); //改变开关为 关
$('#select_principalName').addClass("hide");
layui.jquery('input[name="isvirtual"]').removeAttr('disabled');//可以点击
}
//是否是虚拟 0是，1不是
let isvirtual = busType.isvirtual || busType.isvirtual == 0 ? busType.isvirtual : 0;
if (isvirtual != 0) {//不是虚拟
layui.jquery('input[name="isvirtual"]').removeAttr('checked'); //改变开关为 关
}
form.render();
});
}
... ... @@ -88,33 +108,42 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
form.on('switch(system_type)', function (obj) {
//sign=fale 不是乙方运维项目 sign=true 是乙方运维项目
var sign = obj.elem.checked;
if(!sign){//不是乙方运维
if (!sign) {//不是乙方运维 下拉框隐藏 是否是虚拟项目可以点击
$('#select_principalName').addClass("hide");
opsSelect.setValue([]);
layui.jquery('input[name="isvirtual"]').removeAttr('checked'); //改变开关为 关
layui.jquery('input[name="isvirtual"]').removeAttr('disabled');//可以点击
//重新渲染
form.render();
}else{//是乙方运维
} else {//是乙方运维 下拉框展示 只能是虚拟项目 不能更改是否是虚拟项目
$('#select_principalName').removeClass('hide');
//删除原来的组件 新加dom
$('#isvirtual_ops_switch').empty();//删除子元素
let html = '<input type="checkbox" lay-skin="switch" name="isvirtual" lay-filter="switch_isVirtual" value="0" lay-text="是|否" checked disabled/>';
$('#isvirtual_ops_switch').append(html);//追加子元素
//layui.jquery('input[name="isvirtual"]').attr("checked", true);//改变状态为开
//layui.jquery('input[name="isvirtual"]').attr("disabled", true)//不能点击
//渲染下拉框
initUserSelectOps();
//重新渲染
form.render();
}
});
// 绑定表单提交事件
form.on('submit(bus-type-submit)', function (data) {
loading = layer.load(2);
busType = Object.assign(busType, data.field);
//是否启用
//是否启用 1启用 0不启用
if (!data.field.isUse) {
busType.isUse = '0'
}
//是否是乙方运维
//是否是乙方运维 1是，0不是
if (!data.field.system_type) {
busType.system_type = '0'
}
//是否是虚拟业务
//是否是虚拟业务 0是，1不是
if (!data.field.isvirtual) {
busType.isvirtual = '1'
}
... ... @@ -123,7 +152,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
busType.parentId = '0';
}
//获取业务负责人信息
userSelect.getValue("")
busType.nickname = userSelect.getValue("name")[0];
busType.admin = userSelect.getValue("value")[0];
//获取业务运维负责人
... ...
... ... @@ -42,7 +42,7 @@
<div class="layui-form-item">
<label class="layui-form-label">是否使用<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="checkbox" lay-skin="switch" name="isUse" value="1" lay-text="是|否" checked/>
<input type="checkbox" lay-skin="switch" name="isUse" lay-filter="system_isUse" value="1" lay-text="是|否" checked/>
</div>
</div>
<div class="layui-form-item">
... ... @@ -82,8 +82,8 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label">虚拟业务<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="checkbox" lay-skin="switch" name="isvirtual" lay-filter="switch_isVirtual" value="0" lay-text="是|否" checked/>
<div class="layui-input-block" id="isvirtual_ops_switch">
<input type="checkbox" lay-skin="switch" name="isvirtual" lay-filter="switch_isVirtual" value="0" lay-text="是|否" checked disabled/>
</div>
</div>
<button id="btn-bustype-submit" class="hide" lay-submit lay-filter="bus-type-submit">提交</button>
... ...