Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 696da117 by 史敦盼
Options

bug修复

1 parent a4fc00eb
Inline Side-by-side
Showing with 106 additions and 108 deletions
public/index.html
......@@ -44,6 +44,7 @@
}
::-webkit-scrollbar {
width: 8px;
height: 8px;
}
::-webkit-scrollbar-track {
background-color: #fff;
......
src/views/archi-ele-list/index.vue
......@@ -29,7 +29,7 @@
></el-option>
</el-select>
</div>
<div class="search_menu_item">
<span class="search_title">状态</span>
<el-select
......@@ -52,17 +52,17 @@
<div class="search_menu_item">
<span class="search_title">适用范围</span>
<el-select
clearable
placeholder="请选择"
v-model="queryParamsScope"
>
<el-option
:label="item.label"
:value="item.value"
v-for="item in scopeApplicationOptions"
:key="item.value"
></el-option>
</el-select>
clearable
placeholder="请选择"
v-model="queryParamsScope"
>
<el-option
:label="item.label"
:value="item.value"
v-for="item in scopeApplicationOptions"
:key="item.value"
></el-option>
</el-select>
</div>
</div>
<div class="search_menu_btn_container">
......@@ -111,60 +111,60 @@
border
>
<el-table-column
type="selection"
width="55"
:selectable="selectable"
type="selection"
width="55"
:selectable="selectable"
></el-table-column>
<el-table-column
type="index"
label="序号"
width="50"
align="center"
:index="indexMethod"
type="index"
label="序号"
width="50"
align="center"
:index="indexMethod"
></el-table-column>
<el-table-column
prop="elementName"
label="元素名称"
align="center"
width="160"
prop="elementName"
label="元素名称"
align="center"
width="160"
></el-table-column>
<el-table-column
prop="archiLevelName"
label="架构层次"
align="center"
prop="archiLevelName"
label="架构层次"
align="center"
></el-table-column>
<el-table-column
prop="archiBelongName"
label="架构归属"
align="center"
prop="archiBelongName"
label="架构归属"
align="center"
></el-table-column>
<el-table-column
prop="definition"
label="定义"
align="center"
width="150"
:show-overflow-tooltip="true"
prop="definition"
label="定义"
align="center"
width="150"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="referenceRelationship"
label="引用关系"
align="center"
width="150"
:show-overflow-tooltip="true"
prop="referenceRelationship"
label="引用关系"
align="center"
width="150"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="example"
label="示例"
align="center"
width="150"
:show-overflow-tooltip="true"
prop="example"
label="示例"
align="center"
width="150"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column width="100" label="图标" align="center">
<template slot-scope="scope">
<img
:src="scope.row.icon"
alt=""
:style="{ width: scope.row.width, height: scope.row.height }"
:src="scope.row.icon"
alt=""
:style="{ width: scope.row.width, height: scope.row.height }"
/>
<!-- <div v-html="scope.row.icon" style="display: flex;justify-content: center;"></div> -->
</template>
......@@ -357,14 +357,14 @@
<div class="dialog_form_item3 m-b-20">
<div class="dialog_form_item_title">图标设置:</div>
<div class="flex">
<img
:style="{
width: selectGraphSrc ? '80px' : 0,
height: selectGraphSrc ? '40px' : 0,
}"
:src="selectGraphSrc"
alt=""
/>
<img
:style="{
width: selectGraphSrc ? '80px' : 0,
height: selectGraphSrc ? '40px' : 0,
}"
:src="selectGraphSrc"
alt=""
/>
<div
style="display: flex"
v-if="is_add_edit == 'view' ? false : true"
......@@ -461,7 +461,6 @@
v-model="ruleForm.let4"
></el-input>
</el-form-item>
</div>
</el-form>
<div
......@@ -510,16 +509,12 @@
label="长度"
align="center"
></el-table-column> -->
<el-table-column
prop="controlType"
label="控件"
align="center"
>
<template slot-scope="scope">
<span v-if="scope.row.controlType == 0">单行文本框</span>
<span v-if="scope.row.controlType == 1">多行文本框</span>
<span v-if="scope.row.controlType == 2">下拉框</span>
</template>
<el-table-column prop="controlType" label="控件" align="center">
<template slot-scope="scope">
<span v-if="scope.row.controlType == 0">单行文本框</span>
<span v-if="scope.row.controlType == 1">多行文本框</span>
<span v-if="scope.row.controlType == 2">下拉框</span>
</template>
</el-table-column>
<el-table-column
label="操作"
......@@ -641,7 +636,9 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" v-debounce:click="save_dicy">保存</el-button>
<el-button class="greenButton" v-debounce:click="save_dicy"
>保存</el-button
>
<el-button @click="dicy_dialog = false">取消</el-button>
</span>
</el-dialog>
......@@ -902,39 +899,38 @@ export default {
scopeApplicationOptions: [],
rowData: {},
predefineColors: archiEleColor,
graphId: ''
graphId: '',
}
},
created(){
Promise.all([
this.get_dialog_select1(),
this.get_dialog_select2(),
]).then((res2) => {
this.dialog_select1 = res2[0]
this.search_select1 = res2[1]
this.get_table()
})
created() {
Promise.all([this.get_dialog_select1(), this.get_dialog_select2()]).then(
(res2) => {
this.dialog_select1 = res2[0]
this.search_select1 = res2[1]
this.get_table()
},
)
this.getStateList()
this.getScopeApplicationOptions()
},
mounted() {
window.addEventListener('resize', () => {
this.set_table_height()
})
window.addEventListener('resize', () => {
this.set_table_height()
})
this.set_table_height()
},
methods: {
// 适用范围
getScopeApplicationOptions(){
query_jia_gou_ceng_ci_new({"typeValue": "scope_application"}).then(res => {
this.scopeApplicationOptions = res.data
})
getScopeApplicationOptions() {
query_jia_gou_ceng_ci_new({ typeValue: 'scope_application' }).then(
(res) => {
this.scopeApplicationOptions = res.data
},
)
},
// 状态
getStateList(){
query_jia_gou_ceng_ci_new({"typeValue": "sys_state"}).then(res => {
getStateList() {
query_jia_gou_ceng_ci_new({ typeValue: 'sys_state' }).then((res) => {
if (res.code == 200) {
this.stateList = res.data
}
......@@ -1351,12 +1347,17 @@ export default {
referenceRelationship: this.ruleForm.referenceRelationship,
example: this.ruleForm.example,
scope: this.ruleForm.scope,
graphId: this.graphId
graphId: this.graphId,
}
const requestParams =
this.is_add_edit == 'add'
? params
: { ...params, elementId: this.elementId, version: this.version, archiBelongId: this.rowData.archiBelongId }
: {
...params,
elementId: this.elementId,
version: this.version,
archiBelongId: this.rowData.archiBelongId,
}
if (this.is_add_edit == 'add') {
add_jia_gou_yuan_su(requestParams).then((res) => {
if (res.code == 200) {
......@@ -1430,7 +1431,7 @@ export default {
referenceRelationship: this.ruleForm.referenceRelationship,
example: this.ruleForm.example,
scope: this.ruleForm.scope,
graphId: this.graphId
graphId: this.graphId,
}
const requestParams =
this.is_add_edit == 'add'
......@@ -1525,7 +1526,7 @@ export default {
//查询架构层次下拉框值
return new Promise((resolve, reject) => {
// query_jia_gou_ceng_ci({}).then((res) => {
query_jia_gou_ceng_ci_new({"typeValue": "archi_level"}).then(res => {
query_jia_gou_ceng_ci_new({ typeValue: 'archi_level' }).then((res) => {
if (res.code == 200) {
resolve(res.data)
} else {
......@@ -1561,7 +1562,7 @@ export default {
//查询架构归属下拉框值
return new Promise((resolve, reject) => {
// query_jia_gou_gui_shu({}).then((res) => {
query_jia_gou_ceng_ci_new({"typeValue": "archi_belong"}).then(res => {
query_jia_gou_ceng_ci_new({ typeValue: 'archi_belong' }).then((res) => {
if (res.code == 200) {
resolve(res.data)
} else {
......@@ -1580,6 +1581,7 @@ export default {
this.query_item1 = null
this.query_item3 = null
this.query_item4 = null
this.queryParamsScope = null
},
// 每页条数改变
handleSizeChange(val) {
......@@ -1602,7 +1604,7 @@ export default {
elementName: this.query_item3,
pageSize: this.pager.size,
state: this.query_item4,
scope: this.queryParamsScope
scope: this.queryParamsScope,
}
this.loading = true
query_jia_gou_yuan_su_guan_xi_table(params).then((result) => {
......@@ -1664,7 +1666,7 @@ export default {
// item['height'] = 0
// }
})
this.tableData = result.data.records
this.tableData = result.data.records
} else {
this.tableData = []
}
......@@ -1686,7 +1688,7 @@ export default {
state: 0,
version: row.version,
elementName: row.elementName,
archiBelongId: row.archiBelongId
archiBelongId: row.archiBelongId,
}
edit_jia_gou_yuan_su(params).then((res) => {
if (res.code == 200) {
......@@ -1725,7 +1727,7 @@ export default {
state: 1,
version: row.version,
elementName: row.elementName,
archiBelongId: row.archiBelongId
archiBelongId: row.archiBelongId,
}
edit_jia_gou_yuan_su(params).then((res) => {
if (res.code == 200) {
......@@ -1763,7 +1765,7 @@ export default {
elementId: row.elementId,
state: row.state,
delFlag: 1,
elementName: row.elementName
elementName: row.elementName,
}
delete_jia_gou_gui_shu(params).then((res) => {
if (res.code == 200) {
......
src/views/collectDataConfiguration/Detail.vue
......@@ -48,19 +48,14 @@ export default {
default: false,
},
},
watch: {
// prjCodeDetail(v){
// this.query.queryParam.prjCode = v
// this.search()
// },
},
watch: {},
data() {
return {
query: {
url: collectDataConfiguration,
method: 'post',
queryParam: {
prjCode: '',
supervId: '',
},
},
selectId: '',
......@@ -98,10 +93,10 @@ export default {
methods: {
handleClose() {
this.showDialog = false
this.query.queryParam.prjCode = ''
this.query.queryParam.supervId = ''
},
handleOpen() {
this.query.queryParam.prjCode = this.prjCodeDetail
this.query.queryParam.supervId = this.prjCodeDetail
this.search()
},
async search() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!