Commit 1dd4058d by liuyong

修改画布

1 parent 66615378
......@@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title>
<script src="./sm4.js"></script>
</head>
<body>
<noscript>
......
......@@ -4,9 +4,21 @@ 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;
const result = encrypt_ecb('{"id": "1", name: "2"}', 'TAxH5p1vs3ePYABC');
// const result2 = decrypt_cbc('j7STqWGQdaRM+slFbSvd6MeoCuWnWdRZNvPWDPpbzpQ=', 'E99567ACC5364D69BA0B0BC83066955F', '1234567890123456');
console.log(result);
// console.log(result2);
//http 请求拦截器
axios.interceptors.request.use(config => {
......
......@@ -28,7 +28,7 @@
<div class="search_menu_item">
<span class="search_title">组件类型</span>
<el-select filterable remote :remote-method="queryZuJianLeiXingSelect" v-model="searchParams.archiEleId" clearable placeholder="请选择" class="search_item">
<el-option v-for="item in zuJianLeiXingSelect" :key="item.elementId" :label="item.elementName" :value="item.elementId"></el-option>
<el-option v-for="item in zuJianLeiXingSelect" :key="item.typeId" :label="item.elementName" :value="item.typeId"></el-option>
</el-select>
</div>
......@@ -114,7 +114,7 @@
</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-option v-for="item in zuJianLeiXingSelect" :key="item.elementId" :label="item.elementName" :value="item.elementId"></el-option>
<el-option v-for="item in zuJianLeiXingSelect" :key="item.typeId" :label="item.elementName" :value="item.typeId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="排序:" prop="let4">
......@@ -127,9 +127,12 @@
</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-select clearable @change="guanLianZiChanChange" filterable remote :remote-method="queryGuanLianZiChan" placeholder="请选择" multiple v-model="ruleForm.let6">
<el-option v-for="item in guanLianZiChanSelect" :key="String(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.dynamicForm0_" :key="index" :label="item.assetName+':'">
<el-input placeholder="请输入内容" v-no-backslash v-model="item.relaName" maxlength="100"></el-input>
</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">
......@@ -167,7 +170,7 @@
</el-form-item>
<el-form-item label="组件类型:" prop="let2">
<el-select v-model="ruleForm2.let2" filterable remote :remote-method="queryZuJianLeiXingSelect" clearable placeholder="请选择">
<el-option v-for="item in zuJianLeiXingSelect" :key="item.elementId" :label="item.elementName" :value="item.elementId"></el-option>
<el-option v-for="item in zuJianLeiXingSelect" :key="item.typeId" :label="item.elementName" :value="item.typeId"></el-option>
</el-select>
</el-form-item>
</div>
......@@ -219,6 +222,7 @@
let4: 0,
let5: '显示',
let6: '',
dynamicForm0_: [],
dynamicForm_: [],
archiBelongId: null,
},
......@@ -280,6 +284,32 @@
this.set_table_height();
},
methods: {
queryGuanLianZiChan(data){
if (data !== '') {
setTimeout(() => {
this.getGuanLianZiChanSelectData(data);
}, 200);
}else {
this.getGuanLianZiChanSelectData(null);
}
},
guanLianZiChanChange(data){//关联资产选择后
let dynamicForm0_Array = [];
if(data.length == 0) {
this.ruleForm.dynamicForm0_ = [];
}else {
data.forEach(item => {
const items = this.guanLianZiChanSelect.find(item2 => item2.assetId == item);
dynamicForm0_Array.push({
assetName: items.assetName,
assetId: items.assetId,
relaName: ''
})
})
this.ruleForm.dynamicForm0_ = dynamicForm0_Array;
}
},
getGuanLianZiChanSelectData(assetName) {//关联资产下拉菜单
const params = {
assetName: assetName,
......@@ -287,13 +317,15 @@
}
queryGuanLianZiChanSelect(params).then(res => {
console.log(res)
this.guanLianZiChanSelect = res.data;
});
},
saveDialog() {//弹框保存
this.$refs.form.validate(valid => {
if(valid) {
// console.log(this.ruleForm);
let parentAssetName, assetCode, fieldsValue = [], eleName;
let parentAssetName, assetCode, fieldsValue = [], eleName, targetAsset = [];
if(this.ruleForm.let2 && this.shangJiJieDianSelect.length > 0) {
const items = this.shangJiJieDianSelect.find(item => item.assetId == this.ruleForm.let2);
......@@ -301,7 +333,7 @@
assetCode = items.parentCode;
}
const items2 = this.zuJianLeiXingSelect.find(item => item.elementId == this.ruleForm.let3);
const items2 = this.zuJianLeiXingSelect.find(item => item.typeId == this.ruleForm.let3);
eleName = items2.elementName;
if(this.ruleForm.dynamicForm_.length > 0) {
......@@ -316,6 +348,19 @@
}else {
fieldsValue = [{}];
}
if(this.ruleForm.dynamicForm0_.length > 0) {
this.ruleForm.dynamicForm0_.forEach(item => {
targetAsset.push({
assetName: item.assetName,
assetId: item.assetId,
relaName: item.relaName,
})
})
}else {
targetAsset = [{}];
}
console.log(targetAsset)
const params = {
archiAssetState: 2,
archiStage: 1,
......@@ -329,6 +374,7 @@
parentAssetName: parentAssetName,
isShow: this.ruleForm.let5 == '显示' ? 1 : 0,
fieldsValue: fieldsValue,
targetAsset: targetAsset,
assetCode: assetCode,
eleName: eleName
}
......@@ -434,7 +480,9 @@
this.ruleForm.let3 = null;
this.ruleForm.let4 = 0;
this.ruleForm.let5 = '显示';
this.ruleForm.let6 = null;
this.ruleForm.dynamicForm_ = [];
this.ruleForm.dynamicForm0_ = [];
});
},
editItem(row){//编辑
......@@ -447,7 +495,23 @@
this.ruleForm.let5 = row.isShow == 1 ? '显示' : '隐藏';
this.editId = row.assetId;
let fieldsValue = row.fieldsValue;
let targetAsset = row.targetAsset;
let targetAsset_id = [];
if(targetAsset.length == 4) {
this.ruleForm.dynamicForm0_ = [];
}else {
let targetAsset_ = JSON.parse(targetAsset);
this.ruleForm.dynamicForm0_ = targetAsset_;
targetAsset_.forEach(item => {
targetAsset_id.push(
item.assetId
)
})
console.log(targetAsset_id)
}
this.ruleForm.let6 = targetAsset_id;
if(fieldsValue.length == 4) {
this.ruleForm.dynamicForm_ = [];
}else {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!