mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

bug ui

Browse Source
This commit is contained in:
helloDy
2023-11-29 16:53:51 +08:00
parent 904350a4d8
commit fa5a303c08
13 changed files with 306 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue
View File

@@ -9,7 +9,8 @@
<el-drawer
:visible="visible"
:show-close="false"
:wrapper-closable="false"
:wrapper-closable="mode.includes('detail') ? true : false"
:before-close="handleCancel"
class="drawer"
custom-class="mes-drawer"
:size="size || '50%'"
@@ -129,13 +130,12 @@
</section>
</div>
<div class="drawer-body__footer">
<el-button style="" @click="handleCancel">返回</el-button>
<div v-if="!mode.includes('detail')" class="drawer-body__footer">
<el-button style="" @click="handleCancel">取消</el-button>
<el-button
type="primary"
v-if="!mode.includes('detail')"
@click="handleSave">
保存
确定
</el-button>
</div>
</div>

6
src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue
View File

@@ -9,7 +9,8 @@
<el-drawer
:visible="visible"
:show-close="false"
:wrapper-closable="false"
:wrapper-closable="mode.includes('detail') ? true : false"
:before-close="handleCancel"
class="drawer"
custom-class="mes-drawer"
:size="size || '50%'"
@@ -128,11 +129,10 @@
</section>
</div>
<div class="drawer-body__footer">
<div v-if="!mode.includes('detail')" class="drawer-body__footer">
<el-button style="" @click="handleCancel">取消</el-button>
<el-button
type="primary"
v-if="!mode.includes('detail')"
@click="handleCancel">
确定
</el-button>

2
src/views/equipment/base/config/BindGroup/index.vue
View File

@@ -34,7 +34,7 @@
<base-dialog
:dialogTitle="title"
:dialogVisible="open"
width="700px"
width="30%"
@close="cancel"
@cancel="cancel"
@confirm="submitForm">

33
src/views/equipment/base/config/DataCollection/TableConfig.vue
View File

@@ -25,6 +25,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
:width="90"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
</base-table>
@@ -41,7 +42,7 @@
<base-dialog
:dialogTitle="title"
:dialogVisible="open"
width="700px"
width="45%"
@close="cancel"
@cancel="cancel"
@confirm="submitForm">
@@ -127,7 +128,7 @@ export default {
// width: 180,
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
// },
{ prop: 'code', label: '编码' },
{ prop: 'code', label: '编码', showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名' },
{ prop: 'name', label: '标识名称' },
{ prop: 'enName', label: '英文名称' },
@@ -136,7 +137,7 @@ export default {
label: '是否采集',
subcomponent: switchBtn,
},
{ prop: 'description', label: '描述' },
{ prop: 'description', label: '描述', showOverflowtooltip: true },
],
searchBarFormConfig: [
{
@@ -213,16 +214,28 @@ export default {
},
],
[
// {
// switch: true,
// label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
// prop: 'collection',
// bind: {
// 'active-value': 1,
// 'inactive-value': 0,
// value: 1,
// },
// },
{
switch: true,
label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
select: true,
options: [
{ label: '否', value: 0 },
{ label: '是', value: 1 }
],
label: '是否采集',
prop: 'collection',
bind: {
'active-value': 1,
'inactive-value': 0,
value: 1,
},
},
clearable: true, filterable: true
}
}
],
[
{

8
src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
View File

@@ -9,7 +9,8 @@
<el-drawer
:visible="visible"
:show-close="false"
:wrapper-closable="false"
:wrapper-closable="mode.includes('detail') ? true : false"
:before-close="handleCancel"
class="drawer"
custom-class="mes-drawer"
:size="size || '50%'"
@@ -147,13 +148,12 @@
</section>
</div>
<div class="drawer-body__footer">
<div v-if="!mode.includes('detail')" class="drawer-body__footer">
<el-button style="" @click="handleCancel">取消</el-button>
<el-button
type="primary"
v-if="!mode.includes('detail')"
@click="handleSave">
保存
确定
</el-button>
</div>
</div>