Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 22b58731 by liuyong
Options

修改bug

1 parent dec2b0a5
Expand all
Inline Side-by-side
Showing with 221 additions and 52 deletions
public/drawio/extention/js/exGraph.js
...@@ -66,11 +66,27 @@ ...@@ -66,11 +66,27 @@
this.addPaletteFunctions(item.arciBelongId, item.arciBelongName, true, fns); this.addPaletteFunctions(item.arciBelongId, item.arciBelongName, true, fns);
}else { }else {
item.eleDtos.forEach(item2 => { item.eleDtos.forEach(item2 => {
if(item2.assets) { if(item2.assets && item2.dicys) {
let attr_ = [];
item2.dicys.forEach(res => {
if(res.fieldName) {
attr_.push(
{
name: res.fieldName,
value: res.propertyValue,
id: res.propertyId,
controlType: res.controlType,
}
)
}
})
item2.assets.forEach(item3 => { item2.assets.forEach(item3 => {
// console.log(item3.fieldsValue)
fns.push( fns.push(
this.createVertexTemplateEntry( this.createVertexTemplateEntry(
item2.iconName + ';fillColor=' + item2.color + ';' + 'attr=[]' + ';assetId=' + item3.assetId + ';archiBelongId=' + item3.archiBelongId + ';', item2.iconName + ';fillColor=' + item2.color + ';' + 'attr=' + JSON.stringify(attr_) + ';assetId=' + item3.assetId + ';archiBelongId=' + item3.archiBelongId + ';',
item2.shapeWidth ? item2.shapeWidth : 150, item2.shapeWidth ? item2.shapeWidth : 150,
item2.shapeHeight ? item2.shapeHeight : 75, item2.shapeHeight ? item2.shapeHeight : 75,
null, null,
......
src/api/index.js
...@@ -490,4 +490,8 @@ export function dicyUpdateTableDelete(params) { ...@@ -490,4 +490,8 @@ export function dicyUpdateTableDelete(params) {
// 架构视图管理，清单列表 // 架构视图管理，清单列表
export function queryViewManageQingDan(params) { export function queryViewManageQingDan(params) {
return post('/network/ma-ml/asset-ele-list', params); return post('/network/ma-ml/asset-ele-list', params);
}
// 总体架构资产智能搜索，左侧树
export function archiIntelligenceSearchTree(params) {
return post('/network/arc-ast-cn/assetTree', params);
} }
\ No newline at end of file
src/views/archi-intelligence-search/index.vue
<template> <template>
<div class="archiIntelligenceSearch"> <div class="archiIntelligenceSearch">
<div class="left_container"></div> <div class="left_container">
<el-tree
class="filter-tree"
:data="treeData"
:highlight-current="true"
:props="{ children: 'subList', label: 'assetName', id: 'assetId' }"
default-expand-all
show-checkbox
node-key="assetId"
@check="treeCheckChange"
ref="tree">
</el-tree>
</div>
<div class="right_container"></div> <div class="right_container"></div>
</div> </div>
</template> </template>
<script> <script>
import { import {
getJiShuZhengCeJieGouHuaTable, archiIntelligenceSearchTree,
addJiShuZhengCeJieGouHuaTable,
editJiShuZhengCeJieGouHuaTable,
getDianXingAnLiSelectData,
deleteAllJiShuZhengCeJieGouHua,
exportJiShuZhengCeJieGouHuaTable
} 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';
...@@ -21,14 +28,28 @@ export default { ...@@ -21,14 +28,28 @@ export default {
name: 'ArchiIntelligenceSearch', name: 'ArchiIntelligenceSearch',
data() { data() {
return { return {
treeData: [],
}; };
}, },
mounted(){ mounted(){
this.getTreeData();
}, },
methods: { methods: {
getTreeData() {//查询左侧树
const params = {
"assetName": null,
"versionId": null
}
archiIntelligenceSearchTree(params).then(res => {
if(res.code == 200) {
this.treeData = res.data;
}
});
},
treeCheckChange(data, tree) {//左侧树勾选
console.log(data)
console.log(tree)
},
} }
} }
</script> </script>
...@@ -36,17 +57,26 @@ export default { ...@@ -36,17 +57,26 @@ export default {
</style> </style>
<style scoped> <style scoped>
.filter-tree{
width: 300px;
height: 100%;
overflow-y: auto;
}
/deep/ .is-leaf {
background-color: #fff !important;
}
.archiIntelligenceSearch{ .archiIntelligenceSearch{
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
} }
.left_container{ .left_container{
width: 300px; width: 20%;
margin-right: 20px;
height: 100%; height: 100%;
} }
.right_container{ .right_container{
width: calc(100% - 300px); width: 80%;
height: 100%; height: 100%;
} }
</style> </style>
\ No newline at end of file
src/views/busi-assets-list/index.vue
...@@ -843,6 +843,7 @@ ...@@ -843,6 +843,7 @@
this.tableHeight = right_container_height - 260 + 'px'; this.tableHeight = right_container_height - 260 + 'px';
}, },
treeClick(data) {//左侧树点击 treeClick(data) {//左侧树点击
if(!data.archiBelongId) return;
this.archiBelongId = data.archiBelongId; this.archiBelongId = data.archiBelongId;
this.assetConstant = data.assetConstant; this.assetConstant = data.assetConstant;
// this.archiAssetTypeId = data.viewId; // this.archiAssetTypeId = data.viewId;
......
src/views/current-assets-list/index.vue
...@@ -843,6 +843,7 @@ ...@@ -843,6 +843,7 @@
this.tableHeight = right_container_height - 260 + 'px'; this.tableHeight = right_container_height - 260 + 'px';
}, },
treeClick(data) {//左侧树点击 treeClick(data) {//左侧树点击
if(!data.archiBelongId) return;
this.archiBelongId = data.archiBelongId; this.archiBelongId = data.archiBelongId;
this.assetConstant = data.assetConstant; this.assetConstant = data.assetConstant;
// this.archiAssetTypeId = data.viewId; // this.archiAssetTypeId = data.viewId;
......
src/views/systemInfoManage/index.vue
...@@ -4,8 +4,26 @@ ...@@ -4,8 +4,26 @@
<div class="search_menu"> <div class="search_menu">
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<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.conformCount" placeholder="请选择" class="search_item"> <el-select v-model="searchParams.let1" placeholder="请选择" class="search_item">
<el-option v-for="item in fuHeDu" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
<div class="search_menu_item">
<span class="search_title">部门</span>
<el-select v-model="searchParams.let2" placeholder="请选择" class="search_item">
<el-option v-for="item in fuHeDu" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
<div class="search_menu_item">
<span class="search_title">系统名称</span>
<el-select v-model="searchParams.let3" placeholder="请选择" class="search_item">
<el-option v-for="item in fuHeDu" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
<div class="search_menu_item">
<span class="search_title">建设类型</span>
<el-select v-model="searchParams.let4" placeholder="请选择" class="search_item">
<el-option v-for="item in fuHeDu" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in fuHeDu" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</div> </div>
...@@ -22,32 +40,29 @@ ...@@ -22,32 +40,29 @@
</div> </div>
</div> </div>
<div class="search_btn"> <div class="search_btn">
<el-button type="primary" size="medium" icon="el-icon-document-add">新建</el-button> <el-button type="primary" size="medium" icon="el-icon-document-add" @click="operation('add', null)">新建统推系统</el-button>
<el-button type="primary" size="medium" icon="el-icon-document-add" @click="operation('add', null)">新建自建系统</el-button>
<el-button type="primary" size="medium" icon="el-icon-delete">删除</el-button> <el-button type="primary" size="medium" icon="el-icon-delete">删除</el-button>
<div class="version_btn">
<img class="btn_icon" src="@/assets/archi-ele-list/version.png" alt="" />
<p>发布</p>
</div>
<div class="cancel_version_btn">
<img class="btn_icon" src="@/assets/archi-ele-list/version.png" alt="" />
<p>取消发布</p>
</div>
</div> </div>
<el-table :height="tableHeight" v-loading="loading" :data="tableData" stripe border> <el-table :height="tableHeight" v-loading="loading" :data="tableData" stripe border>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <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="deptName" label="单位" align="center"></el-table-column>
<el-table-column prop="startTime" label="统计时间" align="center"></el-table-column> <el-table-column prop="startTime" label="部门" align="center"></el-table-column>
<el-table-column prop="policyName" label="政策名称" align="center"></el-table-column> <el-table-column prop="policyName" label="系统名称" align="center" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="policyContent" 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"> <el-table-column prop="policyContent" label="承建单位" align="center"></el-table-column>
<el-table-column prop="policyContent" label="建设类型" align="center"></el-table-column>
<el-table-column prop="usefulCount" label="项目经理" align="center"></el-table-column>
<el-table-column prop="remark" label="创建人" align="center"></el-table-column>
<el-table-column prop="remark" label="创建时间" align="center"></el-table-column>
<el-table-column label="操作" width="260" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div style="display: flex;align-items: center;justify-content: center;">
{{ scope.row.conformCount }}% <el-button icon="el-icon-edit" type="primary" size="mini" @click="operation('edit', scope.row)" :disabled="scope.row.state == 1">编辑</el-button>
<el-button class="shanChu_btn" icon="el-icon-delete" size="mini" @click="operation('delete', scope.row)" :disabled="scope.row.state == 1">删除</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="usefulCount" label="应用数量" align="center"></el-table-column>
<el-table-column prop="remark" label="备注" align="center"></el-table-column>
</el-table> </el-table>
<!-- <el-pagination <!-- <el-pagination
background background
...@@ -66,24 +81,45 @@ ...@@ -66,24 +81,45 @@
</el-pagination> </el-pagination>
</div> </div>
<el-dialog <el-dialog
:title="is_add_edit == 'add' ? '新建字典' : '编辑字典'" :title="is_add_edit == 'add' ? '新建统推系统' : '编辑统推系统'"
:visible.sync="add_dialog" :visible.sync="add_dialog"
:center="false" :center="false"
:close-on-click-modal="false" :close-on-click-modal="false"
width="60%"> width="60%">
<el-form :model="ruleForm" ref="form" :rules="rules" style="display: flex;flex-wrap: wrap;"> <el-form :model="ruleForm" ref="form" :rules="rules" style="display: flex;flex-wrap: wrap;">
<el-form-item label="字典名称:" prop="let1"> <el-form-item label="单位:" prop="let1">
<el-input v-no-backslash v-model="ruleForm.let1" maxlength="100"></el-input> <el-select clearable placeholder="请选择" v-model="ruleForm.let1">
<el-option label="单行文本框" value="0"></el-option>
<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="let2"> <el-form-item label="部门:" prop="let2">
<el-input v-no-backslash v-model="ruleForm.let2" maxlength="100"></el-input> <el-select clearable placeholder="请选择" v-model="ruleForm.let2">
<el-option label="单行文本框" value="0"></el-option>
<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 class="cross1" label="描述:" prop="let3"> <el-form-item label="系统名称:" prop="let3">
<el-input v-no-backslash tv-model="ruleForm.let3" ype="textarea" :rows="3" maxlength="200" show-word-limit placeholder="请输入内容" ></el-input> <el-input v-no-backslash v-model="ruleForm.let3" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="建设类型:" prop="let4">
<el-select clearable placeholder="请选择" v-model="ruleForm.let4">
<el-option label="单行文本框" value="0"></el-option>
<el-option label="多行文本框" value="1"></el-option>
<el-option label="下拉框" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="承建单位:" prop="let5">
<el-input v-no-backslash v-model="ruleForm.let5" maxlength="100" style="width: 218px;"></el-input>
</el-form-item>
<el-form-item label="项目经理:" prop="let6">
<el-input v-no-backslash v-model="ruleForm.let6" maxlength="100"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="save_dicy">保存</el-button> <el-button class="greenButton" @click="dialogOperation('save', null)">保存</el-button>
<el-button @click="add_dialog = false">取消</el-button> <el-button @click="add_dialog = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -106,12 +142,26 @@ export default { ...@@ -106,12 +142,26 @@ export default {
data() { data() {
return { return {
ruleForm: { ruleForm: {
let1: '', let1: null,
let2: '', let2: null,
let3: '', let3: null,
let4: null,
let5: null,
let6: null,
}, },
rules: { rules: {
let1: [
{ required: true, message: '请选择单位', trigger: 'change' },
],
let2: [
{ required: true, message: '请选择部门', trigger: 'change' },
],
let3: [
{ required: true, message: '请输入系统名称', trigger: 'blur' },
],
let4: [
{ required: true, message: '请选择建设类型', trigger: 'change' },
],
}, },
add_dialog: false, add_dialog: false,
is_add_edit: 'add', is_add_edit: 'add',
...@@ -126,8 +176,10 @@ export default { ...@@ -126,8 +176,10 @@ export default {
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
policyName: null, let1: null,
conformCount: null, let2: null,
let3: null,
let4: null,
}, },
fuHeDu: [], fuHeDu: [],
...@@ -144,7 +196,63 @@ export default { ...@@ -144,7 +196,63 @@ export default {
}) })
}, },
methods: { methods: {
save_dicy() {//保存字典 operation(type, data) {
switch(type){
case 'add':
this.openAddDialog();
break;
case 'edit':
this.editItem(data);
break;
case 'delete':
this.deleteItem(data);
break;
case 7680:
break;
case 11200:
break;
}
},
editItem(row) {//编辑
},
deleteItem(row) {//删除
},
openAddDialog() {//打开新建系统窗口
this.add_dialog = true;
this.$nextTick(() => {
this.$refs.form.resetFields();
this.ruleForm.let1 = null;
this.ruleForm.let2 = null;
this.ruleForm.let3 = null;
this.ruleForm.let4 = null;
this.ruleForm.let5 = null;
this.ruleForm.let6 = null;
});
},
dialogOperation(type, data) {
switch(type){
case 'save':
this.save_dialog();
break;
case 3200:
break;
case 3840:
break;
case 7680:
break;
case 11200:
break;
}
},
save_dialog() {//保存
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if(valid) { if(valid) {
...@@ -176,8 +284,10 @@ export default { ...@@ -176,8 +284,10 @@ export default {
this.get_table(); this.get_table();
}, },
reset() {//重置 reset() {//重置
this.searchParams.policyName = null; this.searchParams.let1 = null;
this.searchParams.conformCount = null; this.searchParams.let2 = null;
this.searchParams.let3 = null;
this.searchParams.let4 = null;
}, },
// 每页条数改变 // 每页条数改变
handleSizeChange(val) { handleSizeChange(val) {
...@@ -193,8 +303,10 @@ export default { ...@@ -193,8 +303,10 @@ export default {
get_table() {//查询表格数据 get_table() {//查询表格数据
this.loading = true; this.loading = true;
const params = { const params = {
"policyName": this.searchParams.policyName, "let1": this.searchParams.let1,
"conformCount": this.searchParams.conformCount, "let2": this.searchParams.let2,
"let3": this.searchParams.let3,
"let4": this.searchParams.let4,
"current": this.pager.current, "current": this.pager.current,
"pageSize": this.pager.size, "pageSize": this.pager.size,
}; };
...@@ -242,6 +354,9 @@ export default { ...@@ -242,6 +354,9 @@ export default {
} }
</style> </style>
<style scoped> <style scoped>
/deep/ .el-form-item__label{
width: 100px;
}
.version_btn{ .version_btn{
display: flex; display: flex;
align-items: center; align-items: center;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!