test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +08:00
5 changed files with 40 additions and 33 deletions
Showing only changes of commit 3d24159743 - Show all commits

View File

@ -62,7 +62,7 @@
v-if="col.subcomponent" v-if="col.subcomponent"
:key="col.key" :key="col.key"
:is="col.subcomponent" :is="col.subcomponent"
:style="col.style"></component> :inlineStyle="col.style"></component>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

View File

@ -45,8 +45,6 @@ export default {
}); });
return obj; return obj;
}, },
// 处理搜索条件
handleSearchBarBtnClick() {},
// 处理表格按钮 // 处理表格按钮
handleTableBtnClick({ data, type }) { handleTableBtnClick({ data, type }) {
switch (type) { switch (type) {
@ -94,8 +92,6 @@ export default {
break; break;
} }
}, },
// 获取列表数据
getList() {},
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;

View File

@ -32,6 +32,7 @@
<div class="form-part" v-if="section.key == 'base'"> <div class="form-part" v-if="section.key == 'base'">
<el-skeleton v-if="!showForm" animated /> <el-skeleton v-if="!showForm" animated />
<DialogForm <DialogForm
key="drawer-dialog-form"
v-if="showForm" v-if="showForm"
ref="form" ref="form"
:dataForm="form" :dataForm="form"
@ -163,19 +164,31 @@ export default {
attrQuery: null, // attrQuery: null, //
infoQuery: null, // infoQuery: null, //
attrFormSubmitting: false, attrFormSubmitting: false,
attrListLoading: false attrListLoading: false,
}; };
}, },
computed: { computed: {
formRows() { formRows() {
return this.sections[0].rows.map((row) => { return this.sections[0].rows.map((row) => {
return row.map((col) => ({ return row.map((col) => {
if (col.key == 'eq-pics') {
//
return {
...col,
style: {
left: 0,
right: 'unset'
}
}
}
return {
...col, ...col,
bind: { bind: {
// //
disabled: this.mode == 'detail', disabled: this.mode == 'detail',
}, },
})); };
});
}); });
}, },
tableBtn() { tableBtn() {
@ -231,8 +244,8 @@ export default {
this.attrListLoading = true; this.attrListLoading = true;
const res = await this.$axios(this.attrQuery); const res = await this.$axios(this.attrQuery);
if (res.code == 0) { if (res.code == 0) {
this.list = data.list; this.list = res.data.list;
this.total = data.total; this.total = res.data.total;
} }
this.attrListLoading = false; this.attrListLoading = false;
}, },

View File

@ -9,8 +9,8 @@
<div class="equipment-pics"> <div class="equipment-pics">
<div v-for="(url, idx) in images" :key="url"> <div v-for="(url, idx) in images" :key="url">
<img :src="url" :alt="url" /> <img :src="url" :alt="url" />
<figure class="big-img"> <figure class="big-img" :style="inlineStyle">
<img :src="url" :alt="url"> <img :src="url" :alt="url" />
<figcaption>{{ desc[idx] }}</figcaption> <figcaption>{{ desc[idx] }}</figcaption>
</figure> </figure>
</div> </div>
@ -21,7 +21,12 @@
export default { export default {
name: 'EquipmentPics', name: 'EquipmentPics',
components: {}, components: {},
props: {}, props: {
inlineStyle: {
type: Object,
default: () => ({}),
},
},
data() { data() {
return { return {
desc: [ desc: [
@ -43,7 +48,6 @@ export default {
.map((_, index) => require(`../assets/eq${index + 1}.jpg`)), .map((_, index) => require(`../assets/eq${index + 1}.jpg`)),
}; };
}, },
computed: {},
methods: {}, methods: {},
}; };
</script> </script>

View File

@ -36,7 +36,12 @@
@close="cancel" @close="cancel"
@cancel="cancel" @cancel="cancel"
@confirm="submitForm"> @confirm="submitForm">
<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" /> <DialogForm
v-if="open"
key="index-dialog-form"
ref="form"
:dataForm="form"
:rows="rows" />
</base-dialog> </base-dialog>
<!-- 设备 详情 - 编辑 --> <!-- 设备 详情 - 编辑 -->
@ -186,7 +191,7 @@ export default {
type: 'input', type: 'input',
label: '编码', label: '编码',
placeholder: '请输入设备编码', placeholder: '请输入设备编码',
param: 'codes', param: 'code',
}, },
{ {
type: 'button', type: 'button',
@ -358,7 +363,6 @@ export default {
// some async request // some async request
return []; return [];
}, },
style: 'overflow-x: auto;',
}, },
], ],
], ],
@ -431,16 +435,6 @@ export default {
}; };
this.resetForm('form'); this.resetForm('form');
}, },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm');
this.handleQuery();
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();