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