Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 9e19a3f6 by liuyong
Options

修改画布

1 parent d39c0456
Expand all
Inline Side-by-side
Showing with 210 additions and 138 deletions
public/drawio/js/diagramly/sidebar/Sidebar-ArchiMate3.js
......@@ -4,40 +4,40 @@
Sidebar.prototype.addArchimate3Palette = function()
{
// 20231206wangwansu 上面是原本的版本
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Application');
// this.addArchimate3ApplicationPalette();
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Business');
// this.addArchimate3BusinessPalette();
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Composite');
// this.addArchimate3CompositePalette();
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Implementation and Migration');
// this.addArchimate3ImplementationAndMigrationPalette();
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Motivation');
// this.addArchimate3MotivationPalette();
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Physical');
// this.addArchimate3PhysicalPalette();
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Relationships');
// this.addArchimate3RelationshipsPalette();
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Strategy');
// this.addArchimate3StrategyPalette();
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Technology');
// this.addArchimate3TechnologyPalette();
// this.setCurrentSearchEntryLibrary();
// 20231206wangwansu 下面是修改的版本
// 业务架构
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Business');
this.addArchimate3BusinessPalette();
// 应用架构
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Application');
this.addArchimate3ApplicationPalette();
// 关系架构
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Business');
this.addArchimate3BusinessPalette();
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Composite');
this.addArchimate3CompositePalette();
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Implementation and Migration');
this.addArchimate3ImplementationAndMigrationPalette();
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Motivation');
this.addArchimate3MotivationPalette();
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Physical');
this.addArchimate3PhysicalPalette();
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Relationships');
this.addArchimate3RelationshipsPalette();
// 技术架构
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Strategy');
this.addArchimate3StrategyPalette();
this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Technology');
this.addArchimate3TechnologyPalette();
this.setCurrentSearchEntryLibrary();
// 20231206wangwansu 下面是修改的版本
// 业务架构
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Business');
// this.addArchimate3BusinessPalette();
// // 应用架构
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Application');
// this.addArchimate3ApplicationPalette();
// // 关系架构
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Relationships');
// this.addArchimate3RelationshipsPalette();
// // 技术架构
// this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Technology');
// this.addArchimate3TechnologyPalette();
// this.setCurrentSearchEntryLibrary();
};
Sidebar.prototype.addArchimate3ApplicationPalette = function()
......
public/drawio/js/grapheditor/Sidebar.js
......@@ -2193,8 +2193,8 @@ Sidebar.prototype.createTitle = function(label)
console.log(label)
//二次开发，设置样式--------------------开始
if(label == '架构元素关系') {
elt.style.borderTop = '2px solid #ccc';
elt.style.borderBottom = '2px solid #ccc';
// elt.style.borderTop = '2px solid #ccc';
// elt.style.borderBottom = '2px solid #ccc';
}else if(label == '安全架构'){
// elt.style.borderTop = '2px solid #ccc';
}else {
......
src/api/index.js
......@@ -393,7 +393,7 @@ export function queryZiChanJiaGouShangJiJieDian(params) {
}
// 资产架构，组件类型
export function queryZiChanJiaGouZuJianLeiXing(params) {
return post('/network/ele/archi-ele-list', params);
return post('/network/ma-ml-dicy/archiDicyList', params);
}
// 资产架构，组件类型选择后查询表单
export function queryZuJianLeiXingBelongForm(params) {
......@@ -407,8 +407,27 @@ export function exportZhiChanJiaGou(params) {
export function importZhiChanJiaGou(params) {
return post('/network/framework/easyExeclImport', params);
}
// 资产架构，关联资产
export function queryGuanLianZiChanSelect(params) {
return post('/network/arc-ast-cn/assetList', params);
}
// 日志管理，列表
export function queryLogManageTable(params) {
return post('/network/sysEventLog/', params);
}
// 日志管理，存储上限
export function queryLogManageStorageUpper(params) {
return post('/network/dictDetail/details', params);
}
// 日志管理，总记录
export function queryLogManageAllLog(params) {
return post('/network/sysEventLog/getTjCount', params);
}
// 现状资产架构，表格
export function getCurrentZiChanJiaGouTable(params) {
return post('/network/arc-ast-now/', params);
}
// 现状资产架构，表格
export function getTotalZiChanJiaGouTable(params) {
return post('/network/arc-ast-tot/', params);
}
src/utils/base64js.js 0 → 100644
(function (r) { if (typeof exports === "object" && typeof module !== "undefined") { module.exports = r() } else if (typeof define === "function" && define.amd) { define([], r) } else { var e; if (typeof window !== "undefined") { e = window } else if (typeof global !== "undefined") { e = global } else if (typeof self !== "undefined") { e = self } else { e = this } e.base64js = r() } })(function () { var r, e, n; return function () { function d(a, f, i) { function u(n, r) { if (!f[n]) { if (!a[n]) { var e = "function" == typeof require && require; if (!r && e) return e(n, !0); if (v) return v(n, !0); var t = new Error("Cannot find module '" + n + "'"); throw t.code = "MODULE_NOT_FOUND", t } var o = f[n] = { exports: {} }; a[n][0].call(o.exports, function (r) { var e = a[n][1][r]; return u(e || r) }, o, o.exports, d, a, f, i) } return f[n].exports } for (var v = "function" == typeof require && require, r = 0; r < i.length; r++)u(i[r]); return u } return d }()({ "/": [function (r, e, n) { "use strict"; n.byteLength = f; n.toByteArray = i; n.fromByteArray = p; var u = []; var v = []; var d = typeof Uint8Array !== "undefined" ? Uint8Array : Array; var t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; for (var o = 0, a = t.length; o < a; ++o) { u[o] = t[o]; v[t.charCodeAt(o)] = o } v["-".charCodeAt(0)] = 62; v["_".charCodeAt(0)] = 63; function c(r) { var e = r.length; if (e % 4 > 0) { throw new Error("Invalid string. Length must be a multiple of 4") } var n = r.indexOf("="); if (n === -1) n = e; var t = n === e ? 0 : 4 - n % 4; return [n, t] } function f(r) { var e = c(r); var n = e[0]; var t = e[1]; return (n + t) * 3 / 4 - t } function h(r, e, n) { return (e + n) * 3 / 4 - n } function i(r) { var e; var n = c(r); var t = n[0]; var o = n[1]; var a = new d(h(r, t, o)); var f = 0; var i = o > 0 ? t - 4 : t; var u; for (u = 0; u < i; u += 4) { e = v[r.charCodeAt(u)] << 18 | v[r.charCodeAt(u + 1)] << 12 | v[r.charCodeAt(u + 2)] << 6 | v[r.charCodeAt(u + 3)]; a[f++] = e >> 16 & 255; a[f++] = e >> 8 & 255; a[f++] = e & 255 } if (o === 2) { e = v[r.charCodeAt(u)] << 2 | v[r.charCodeAt(u + 1)] >> 4; a[f++] = e & 255 } if (o === 1) { e = v[r.charCodeAt(u)] << 10 | v[r.charCodeAt(u + 1)] << 4 | v[r.charCodeAt(u + 2)] >> 2; a[f++] = e >> 8 & 255; a[f++] = e & 255 } return a } function s(r) { return u[r >> 18 & 63] + u[r >> 12 & 63] + u[r >> 6 & 63] + u[r & 63] } function l(r, e, n) { var t; var o = []; for (var a = e; a < n; a += 3) { t = (r[a] << 16 & 16711680) + (r[a + 1] << 8 & 65280) + (r[a + 2] & 255); o.push(s(t)) } return o.join("") } function p(r) { var e; var n = r.length; var t = n % 3; var o = []; var a = 16383; for (var f = 0, i = n - t; f < i; f += a) { o.push(l(r, f, f + a > i ? i : f + a)) } if (t === 1) { e = r[n - 1]; o.push(u[e >> 2] + u[e << 4 & 63] + "==") } else if (t === 2) { e = (r[n - 2] << 8) + r[n - 1]; o.push(u[e >> 10] + u[e >> 4 & 63] + u[e << 2 & 63] + "=") } return o.join("") } }, {}] }, {}, [])("/") });
src/utils/http.js
......@@ -4,7 +4,6 @@ import axios from 'axios';
import router from '../router/index.js';
import { Message, MessageBox, Loading } from 'element-ui';
axios.defaults.timeout = 300000;
axios.defaults.baseURL = process.env.VUE_APP_BASE_URL;
......
src/views/busi-assets-list/index.vue
......@@ -113,7 +113,7 @@
</el-select>
</el-form-item>
<el-form-item label="组件类型:" prop="let3">
<el-select @change="ZuJianLeiXingSelectChange" filterable remote :remote-method="queryZuJianLeiXingSelect" clearable placeholder="请选择" v-model="ruleForm.let3">
<el-select @change="zuJianLeiXingSelectChange" filterable remote :remote-method="queryZuJianLeiXingSelect" clearable placeholder="请选择" v-model="ruleForm.let3">
<el-option v-for="item in zuJianLeiXingSelect" :key="item.elementId" :label="item.elementName" :value="item.elementId"></el-option>
</el-select>
</el-form-item>
......@@ -126,6 +126,11 @@
<el-radio label="隐藏"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="关联资产:" prop="let6">
<!-- <el-select clearable placeholder="请选择" v-model="ruleForm.let6">
<el-option v-for="item in guanLianZiChanSelect" :key="item.assetId" :label="item.assetName" :value="item.assetId"></el-option>
</el-select> -->
</el-form-item>
<el-form-item class="dynamicFormClass" v-for="(item, index) in ruleForm.dynamicForm_" :key="index" :label="item.cnName+':'">
<template v-if="item.controlType == 0">
<el-input placeholder="请输入内容" v-no-backslash v-model="item.value_" maxlength="100"></el-input>
......@@ -187,7 +192,8 @@
queryZuJianLeiXingBelongForm,
exportZhiChanJiaGou,
getDianXingAnLiSelectData,
importZhiChanJiaGou
importZhiChanJiaGou,
queryGuanLianZiChanSelect
} from '@/api/index.js';
import $ from 'jquery';
import { MessageBox, Message } from 'element-ui';
......@@ -212,6 +218,7 @@
let3: null,
let4: 0,
let5: '显示',
let6: '',
dynamicForm_: [],
archiBelongId: null,
},
......@@ -262,6 +269,7 @@
shangJiJieDianSelect: [],
treeDefaultExpand: [],
editId: null,
guanLianZiChanSelect: []
};
},
mounted(){
......@@ -272,6 +280,15 @@
this.set_table_height();
},
methods: {
getGuanLianZiChanSelectData(assetName) {//关联资产下拉菜单
const params = {
assetName: assetName,
assetConstant: this.searchParams.assetConstant
}
queryGuanLianZiChanSelect(params).then(res => {
console.log(res)
});
},
saveDialog() {//弹框保存
this.$refs.form.validate(valid => {
if(valid) {
......@@ -288,30 +305,20 @@
eleName = items2.elementName;
if(this.ruleForm.dynamicForm_.length > 0) {
if(this.is_add_edit == 'add') {
this.ruleForm.dynamicForm_.forEach(item => {
fieldsValue.push({
cnName: item.fieldName,
value_: item.value_,
controlType: item.controlType,
dictKey: item.dictKey ? item.dictKey : null
})
this.ruleForm.dynamicForm_.forEach(item => {
fieldsValue.push({
cnName: item.cnName,
value_: item.value_,
controlType: item.controlType,
dictKey: item.dictKey ? item.dictKey : null
})
}else {
this.ruleForm.dynamicForm_.forEach(item => {
fieldsValue.push({
cnName: item.cnName,
value_: item.value_,
controlType: item.controlType,
dictKey: item.dictKey ? item.dictKey : null
})
})
}
})
}else {
fieldsValue = [{}];
}
const params = {
archiAssetState: 1,
archiAssetState: 2,
archiStage: 1,
archiBelongId: this.ruleForm.archiBelongId,
assetConstant: this.searchParams.assetConstant,
archiAssetTypeId: this.searchParams.archiAssetTypeId,
......@@ -330,6 +337,10 @@
if(res.code == 200) {
this.addDialog = false;
this.get_table();
Message({
type: 'success',
message: '新增成功!'
});
}else {
Message({
type: 'error',
......@@ -342,6 +353,10 @@
if(res.code == 200) {
this.addDialog = false;
this.get_table();
Message({
type: 'success',
message: '编辑成功!'
});
}else {
Message({
type: 'error',
......@@ -402,7 +417,10 @@
this.pager.size = res.data.size;
this.tableData = res.data.records;
}else {
this.tableData = [];
Message({
type: 'error',
message: res.msg
});
}
})
},
......@@ -420,11 +438,10 @@
});
},
editItem(row){//编辑
console.log(row)
this.addDialog = true;
this.is_add_edit = 'edit';
this.ruleForm.let1 = row.assetName;
this.ruleForm.let2 = String(row.parentAssetId);
this.ruleForm.let2 = row.parentAssetId ? String(row.parentAssetId) : null;
this.ruleForm.let3 = row.archiEleId;
this.ruleForm.let4 = row.sort;
this.ruleForm.let5 = row.isShow == 1 ? '显示' : '隐藏';
......@@ -470,7 +487,7 @@
})
})
},
ZuJianLeiXingSelectChange(data) {//组件类型选择后
zuJianLeiXingSelectChange(data) {//组件类型选择后
const params = {
type: '1',
typeId: data,
......@@ -486,6 +503,7 @@
}
item['value_'] = '';
});
console.log(res.data)
this.ruleForm.dynamicForm_ = res.data;
}else {
this.ruleForm.dynamicForm_ = [];
......@@ -502,10 +520,12 @@
this.getZuJianLeiXingSelect(null);
}
},
getZuJianLeiXingSelect(elementName) {//组件类型下拉框值
getZuJianLeiXingSelect(elementName, archiBelongId) {//组件类型下拉框值
const params = {
state: '1',
type: '1',
elementName: elementName,
archiBelongId: this.ruleForm.archiBelongId,
archiBelongId: archiBelongId
};
queryZiChanJiaGouZuJianLeiXing(params).then(res => {
if(res.code == 200) {
......@@ -732,6 +752,7 @@
this.searchParams.archiAssetTypeId = res.data[0].subList[0].viewId;
this.getShangJiJieDianSelect(res.data[0].subList[0].assetConstant, res.data[0].subList[0].archiBelongId);
this.getZuJianLeiXingSelect(null, this.ruleForm.archiBelongId);
this.getGuanLianZiChanSelectData(null);
this.get_table();
......
src/views/etpManage/index.vue
......@@ -485,7 +485,6 @@ export default {
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
this.selectData3 = res.data;
console.log(this.selectData3);
}
})
},
......
src/views/log-manage/index.vue
......@@ -25,6 +25,7 @@
style="width: 208px;"
v-model="ruleForm.let4"
type="date"
placeholder="请选择"
clearable
value-format="yyyy-MM-dd">
</el-date-picker>
......@@ -87,9 +88,11 @@
<script>
import {
queryLogManageTable,
getDianXingAnLiSelectData
getDianXingAnLiSelectData,
queryLogManageStorageUpper,
queryLogManageAllLog
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
import { MessageBox, Message, Notification } from 'element-ui';
import $ from 'jquery';
export default {
......@@ -166,10 +169,40 @@ export default {
status = 0;
this.set_table_height(140);
}
})
Promise.all([ this.getStorageUpper(), this.getAllLog() ]).then(res2 => {
let number1 = res2[0];
let number2 = res2[1];
Notification({
title: '通知',
dangerouslyUseHTMLString: true,
message: `<div>本系统审计数据存储上限<span style="color: red;">${number1}</span>条,审计日志数据总记录<span style="color: blue;">${number2}</span>条。 </div>`,
position: 'bottom-right',
duration: 5000
});
});
},
methods: {
getStorageUpper() {//存储上限
return new Promise((resolve, reject) => {
queryLogManageStorageUpper({}).then(res => {
if(res.code == 200) {
resolve(res.data.value);
}
})
})
},
getAllLog() {//总记录
return new Promise((resolve, reject) => {
queryLogManageAllLog({}).then(res => {
if(res.code == 200) {
resolve(res.msg);
}
})
});
},
get_fu_he_du_select() {//符合度下拉
const params = {
key: "tech_compliance"
......
src/views/report-template-fabric/index.vue
......@@ -5,16 +5,16 @@
<div class="search_menu_item_container">
<div class="search_menu_item">
<span class="search_title">模板名称</span>
<el-input v-no-backslash maxlength="100" v-model="searchParams.tempName" placeholder="请输入内容" class="search_item"></el-input>
<el-input v-no-backslash maxlength="100" v-model="searchParams.tplName" placeholder="请输入内容" class="search_item"></el-input>
</div>
<div class="search_menu_item">
<span class="search_title">模板类型</span>
<el-select clearable v-model="searchParams.tempType" placeholder="请选择" style="width: 210px;">
<el-select clearable v-model="searchParams.tplType" placeholder="请选择" style="width: 210px;">
<el-option label="需求模版" :value="1"></el-option>
<el-option label="概设模版" :value="2"></el-option>
</el-select>
<!-- <el-select v-model="searchParams.tempType" placeholder="请选择" class="search_item">
<el-option v-for="item in moBanLeiXing" :key="item.value" :label="item.tempName" :value="item.value"></el-option>
<!-- <el-select v-model="searchParams.tplType" placeholder="请选择" class="search_item">
<el-option v-for="item in moBanLeiXing" :key="item.value" :label="item.tplName" :value="item.value"></el-option>
</el-select> -->
</div>
<div class="search_menu_item">
......@@ -49,11 +49,11 @@
<el-table :height="tableHeight" @selection-change="select_table_rows" v-loading="loading" :data="tableData" stripe border>
<el-table-column type="selection" width="55" :selectable="selectable"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="tempName" label="模板名称" align="center"></el-table-column>
<el-table-column prop="tplName" label="模板名称" align="center"></el-table-column>
<el-table-column label="模板类型" align="center">
<template slot-scope="scope">
<span v-if="scope.row.tempType == 1">需求模版</span>
<span v-if="scope.row.tempType == 2">概设模版</span>
<span v-if="scope.row.tplType == 1">需求模版</span>
<span v-if="scope.row.tplType == 2">概设模版</span>
</template>
</el-table-column>
<el-table-column prop="createMan" label="创建人" align="center"></el-table-column>
......@@ -66,7 +66,7 @@
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="tempRemark" width="200" :show-overflow-tooltip="true" label="备注" align="center"></el-table-column>
<el-table-column prop="tplRemark" width="200" :show-overflow-tooltip="true" label="备注" align="center"></el-table-column>
<el-table-column label="操作" width="260" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
......@@ -204,8 +204,8 @@ export default {
},
tableHeight: null,
searchParams: {
tempName: null,
tempType: null,
tplName: null,
tplType: null,
createTime: null,
},
is_add_edit: 'add',
......@@ -228,10 +228,10 @@ export default {
editItem(row) {//编辑
console.log(row)
this.is_add_edit = 'edit';
this.editId = row.krtId;
this.ruleForm.let1 = row.tempName;
this.ruleForm.let2 = row.tempType;
this.ruleForm.let4 = row.tempRemark;
this.editId = row.tplId;
this.ruleForm.let1 = row.tplName;
this.ruleForm.let2 = row.tplType;
this.ruleForm.let4 = row.tplRemark;
if(row.fileName) {
this.ruleForm.let3 = row.fileId;
this.ruleForm.let5 = row.fileName;
......@@ -273,7 +273,7 @@ export default {
type: 'warning'
}).then(() => {
const params = {
krtId: row.krtId,
tplId: row.tplId,
delFlag: 1
}
editReportTemplateFabric(params).then(res => {
......@@ -302,14 +302,14 @@ export default {
this.$refs.form.validate(valid => {
if(valid) {
const params = {
tempName: this.ruleForm.let1,
tempType: this.ruleForm.let2,
tplName: this.ruleForm.let1,
tplType: this.ruleForm.let2,
fileId: this.ruleForm.let3,
fileName: this.ruleForm.let5,
fileUrl: this.ruleForm.let6,
tempRemark: this.ruleForm.let4,
tplRemark: this.ruleForm.let4,
};
const requestParams = this.is_add_edit == 'add' ? params : { ...params, krtId: this.editId };
const requestParams = this.is_add_edit == 'add' ? params : { ...params, tplId: this.editId };
if(this.is_add_edit == 'add') {
addReportTemplateFabric(requestParams).then(res => {
if(res.code == 200) {
......@@ -390,10 +390,10 @@ export default {
}else {
let krtIdArray = [];
this.selectTable.forEach(item => {
krtIdArray.push(item.krtId);
krtIdArray.push(item.tplId);
});
const params = {
krtId: krtIdArray,
tplId: krtIdArray,
delFlag: 1
};
MessageBox.confirm('确定删除?', '提示', {
......@@ -430,8 +430,8 @@ export default {
this.get_table();
},
reset() {//重置
this.searchParams.tempName = null;
this.searchParams.tempType = null;
this.searchParams.tplName = null;
this.searchParams.tplType = null;
this.searchParams.createTime = null;
},
// 每页条数改变
......@@ -454,8 +454,8 @@ export default {
endTime_ = this.searchParams.createTime[1];
}
const params = {
"tempName": this.searchParams.tempName,
"tempType": this.searchParams.tempType,
"tplName": this.searchParams.tplName,
"tplType": this.searchParams.tplType,
"beginTime": beginTime_,
"endTime": endTime_,
"current": this.pager.current,
......
src/views/report-template-relative-use/index.vue
......@@ -18,7 +18,7 @@
<div class="search_menu_item">
<span class="search_title">模版名称</span>
<el-select clearable v-model="searchParams.tempName" placeholder="请选择" style="width: 210px;">
<el-option v-for="item in moBanMingCheng" :key="item.krtId" :label="item.tempName" :value="item.krtId"></el-option>
<el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tempName" :value="item.tplId"></el-option>
</el-select>
</div>
</div>
......@@ -123,7 +123,7 @@
</el-form-item>
<el-form-item label="模板名称:" prop="let4">
<el-select clearable v-model="ruleForm.let4" placeholder="请选择" style="width: 210px;">
<el-option v-for="item in moBanMingCheng" :key="item.krtId" :label="item.tempName" :value="item.krtId"></el-option>
<el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tempName" :value="item.tplId"></el-option>
</el-select>
</el-form-item>
</div>
......@@ -197,9 +197,9 @@ export default {
tableHeight: null,
moBanMingCheng: [],
is_add_edit: 'add',
tempName_: null,
krtId_: null,
krtCode_: null,
tplName_: null,
linkId_: null,
linkCode_: null,
deptId_: null,
deptCode_: null,
};
......@@ -255,15 +255,15 @@ export default {
this.ruleForm.let1 = row.deptName;
this.ruleForm.let2 = row.appName;
this.ruleForm.let3 = row.projectName;
this.ruleForm.let4 = row.krtId;
this.ruleForm.let4 = row.tplId;
this.add_dialog = true;
this.$nextTick(() => {
this.$refs.form.clearValidate();
});
this.is_add_edit = 'edit';
this.tempName_ = row.tempName;
this.krtId_ = row.krtId;
this.krtCode_ = row.krtCode;
this.tplName_ = row.tplName;
this.linkId_ = row.linkId;
this.linkCode_ = row.linkCode;
this.deptId_ = row.deptId;
this.deptCode_ = row.deptCode;
},
......@@ -279,7 +279,7 @@ export default {
type: 'warning'
}).then(() => {
const params = {
krtlId: row.krtlId,
linkId: row.linkId,
delFlag: 1
}
deleteBaoGaoMoBanGuanLianShiYong(params).then(res => {
......@@ -306,26 +306,26 @@ export default {
ok() {//弹框点击确定
this.$refs.form.validate(valid => {
if(valid) {
let result = this.moBanMingCheng.find(item => item.krtId == this.ruleForm.let4);
const krtCode = result ? result.krtCode : null;
const krtId = result ? result.krtId : null;
const tempName = result ? result.tempName : null;
let result = this.moBanMingCheng.find(item => item.tplId == this.ruleForm.let4);
const tplCode = result ? result.tplCode : null;
const tplId = result ? result.tplId : null;
const tplName = result ? result.tplName : null;
const params1 = {
deptName: 1,
appName: this.ruleForm.let2,
projectName: this.ruleForm.let3,
tempName,
krtCode,
krtId,
tplName,
tplCode,
tplId,
};
const params2 = {
deptName: this.ruleForm.let1,
appName: this.ruleForm.let2,
projectName: this.ruleForm.let3,
tempName: this.tempName_,
krtCode: this.krtCode_,
krtId: this.krtId_,
tplName: this.tplName_,
tplCode: this.tplCode_,
tplId: this.linkId_,
deptId: this.deptId_,
deptCode: this.deptCode_,
};
......@@ -404,10 +404,10 @@ export default {
}else {
let krtlIdArray = [];
this.selectTable.forEach(item => {
krtlIdArray.push(item.krtlId);
krtlIdArray.push(item.linkId);
});
const params = {
krtlId: krtlIdArray,
linkId: krtlIdArray,
delFlag: 1
};
MessageBox.confirm('确定删除?', '提示', {
......
src/views/tech-politics-fabric/index.vue
......@@ -5,7 +5,7 @@
<div class="search_menu_item_container">
<div class="search_menu_item">
<span class="search_title">政策名称</span>
<el-input v-no-backslash v-model="searchParams.tpoName" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
<el-input v-no-backslash v-model="searchParams.policyName" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
</div>
<div class="search_menu_item" style="margin-right: 50px;">
<span class="search_title">启用时间</span>
......@@ -60,8 +60,8 @@
<el-table :height="tableHeight" @selection-change="select_table_rows" v-loading="loading" :data="tableData" stripe border>
<el-table-column type="selection" width="55" :selectable="selectable"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="tpoName" label="政策名称" align="center"></el-table-column>
<el-table-column prop="tepContent" width="140" :show-overflow-tooltip="true" label="政策描述" align="center"></el-table-column>
<el-table-column prop="policyName" label="政策名称" align="center"></el-table-column>
<el-table-column prop="policyContent" width="140" :show-overflow-tooltip="true" label="政策描述" align="center"></el-table-column>
<el-table-column prop="scope_" label="适用范围" align="center"></el-table-column>
<el-table-column prop="deptName" label="发布部门" align="center"></el-table-column>
<el-table-column prop="level_" label="级别" align="center"></el-table-column>
......@@ -74,7 +74,7 @@
<span v-if="scope.row.state == 1">已启用</span>
</template>
</el-table-column>
<el-table-column prop="tepRemark" label="备注" width="140" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="policyRemark" label="备注" width="140" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column label="操作" width="360" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
......@@ -218,7 +218,7 @@ export default {
tableData: [],
add_dialog: false,
searchParams: {
tpoName: null,
policyName: null,
startTime: null,
state: null,
},
......@@ -293,7 +293,7 @@ export default {
endTime_ = this.searchParams.startTime[1];
}
const params = {
"tpoName": this.searchParams.tpoName,
"policyName": this.searchParams.policyName,
"beginTime": beginTime_,
"endTime": endTime_,
"state": this.searchParams.state,
......@@ -310,20 +310,20 @@ export default {
});
},
editItem(row) {//编辑
this.ruleForm.let1 = row.tpoName;
this.ruleForm.let1 = row.policyName;
this.ruleForm.let2 = ''+row.scope;
this.ruleForm.let3 = row.deptName;
this.ruleForm.let4 = ''+row.level;
this.ruleForm.let5 = row.startTime;
this.ruleForm.let6 = row.state;
this.ruleForm.let7 = row.tepContent;
this.ruleForm.let8 = row.tepRemark;
this.ruleForm.let7 = row.policyContent;
this.ruleForm.let8 = row.policyRemark;
this.add_dialog = true;
this.$nextTick(() => {
this.$refs.form.clearValidate();
});
this.is_add_edit = 'edit';
this.editId = row.ktepId;
this.editId = row.policyId;
},
startItem(row){//启用
MessageBox.confirm('确定启用?', '提示', {
......@@ -334,7 +334,7 @@ export default {
type: 'warning'
}).then(() => {
const params = {
ktepId: row.ktepId,
policyId: row.policyId,
state: 1
}
editJiShuZhengCeJieGouHuaTable(params).then(res => {
......@@ -367,7 +367,7 @@ export default {
type: 'warning'
}).then(() => {
const params = {
ktepId: row.ktepId,
policyId: row.policyId,
state: 0
}
editJiShuZhengCeJieGouHuaTable(params).then(res => {
......@@ -400,7 +400,7 @@ export default {
type: 'warning'
}).then(() => {
const params = {
ktepId: row.ktepId,
policyId: row.policyId,
delFlag: 1,
}
editJiShuZhengCeJieGouHuaTable(params).then(res => {
......@@ -428,16 +428,16 @@ export default {
this.$refs.form.validate(valid => {
if(valid) {
const params = {
tpoName: this.ruleForm.let1,
policyName: this.ruleForm.let1,
scope: this.ruleForm.let2,
deptName: this.ruleForm.let3,
level: this.ruleForm.let4,
startTime: this.ruleForm.let5,
state: this.ruleForm.let6,
tepContent: this.ruleForm.let7,
tepRemark: this.ruleForm.let8,
policyContent: this.ruleForm.let7,
policyRemark: this.ruleForm.let8,
};
const requestParams = this.is_add_edit == 'add' ? params : { ...params, ktepId: this.editId };
const requestParams = this.is_add_edit == 'add' ? params : { ...params, policyId: this.editId };
if(this.is_add_edit == 'add') {
addJiShuZhengCeJieGouHuaTable(requestParams).then(res => {
if(res.code == 200) {
......@@ -518,10 +518,10 @@ export default {
}else {
let ktepIdArray = [];
this.selectTable.forEach(item => {
ktepIdArray.push(item.ktepId);
ktepIdArray.push(item.policyId);
});
const params = {
ktepId: ktepIdArray,
policyId: ktepIdArray,
state: 0
};
MessageBox.confirm('确定删除?', '提示', {
......@@ -558,7 +558,7 @@ export default {
this.get_table();
},
reset() {//重置
this.searchParams.tpoName = null;
this.searchParams.policyName = null;
this.searchParams.startTime = null;
this.searchParams.state = null;
},
......@@ -582,7 +582,7 @@ export default {
endTime_ = this.searchParams.startTime[1];
}
const params = {
"tpoName": this.searchParams.tpoName,
"policyName": this.searchParams.policyName,
"beginTime": beginTime_,
"endTime": endTime_,
"state": this.searchParams.state,
......
src/views/tech-politics-relative-use/index.vue
......@@ -5,7 +5,7 @@
<div class="search_menu_item_container">
<div class="search_menu_item">
<span class="search_title">政策名称</span>
<el-input v-no-backslash maxlength="100" v-model="searchParams.tpoName" placeholder="请输入内容" class="search_item"></el-input>
<el-input v-no-backslash maxlength="100" v-model="searchParams.policyName" placeholder="请输入内容" class="search_item"></el-input>
</div>
<div class="search_menu_item">
<span class="search_title">符合度</span>
......@@ -33,8 +33,8 @@
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="deptName" label="单位" align="center"></el-table-column>
<el-table-column prop="startTime" label="统计时间" align="center"></el-table-column>
<el-table-column prop="tpoName" label="政策名称" align="center"></el-table-column>
<el-table-column prop="tpoContent" label="政策描述" align="center"></el-table-column>
<el-table-column prop="policyName" label="政策名称" align="center"></el-table-column>
<el-table-column prop="policyContent" label="政策描述" align="center"></el-table-column>
<el-table-column prop="conformCount" label="符合度" align="center">
<template slot-scope="scope">
<div>
......@@ -43,7 +43,7 @@
</template>
</el-table-column>
<el-table-column prop="usefulCount" label="应用数量" align="center"></el-table-column>
<el-table-column prop="ktplRemark" label="备注" align="center"></el-table-column>
<el-table-column prop="remark" label="备注" align="center"></el-table-column>
</el-table>
<!-- <el-pagination
background
......@@ -92,7 +92,7 @@ export default {
},
tableHeight: null,
searchParams: {
tpoName: null,
policyName: null,
conformCount: null,
},
fuHeDu: []
......@@ -131,7 +131,7 @@ export default {
this.get_table();
},
reset() {//重置
this.searchParams.tpoName = null;
this.searchParams.policyName = null;
this.searchParams.conformCount = null;
},
// 每页条数改变
......@@ -148,7 +148,7 @@ export default {
get_table() {//查询表格数据
this.loading = true;
const params = {
"tpoName": this.searchParams.tpoName,
"policyName": this.searchParams.policyName,
"conformCount": this.searchParams.conformCount,
"current": this.pager.current,
"pageSize": this.pager.size,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!