Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 2f74943d by liuyong
Options

修改代码

1 parent e244fe48
Inline Side-by-side
Showing with 58 additions and 34 deletions
public/drawio/extention/js/exApp.js
...@@ -84,16 +84,8 @@ const setIcon = function (itemIcon, dicys, color) { ...@@ -84,16 +84,8 @@ const setIcon = function (itemIcon, dicys, color) {
// ]; // ];
const leftCustomGraph = function(that) {//左侧自定义图形 const leftCustomGraph = function(that) {//左侧自定义图形
$.ajax({ const leftGraph = JSON.parse(localStorage.getItem('leftGraph'));
method: "post", leftGraph.forEach(function(item) {
url: `http://${ajaxUrl}/ma-ml/archi-list`,
data: JSON.stringify({
metaModelId: urlParams['id']
}),
contentType: "application/json",
success: function(result) {
result.data.reverse();
result.data.forEach(function(item) {
if(item.eleDtos) { if(item.eleDtos) {
if(item.eleDtos.length > 0) { if(item.eleDtos.length > 0) {
const libraryName = item.arciBelongName; const libraryName = item.arciBelongName;
...@@ -127,16 +119,11 @@ const leftCustomGraph = function(that) {//左侧自定义图形 ...@@ -127,16 +119,11 @@ const leftCustomGraph = function(that) {//左侧自定义图形
} }
}) })
// const icons = result.data[1].eleDtos[2].icon; // const icons = leftGraph[1].eleDtos[2].icon;
// const item_icon = icons.split("base64,")[1]; // const item_icon = icons.split("base64,")[1];
// const decode_item_icon = (window.atob) ? atob(item_icon) : Base64.decode(item_icon);//svg解码，为字符串 // const decode_item_icon = (window.atob) ? atob(item_icon) : Base64.decode(item_icon);//svg解码，为字符串
// const svgDocument = new DOMParser().parseFromString(decode_item_icon, 'text/xml');//svg字符串转标签 // const svgDocument = new DOMParser().parseFromString(decode_item_icon, 'text/xml');//svg字符串转标签
// console.log(svgDocument) // console.log(svgDocument)
},
error: function(error) {
}
});
} }
//二次开发，创建时不必先保存文件至本地，定义Dialogs.js文件里面的createTemporaryFile函数 //二次开发，创建时不必先保存文件至本地，定义Dialogs.js文件里面的createTemporaryFile函数
......
src/api/index.js
...@@ -4,7 +4,9 @@ import { get, post, download } from '@/utils/http'; ...@@ -4,7 +4,9 @@ import { get, post, download } from '@/utils/http';
export function query_jia_gou_yuan_su_guan_xi_table(params) {//查询架构元素管理表格 export function query_jia_gou_yuan_su_guan_xi_table(params) {//查询架构元素管理表格
return post('/network/ele/', params); return post('/network/ele/', params);
} }
export function getDrawioLeftGraph(params) {//查询画布左侧自定义图形
return post('/network/ma-ml/archi-list', params);
}
// 导入列表 // 导入列表
export function offlineQuery(params) { export function offlineQuery(params) {
return post(`/network/anasz-smart-screen/offlineQuery/`, params); return post(`/network/anasz-smart-screen/offlineQuery/`, params);
......
src/views/archi-ele-list/index.vue
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</el-form-item> </el-form-item>
<el-form-item label="架构层次:" prop="let2"> <el-form-item label="架构层次:" prop="let2">
<el-select placeholder="请选择" v-model="ruleForm.let2"> <el-select clearable placeholder="请选择" v-model="ruleForm.let2">
<el-option v-for="item in dialog_select1" :key="item.levelId" :label="item.name" :value="item.levelId"></el-option> <el-option v-for="item in dialog_select1" :key="item.levelId" :label="item.name" :value="item.levelId"></el-option>
<el-input placeholder="请输入内容" v-model="add_select_item"> <el-input placeholder="请输入内容" v-model="add_select_item">
<div slot="append" @click="add_select1"> <div slot="append" @click="add_select1">
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</el-form-item> </el-form-item>
<el-form-item label="架构归属:" prop="let3"> <el-form-item label="架构归属:" prop="let3">
<el-select placeholder="请选择" v-model="ruleForm.let3"> <el-select clearable placeholder="请选择" v-model="ruleForm.let3">
<el-option v-for="item in search_select1" :key="item.belongId" :label="item.name" :value="item.belongId"></el-option> <el-option v-for="item in search_select1" :key="item.belongId" :label="item.name" :value="item.belongId"></el-option>
<el-input placeholder="请输入内容" v-model="add_select_item2"> <el-input placeholder="请输入内容" v-model="add_select_item2">
<div slot="append" @click="add_select2"> <div slot="append" @click="add_select2">
......
src/views/archi-view-manage/index.vue
...@@ -134,7 +134,8 @@ import { ...@@ -134,7 +134,8 @@ import {
getArchiViewManageDetail, getArchiViewManageDetail,
addArchiViewManage, addArchiViewManage,
deleteArchiViewManage, deleteArchiViewManage,
queryArchiViewManageCardDetails queryArchiViewManageCardDetails,
getDrawioLeftGraph
} from '@/api/index.js'; } from '@/api/index.js';
import { MessageBox, Message } from 'element-ui'; import { MessageBox, Message } from 'element-ui';
import $ from 'jquery'; import $ from 'jquery';
...@@ -196,6 +197,15 @@ export default { ...@@ -196,6 +197,15 @@ export default {
this.getData(); this.getData();
}, },
methods: { methods: {
queryDrawioGraph(id) {//查询画布左侧图形
const params = {
metaModelId: id
}
getDrawioLeftGraph(params).then(res => {
res.data.reverse();
localStorage.setItem('leftGraph', JSON.stringify(res.data));
})
},
to_current_details(item) {//跳转到详情 to_current_details(item) {//跳转到详情
const params = { const params = {
viewDetailsId: item.viewDetailsId viewDetailsId: item.viewDetailsId
...@@ -208,6 +218,7 @@ export default { ...@@ -208,6 +218,7 @@ export default {
localStorage.setItem('xmlData', xmlData); localStorage.setItem('xmlData', xmlData);
localStorage.setItem('xmlTitle', xmlTitle); localStorage.setItem('xmlTitle', xmlTitle);
this.queryDrawioGraph(id);
this.$router.push( `/main/archiViewManageDetails/id=${id}`, () => {}, () => {} ); this.$router.push( `/main/archiViewManageDetails/id=${id}`, () => {}, () => {} );
} }
}); });
......
src/views/meta-model-list/index.vue
...@@ -104,7 +104,8 @@ import { ...@@ -104,7 +104,8 @@ import {
add_yuan_mo_xing, add_yuan_mo_xing,
get_yuan_mo_xing_list, get_yuan_mo_xing_list,
delete_yuan_mo_xing_list, delete_yuan_mo_xing_list,
query_yuan_mo_xing_details query_yuan_mo_xing_details,
getDrawioLeftGraph
} from '@/api/index.js'; } from '@/api/index.js';
import { MessageBox, Message } from 'element-ui'; import { MessageBox, Message } from 'element-ui';
import $ from 'jquery'; import $ from 'jquery';
...@@ -294,10 +295,20 @@ export default { ...@@ -294,10 +295,20 @@ export default {
const xmlTitle = res.data.verName; const xmlTitle = res.data.verName;
localStorage.setItem('xmlData', xmlData); localStorage.setItem('xmlData', xmlData);
localStorage.setItem('xmlTitle', xmlTitle); localStorage.setItem('xmlTitle', xmlTitle);
this.queryDrawioGraph(item.metaModelId);
this.$router.push( `/main/metaModelListDetails/id=${item.metaModelId}&version=${item.version}`, () => {}, () => {} ); this.$router.push( `/main/metaModelListDetails/id=${item.metaModelId}&version=${item.version}`, () => {}, () => {} );
} }
}); });
}, },
queryDrawioGraph(id) {//查询画布左侧图形
const params = {
metaModelId: id
}
getDrawioLeftGraph(params).then(res => {
res.data.reverse();
localStorage.setItem('leftGraph', JSON.stringify(res.data));
})
},
handleCommand(command) {//新建按钮点击 handleCommand(command) {//新建按钮点击
if(command == '自由绘图') { if(command == '自由绘图') {
this.add_dialog = true; this.add_dialog = true;
......
src/views/report-template-fabric/index.vue
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">模板类型</span> <span class="search_title">模板类型</span>
<el-input maxlength="100" v-model="searchParams.tempType" placeholder="请输入内容" class="search_item"></el-input> <el-select clearable v-model="searchParams.tempType" 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-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-option v-for="item in moBanLeiXing" :key="item.value" :label="item.tempName" :value="item.value"></el-option>
</el-select> --> </el-select> -->
...@@ -19,6 +22,7 @@ ...@@ -19,6 +22,7 @@
<el-date-picker <el-date-picker
v-model="searchParams.createTime" v-model="searchParams.createTime"
type="daterange" type="daterange"
clearable
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
:unlink-panels="true" :unlink-panels="true"
...@@ -57,7 +61,9 @@ ...@@ -57,7 +61,9 @@
<el-table-column prop="version" label="版本" align="center"></el-table-column> <el-table-column prop="version" label="版本" align="center"></el-table-column>
<el-table-column label="附件" align="center"> <el-table-column label="附件" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.fileName" @click="exportFile()" type="text" style="text-decoration: underline;color: #0D867F;">{{ scope.row.fileName }}</el-button> <el-tooltip v-if="scope.row.fileName" :content="scope.row.fileName" placement="top" effect="light">
<el-button @click="exportFile(scope.row)" type="text" style="text-decoration: underline;color: #0D867F;">{{ scope.row.fileName }}</el-button>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="tempRemark" width="200" :show-overflow-tooltip="true" label="备注" align="center"></el-table-column> <el-table-column prop="tempRemark" width="200" :show-overflow-tooltip="true" label="备注" align="center"></el-table-column>
...@@ -100,7 +106,10 @@ ...@@ -100,7 +106,10 @@
<el-input maxlength="100" v-model="ruleForm.let1"></el-input> <el-input maxlength="100" v-model="ruleForm.let1"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模版类型:" prop="let2"> <el-form-item label="模版类型:" prop="let2">
<el-input maxlength="100" v-model="ruleForm.let2"></el-input> <el-select clearable v-model="ruleForm.let2" placeholder="请选择" style="width: 210px;">
<el-option label="需求模版" :value="1"></el-option>
<el-option label="概设模版" :value="2"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="模版文件:" prop="let3" style="width: 100%;"> <el-form-item label="模版文件:" prop="let3" style="width: 100%;">
<!-- <input @change="fileUpload" type="file" /> --> <!-- <input @change="fileUpload" type="file" /> -->
...@@ -162,7 +171,7 @@ export default { ...@@ -162,7 +171,7 @@ export default {
{ required: true, message: '请输入模版名称', trigger: 'blur' }, { required: true, message: '请输入模版名称', trigger: 'blur' },
], ],
let2: [ let2: [
{ required: true, message: '请输入模版类型', trigger: 'blur' }, { required: true, message: '请选择模版类型', trigger: 'change' },
], ],
let3: [ let3: [
{ {
...@@ -213,8 +222,8 @@ export default { ...@@ -213,8 +222,8 @@ export default {
}, },
methods: { methods: {
exportFile() {//附件下载 exportFile(row) {//附件下载
window.open(row.fileUrl);
}, },
editItem(row) {//编辑 editItem(row) {//编辑
this.is_add_edit = 'edit'; this.is_add_edit = 'edit';
...@@ -279,7 +288,7 @@ export default { ...@@ -279,7 +288,7 @@ export default {
tempType: this.ruleForm.let2, tempType: this.ruleForm.let2,
fileId: this.ruleForm.let3, fileId: this.ruleForm.let3,
fileName: this.ruleForm.let5, fileName: this.ruleForm.let5,
fileLink: this.ruleForm.let6, fileUrl: this.ruleForm.let6,
tempRemark: this.ruleForm.let4, tempRemark: this.ruleForm.let4,
}; };
const requestParams = this.is_add_edit == 'add' ? params : { ...params, krtId: this.editId }; const requestParams = this.is_add_edit == 'add' ? params : { ...params, krtId: this.editId };
......
src/views/report-template-relative-use/index.vue
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">模版名称</span> <span class="search_title">模版名称</span>
<el-input maxlength="100" v-model="searchParams.tempName" placeholder="请输入内容" class="search_item"></el-input> <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-select>
</div> </div>
</div> </div>
<div class="search_menu_btn_container"> <div class="search_menu_btn_container">
...@@ -120,7 +122,7 @@ ...@@ -120,7 +122,7 @@
<el-input maxlength="100" v-model="ruleForm.let3"></el-input> <el-input maxlength="100" v-model="ruleForm.let3"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模板名称:" prop="let4"> <el-form-item label="模板名称:" prop="let4">
<el-select v-model="ruleForm.let4" placeholder="请选择" style="width: 210px;"> <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.krtId" :label="item.tempName" :value="item.krtId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
......
src/views/tech-politics-fabric/index.vue
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<el-date-picker <el-date-picker
v-model="searchParams.startTime" v-model="searchParams.startTime"
type="daterange" type="daterange"
clearable
:unlink-panels="true" :unlink-panels="true"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">状态</span> <span class="search_title">状态</span>
<el-select v-model="searchParams.state" placeholder="请选择" class="search_item"> <el-select clearable v-model="searchParams.state" placeholder="请选择" class="search_item">
<el-option label="已启用" value="1"></el-option> <el-option label="已启用" value="1"></el-option>
<el-option label="已停用" value="0"></el-option> <el-option label="已停用" value="0"></el-option>
</el-select> </el-select>
...@@ -115,7 +116,7 @@ ...@@ -115,7 +116,7 @@
<el-input v-model="ruleForm.let1" maxlength="100"></el-input> <el-input v-model="ruleForm.let1" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用范围:" prop="let2"> <el-form-item label="适用范围:" prop="let2">
<el-select v-model="ruleForm.let2" placeholder="请选择"> <el-select clearable v-model="ruleForm.let2" placeholder="请选择">
<el-option v-for="item in shiYongFanWei" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in shiYongFanWei" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -123,20 +124,21 @@ ...@@ -123,20 +124,21 @@
<el-input v-model="ruleForm.let3" maxlength="100"></el-input> <el-input v-model="ruleForm.let3" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="级别:" prop="let4" style="margin-left: 27px;width: 30.5%;"> <el-form-item label="级别:" prop="let4" style="margin-left: 27px;width: 30.5%;">
<el-select v-model="ruleForm.let4" placeholder="请选择" style="width: 200px;"> <el-select clearable v-model="ruleForm.let4" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in jiBie" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in jiBie" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="启用时间:" prop="let5"> <el-form-item label="启用时间:" prop="let5">
<el-date-picker <el-date-picker
v-model="ruleForm.let5" v-model="ruleForm.let5"
clearable
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="状态:" prop="let6" style="margin-left: 27px;width: 30.5%;"> <el-form-item label="状态:" prop="let6" style="margin-left: 27px;width: 30.5%;">
<el-select v-model="ruleForm.let6" placeholder="请选择" style="width: 200px;"> <el-select clearable v-model="ruleForm.let6" placeholder="请选择" style="width: 200px;">
<el-option label="已启用" :value="1"></el-option> <el-option label="已启用" :value="1"></el-option>
<el-option label="已停用" :value="0"></el-option> <el-option label="已停用" :value="0"></el-option>
</el-select> </el-select>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!