From 7b02e5ed98cab7df7c52949c5bba298d1060329b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 09 五月 2024 14:50:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/ModelRbd.vue | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index ec99f55..c085529 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -1,37 +1,43 @@
<template>
<div>
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="5">
- <div class="fa-card-a">
- <product-model-tree @on-selected="onProductSelected"/>
+ <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
+ <product-model-tree @on-selected="onProductSelected" showXdy="true"/>
</div>
</el-col>
<el-col :span="19">
- <div class="mod-taskReliability-modelRbd}">
+ <div class="mod-taskReliability-modelRbd fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/taskReliability/ModelRbd/page"
- delete-url="/taskReliability/ModelRbd"
+ delete-url="/taskReliability/ModelRbd/"
:paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
- <zt-button type="query" @click="table.query()"/>
- <zt-button type="add" @click="add()"/>
- <zt-button type="delete" @click="table.deleteHandle()"/>
+ <el-input v-model="dataForm.modelName" placeholder="璇疯緭鍏ユā鍨嬪悕绉�" clearable></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-input v-model="dataForm.modelTag" placeholder="璇疯緭鍏ユā鍨嬫爣璇�" clearable></el-input>
+ </el-form-item>
+ <el-form-item>
+ <zt-button v-if="dataForm.productId" type="query" @click="table.query()"/>
+ <zt-button v-if="dataForm.productId" type="add" @click="add()"/>
+ <zt-button v-if="dataForm.productId" type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
border @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="modelName" label="妯″瀷鍚嶇О"/>
<el-table-column prop="modelTag" label="妯″瀷鏍囪瘑"/>
- <el-table-column prop="citedNum" label="琚紩鐢ㄦ暟"/>
+ <el-table-column prop="quoteNum" label="琚紩鐢ㄦ暟" align="center"/>
<el-table-column prop="modelState" label="妯″瀷鐘舵��" align="center"/>
<el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��" align="center"/>
<el-table-column prop="remark" label="澶囨敞"/>
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete" :has-view="false" width="180px">
<template v-slot="{ row }">
- <el-button @click="drawRBD(row)">妯″瀷璁捐</el-button>
+ <zt-table-button @click="drawRBD(row)">妯″瀷璁捐</zt-table-button>
</template>
</zt-table-column-handle>
</el-table>
@@ -60,6 +66,7 @@
modelName: '',
modelState:'',
productId: '',
+ modelTag: '',
}
}
},
--
Gitblit v1.9.1