Skip to content

liangzhen / framework-tools-web

Go to a project
Commit f9197d99 by liuyong
Options

修改bug

1 parent d8a2f89d
Inline Side-by-side
Showing with 42 additions and 349 deletions
src/views/archi-intelligence-search/index.vue
...@@ -71,9 +71,9 @@ export default { ...@@ -71,9 +71,9 @@ export default {
} }
}, },
force: { force: {
repulsion: 1000 repulsion: 6000
}, },
edgeSymbol: ['circle', 'arrow'], // edgeSymbol: ['circle', 'arrow'],
data: seriesData, data: seriesData,
links: linkData links: linkData
} }
...@@ -95,7 +95,6 @@ export default { ...@@ -95,7 +95,6 @@ export default {
}, },
treeCheckChange(data, tree) {//左侧树勾选 treeCheckChange(data, tree) {//左侧树勾选
let seriesData = [], linkData = []; let seriesData = [], linkData = [];
console.log(tree.checkedNodes)
if(tree.checkedNodes.length > 0) { if(tree.checkedNodes.length > 0) {
tree.checkedNodes.forEach(item => { tree.checkedNodes.forEach(item => {
if(!item.targetList){ if(!item.targetList){
...@@ -125,7 +124,6 @@ export default { ...@@ -125,7 +124,6 @@ export default {
}, },
} }
}) })
linkData.push({ linkData.push({
source: item.assetCode, source: item.assetCode,
target: item2.assetCode, target: item2.assetCode,
...@@ -133,7 +131,20 @@ export default { ...@@ -133,7 +131,20 @@ export default {
}) })
} }
}) })
console.log(seriesData)
var new_arr2 = []
for (var i = 0; i < seriesData.length; i++) {
var flag = true
for (var j = 0; j < new_arr2.length; j++) {
if (new_arr2[j].id == seriesData[i].id) {
flag = false
}
}
if (flag) {
new_arr2.push(seriesData[i])
}
}
seriesData = new_arr2;
this.echarts1(seriesData, linkData); this.echarts1(seriesData, linkData);
}else { }else {
this.myChart.dispose(); this.myChart.dispose();
......
src/views/archiAssetVisualShow/index.vue
<template> <template>
<div class="archiAssetVisualShow"> <div class="archiAssetVisualShow">
<div class="table_container"> <el-tree
<div class="search_menu"> class="filter-tree"
<div class="search_menu_item_container"> :data="treeData"
<div class="search_menu_item"> :highlight-current="true"
<span class="search_title">演进项</span> default-expand-all
<el-select v-model="searchParams.conformCount" placeholder="请选择" class="search_item"> node-key="viewId"
<el-option v-for="item in fuHeDu" :key="item.value" :label="item.label" :value="item.value"></el-option> @node-click="treeClick"
</el-select> :props="{ children: 'subList', label: 'viewName', id: 'viewId' }"
</div> ref="tree">
</div> </el-tree>
<div class="search_menu_btn_container"> <div class="right_container">
<div class="query_btn" @click="search_table">
<img class="btn_icon" src="@/assets/archi-ele-list/search.png" alt="" />
<p>查询</p>
</div>
<div class="reset_btn" @click="reset">
<img class="btn_icon" src="@/assets/archi-ele-list/reset.png" alt="" />
<p>重置</p>
</div>
</div>
</div>
<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-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>
<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 prop="deptName" 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="policyContent" label="政策描述" align="center"></el-table-column>
<el-table-column prop="conformCount" label="符合度" align="center">
<template slot-scope="scope">
<div>
{{ scope.row.conformCount }}%
</div>
</template>
</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-pagination
background
layout="prev, pager, next"
:total="50">
</el-pagination> -->
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pager.current"
:page-sizes="pager.sizes"
:page-size="pager.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager.total">
</el-pagination>
</div> </div>
<el-dialog
:title="is_add_edit == 'add' ? '新建字典' : '编辑字典'"
:visible.sync="add_dialog"
:center="false"
:close-on-click-modal="false"
width="60%">
<el-form :model="ruleForm" ref="form" :rules="rules" style="display: flex;flex-wrap: wrap;">
<el-form-item label="字典名称:" prop="let1">
<el-input v-no-backslash v-model="ruleForm.let1" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="字典标识:" prop="let2">
<el-input v-no-backslash v-model="ruleForm.let2" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross1" 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-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="save_dicy">保存</el-button>
<el-button @click="add_dialog = false">取消</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -105,281 +31,34 @@ export default { ...@@ -105,281 +31,34 @@ export default {
}, },
data() { data() {
return { return {
ruleForm: { treeData: []
let1: '',
let2: '',
let3: '',
},
rules: {
},
add_dialog: false,
is_add_edit: 'add',
tableData: [],
loading: false,
search_select1: [],
pager: {
current: 1,
sizes: [10, 20, 50, 100, 200],
size: 10,
total: 20 //总条数
},
tableHeight: null,
searchParams: {
policyName: null,
conformCount: null,
},
fuHeDu: [],
}; };
}, },
mounted(){ mounted(){
window.addEventListener('resize', () => {
this.set_table_height();
})
this.set_table_height();
this.get_table();
this.get_fu_he_du_select().then(res => {
this.fuHeDu = res;
})
}, },
methods: { methods: {
save_dicy() {//保存字典 treeClick(data, node, e) {//树点击的时候
this.$refs.form.validate(valid => {
if(valid) {
}else {
return false;
}
});
},
get_fu_he_du_select() {//符合度下拉
const params = {
key: "tech_compliance"
}
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
resolve(res.data);
}
})
})
},
set_table_height() {//动态设置表格高度
const table_container_height = $(".table_container").height();
const search_menu_height = $(".search_menu").height();
const search_btn_height = $(".search_btn").outerHeight(true);
this.tableHeight = table_container_height - search_menu_height - search_btn_height - 90 + 'px';
},
search_table() {//搜索
this.pager.current = 1;
this.get_table();
},
reset() {//重置
this.searchParams.policyName = null;
this.searchParams.conformCount = null;
},
// 每页条数改变
handleSizeChange(val) {
this.pager.current = 1;
this.pager.size = val;
this.get_table();
},
//当前页码改变
handleCurrentChange(val) {
this.pager.current = val;
this.get_table();
},
get_table() {//查询表格数据
this.loading = true;
const params = {
"policyName": this.searchParams.policyName,
"conformCount": this.searchParams.conformCount,
"current": this.pager.current,
"pageSize": this.pager.size,
};
getJiShuZhengCeGuanLianShiYongTable(params).then(res => {
this.loading = false;
console.log(res)
// res.records.map(item => {
// const startTime_year = String(new Date(item.startTime).getFullYear());
// const startTime_month = String(new Date(item.startTime).getMonth() + 1);
// let startTime_day = String(new Date(item.startTime).getDay());
// startTime_day = startTime_day.length == 1 ? '0' + startTime_day : startTime_day;
// item['startTime_'] = startTime_year + '-' + startTime_month + '-' + startTime_day;
// });
// this.get_fu_he_du_select().then(res2 => {
// res.records.map(item3 => {
// let result1 = res2.find(item2 => item2.value == item3.conformCount);
// item3['conformCount_'] = result1 ? result1.label : '';
// });
// this.tableData = res.records;
// })
this.tableData = res.records;
this.pager.current = res.current;
this.pager.total = res.total;
this.pager.size = res.size;
}
// if(res.code == 200) {
// this.loading = false;
// console.log(res)
// // this.tableData = res.
// }
});
},
} }
} }
</script> </script>
<style>
.confirmClass{
background-color: #0D867F !important;
}
.el-message-box__content{
padding: 60px 15px 60px 15px;
}
</style>
<style scoped> <style scoped>
.version_btn{
display: flex;
align-items: center;
justify-content: center;
width: 84px;
height: 32px;
background: rgba(13,134,127,0.1);
border-radius: 6px 6px 6px 6px;
/* border: 1px solid #0D867F; */
font-size: 14px;
color: #0D867F;
cursor: pointer;
margin-left: 15px;
}
.cancel_version_btn{
display: flex;
align-items: center;
justify-content: center;
width: 104px;
height: 32px;
background: rgba(13,134,127,0.1);
border-radius: 6px 6px 6px 6px;
/* border: 1px solid #0D867F; */
font-size: 14px;
color: #0D867F;
cursor: pointer;
margin-left: 15px;
}
.archiAssetVisualShow{ .archiAssetVisualShow{
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center; align-items: center;
} }
.el-button--primary{ .filter-tree{
background: rgba(13,134,127,0.1); width: 300px;
color: #0D867F; height: 100%;
border: 0; overflow-y: auto;
}
/deep/ .el-input-group__append{
background-color: #0D867F;
color: #fff;
cursor: pointer;
}
.search_btn{
width: 100%;
display: flex;
margin-top: 50px;
margin-bottom: 20px;
}
.search_menu{
display: flex;
justify-content: space-between;
margin-bottom: 50px;
}
.search_menu_item_container{
display: flex;
align-items: center;
}
.search_menu_btn_container{
display: flex;
align-items: center;
}
.search_menu_item{
display: flex;
align-items: center;
width: 344px;
}
.search_title{
/* width: 20%; */
flex-shrink: 0;
margin-right: 15px;
}
.search_item{
width: 60%;
}
.query_btn{
display: flex;
align-items: center;
justify-content: center;
width: 76px;
height: 32px;
background: rgba(13,134,127,1);
border-radius: 6px 6px 6px 6px;
border: 1px solid #0D867F;
font-size: 14px;
color: #fff;
margin-right: 10px;
cursor: pointer;
}
.reset_btn{
display: flex;
align-items: center;
justify-content: center;
width: 76px;
height: 32px;
background: rgba(244,244,244,1);
border-radius: 6px 6px 6px 6px;
border: 1px solid #ccc;
font-size: 14px;
color: #666;
cursor: pointer;
}
.btn_icon{
margin-right: 10px;
}
.table_container{
width: 97%;
height: calc(100% - 40px);
margin-top: 20px;
}
.el-pagination{
margin-top: 30px;
}
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #0D867F;
}
/deep/ .el-dialog__header{
background-color: #0D867F;
text-align: left;
}
/deep/ .el-dialog__title{
color: #fff;
}
/deep/ .el-dialog__close {
color: #fff;
}
.greenButton{
background-color: #0D867F;
color: #fff;
} }
.el-form-item{ .right_container{
display: flex; width: calc(100% - 300px);
align-items: center; height: 100%;
width: 33%;
} }
</style> </style>
\ No newline at end of file
src/views/busi-assets-list/index.vue
...@@ -382,6 +382,7 @@ ...@@ -382,6 +382,7 @@
if(this.ruleForm.dynamicForm_.length > 0) { if(this.ruleForm.dynamicForm_.length > 0) {
this.ruleForm.dynamicForm_.forEach(item => { this.ruleForm.dynamicForm_.forEach(item => {
fieldsValue.push({ fieldsValue.push({
id: item.propertyId,
cnName: item.cnName, cnName: item.cnName,
value_: item.value_, value_: item.value_,
controlType: item.controlType, controlType: item.controlType,
...@@ -669,6 +670,7 @@ ...@@ -669,6 +670,7 @@
} }
item['value_'] = ''; item['value_'] = '';
}); });
console.log(res.data)
this.ruleForm.dynamicForm_ = res.data; this.ruleForm.dynamicForm_ = res.data;
}else { }else {
this.ruleForm.dynamicForm_ = []; this.ruleForm.dynamicForm_ = [];
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!