From 404bd17f83c0054388e4a02ff31dbc37c27a4b11 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 29 三月 2024 16:09:29 +0800
Subject: [PATCH] 样式修改
---
web/src/views/modules/basicInfo/ProductModelTree.vue | 8 +
web/packages/views/modules/sys/dept.vue | 12 +-
web/src/assets/css/theme-light.css | 8 +
web/src/views/modules/basicInfo/XhProductModel.vue | 16 +-
web/src/views/layout/main-sidebar.vue | 2
web/packages/components/zt-company-tree/src/zt-company-tree.vue | 2
web/src/views/modules/taskReliability/SimulatData.vue | 5
web/src/views/modules/taskReliability/TaskPhase.vue | 12 +-
web/src/views/modules/basicInfo/ParamData.vue | 40 ++++++-
web/src/views/modules/taskReliability/Task.vue | 9 -
web/packages/views/modules/sys/dict-data.vue | 3
web/src/views/modules/taskReliability/RBD-edit-img.vue | 104 ++++++++++++--------
web/src/views/modules/sys/users.vue | 6
web/packages/views/modules/sys/dict-type.vue | 12 -
web/packages/views/modules/sys/menu.vue | 4
web/packages/views/modules/sys/role.vue | 6
web/packages/views/modules/sys/tenant.vue | 5
web/src/views/modules/sysPictureBase/SysPictureBase.vue | 8 -
web/src/views/modules/taskReliability/TaskPhaseModel.vue | 4
web/src/views/modules/taskReliability/ModelRbd.vue | 6
web/src/views/modules/basicInfo/TyProductModel.vue | 11 -
web/src/assets/css/custom.css | 8 +
web/src/views/modules/taskReliability/SimulatAssess.vue | 4
web/src/assets/css/resetui.css | 4
24 files changed, 172 insertions(+), 127 deletions(-)
diff --git a/web/packages/components/zt-company-tree/src/zt-company-tree.vue b/web/packages/components/zt-company-tree/src/zt-company-tree.vue
index c239740..e65df4f 100644
--- a/web/packages/components/zt-company-tree/src/zt-company-tree.vue
+++ b/web/packages/components/zt-company-tree/src/zt-company-tree.vue
@@ -1,5 +1,5 @@
<template>
- <div class="product-tree-container" style="height: 850px;">
+ <div class="product-tree-container" style="height: 100%">
<el-input
placeholder="杈撳叆鍗曚綅鍚嶇О杩涜杩囨护"
style="width: 80%"
diff --git a/web/packages/views/modules/sys/dept.vue b/web/packages/views/modules/sys/dept.vue
index 460de05..019a0f6 100644
--- a/web/packages/views/modules/sys/dept.vue
+++ b/web/packages/views/modules/sys/dept.vue
@@ -1,11 +1,13 @@
<template>
- <el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__dept">
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="5">
+ <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
<zt-company-tree @on-selected="onCompanySelected"/>
+ </div>
</el-col>
<el-col :span="19">
+ <div class="fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="tableObj" query-url="/sys/dept/list" delete-url="/sys/dept" :lazy="true" :paging='false' v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
@@ -13,12 +15,12 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading"
- v-adaptive="{bottomOffset:112}"
+ v-adaptive="{bottomOffset:30}"
height="650px"
:data="table.dataList"
default-expand-all
@selection-change="table.selectionChangeHandle"
- row-key="id" border>
+ row-key="id">
<el-table-column prop="name" :label="$t('dept.name')" min-width="150"/>
<el-table-column prop="code" :label="$t('dept.code')"/>
<el-table-column prop="shortName" :label="$t('dept.shortName')"/>
@@ -29,10 +31,10 @@
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query" :companyId="dataForm.companyId" :companyName="dataForm.companyName"/>
</zt-table-wraper>
+ </div>
</el-col>
</el-row>
</div>
- </el-card>
</template>
<script>
diff --git a/web/packages/views/modules/sys/dict-data.vue b/web/packages/views/modules/sys/dict-data.vue
index 96b8086..61f7125 100644
--- a/web/packages/views/modules/sys/dict-data.vue
+++ b/web/packages/views/modules/sys/dict-data.vue
@@ -1,5 +1,5 @@
<template>
- <div class="mod-sys__dict">
+ <div class="mod-basicInfo-paramData fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="dataTable" v-slot="{ table }" :lazy="true" delete-url="/sys/dict/data"
query-url="/sys/dict/data/page">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
@@ -12,7 +12,6 @@
</el-form-item>
</el-form>
<el-table v-adaptive="{bottomOffset:70}" v-loading="table.dataLoading" :data="table.dataList"
- border
height="650px"
@selection-change="table.selectionChangeHandle" @sort-change="table.sortChangeHandle">
<el-table-column :label="$t('dict.dictValue')" align="center" prop="dictValue" width="100"/>
diff --git a/web/packages/views/modules/sys/dict-type.vue b/web/packages/views/modules/sys/dict-type.vue
index ecb2ade..cfc2c64 100644
--- a/web/packages/views/modules/sys/dict-type.vue
+++ b/web/packages/views/modules/sys/dict-type.vue
@@ -1,21 +1,19 @@
<template>
- <div class="fa-card-a" shadow="never">
<div class="mod-sys__dict">
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="11">
- <div class="">
+ <div class="fa-card-a">
<zt-table-wraper ref="typeTable" v-slot="{ table }" :paging='false'
delete-url="/sys/dict/type"
query-url="/sys/dict/type/tree">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<zt-button perm="sys:dict" type="add" @click="table.editHandle()"/>
+ <zt-button type='self' icon2="el-icon-upload2" @click="DictImport">瀵煎叆</zt-button>
</el-form-item>
</el-form>
- <zt-button type='self' icon2="el-icon-upload2" @click="DictImport">瀵煎叆</zt-button>
-
<el-table ref="table" v-adaptive="{bottomOffset:30}" v-loading="table.dataLoading"
- :data="table.dataList" border
+ :data="table.dataList"
height="100px" highlight-current-row
row-key="id" @current-change="handleCurrentChange"
@selection-change="table.selectionChangeHandle"
@@ -55,8 +53,6 @@
</el-col>
</el-row>
</div>
-
- </div>
</template>
<script>
import AddOrUpdate from './dict-type-add-or-update'
diff --git a/web/packages/views/modules/sys/menu.vue b/web/packages/views/modules/sys/menu.vue
index 36a9675..39c8586 100644
--- a/web/packages/views/modules/sys/menu.vue
+++ b/web/packages/views/modules/sys/menu.vue
@@ -10,8 +10,8 @@
<el-table v-loading="table.dataLoading" :data="table.dataList" border row-key="id"
class="myTable"
:cell-style="cellStyle"
- v-adaptive="{bottomOffset:50}"
- height="650px"
+ v-adaptive="{bottomOffset:30}"
+ height="100px"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column :label="$t('menu.name')" align="left" min-width="250" prop="name"/>
<el-table-column :label="$t('menu.icon')" align="center" min-width="60" prop="icon">
diff --git a/web/packages/views/modules/sys/role.vue b/web/packages/views/modules/sys/role.vue
index fbce26d..280c94b 100644
--- a/web/packages/views/modules/sys/role.vue
+++ b/web/packages/views/modules/sys/role.vue
@@ -1,14 +1,14 @@
<template>
<div >
<div class="mod-sys__role">
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="5">
- <div class="fa-card-a">
+ <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
<zt-dept-tree @on-selected="onCompanySelected"/>
</div>
</el-col>
<el-col :span="19">
- <div class="fa-card-a">
+ <div class="fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="tableObj" v-slot="{ table }" :lazy="true" delete-url="/sys/role"
query-url="/sys/role/page">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
diff --git a/web/packages/views/modules/sys/tenant.vue b/web/packages/views/modules/sys/tenant.vue
index 6fac459..6efe1f3 100644
--- a/web/packages/views/modules/sys/tenant.vue
+++ b/web/packages/views/modules/sys/tenant.vue
@@ -1,5 +1,5 @@
<template>
- <div class="fa-card-a aui-card--fill" shadow="never">
+ <div class="fa-card-a aui-card--fill">
<div class="mod-sys__tenant}">
<zt-table-wraper v-slot="{ table }" delete-url="/sys/tenant" query-url="/sys/tenant/page">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
@@ -16,7 +16,8 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" border
- v-adaptive="{bottomOffset:50}"
+ height="100px"
+ v-adaptive="{bottomOffset:70}"
@selection-change="table.selectionChangeHandle">
<el-table-column align="center" type="selection" width="50"></el-table-column>
<el-table-column :label="$t('tenant.name')" prop="name"></el-table-column>
diff --git a/web/src/assets/css/custom.css b/web/src/assets/css/custom.css
index 4b4f415..517ef4c 100644
--- a/web/src/assets/css/custom.css
+++ b/web/src/assets/css/custom.css
@@ -26,7 +26,9 @@
.zt .el-table .el-table__row.hover-row {
background-color: #eaf5ff !important;
}
-
+.zt .el-table__fixed-right-patch{
+ background-color: #edf6ff ;
+}
/*.zt .el-table.djxlTable tbody tr:hover>td {*/
/* background-color: #f5f7fa !important;*/
/* !*color: #FFFFFF;*!*/
@@ -87,7 +89,9 @@
background: rgba(2, 120, 231, 1);
}
.zt .fa-card-a{
- padding: 20px;
+ padding-bottom: 20px;
+ padding-left: 20px;
+ padding-right: 20px;
border: 1px solid #EBEEF5;
color: #303133;
-webkit-transition: .3s;
diff --git a/web/src/assets/css/resetui.css b/web/src/assets/css/resetui.css
index af88531..d26f720 100644
--- a/web/src/assets/css/resetui.css
+++ b/web/src/assets/css/resetui.css
@@ -7,7 +7,9 @@
.el-table__fixed-body-wrapper {
top: 45px !important;
}
-
+.v-service-param .el-table__fixed-body-wrapper {
+ top: 63px !important;
+}
.v-service-user-one
.el-table__fixed-body-wrapper {
top: 36px !important;
diff --git a/web/src/assets/css/theme-light.css b/web/src/assets/css/theme-light.css
index 9fcc43b..d8633d9 100644
--- a/web/src/assets/css/theme-light.css
+++ b/web/src/assets/css/theme-light.css
@@ -346,7 +346,7 @@
border-right: none;
}
.zt.light ::-webkit-scrollbar {
- width: 5px;
+ width: 10px;
height: 10px;
}
@@ -483,12 +483,14 @@
color:#fff;
}
.zt.light .el-table{
- box-shadow: 0 3px 12px 0 rgba(72, 119, 232, 0.13);
+ /*box-shadow: 0 3px 12px 0 rgba(72, 119, 232, 0.13);*/
border-radius: 4px;
- border: solid 1px #e0e5f2;
+ border: none;
}
.zt.light .el-tab-pane .el-form{
background: #fff;
+ margin-top: 10px;
+ margin-bottom: 10px;
}
.zt.light .el-tab-pane .el-button.form-title{
padding-left:20px;
diff --git a/web/src/views/layout/main-sidebar.vue b/web/src/views/layout/main-sidebar.vue
index 9861ba8..4539dce 100644
--- a/web/src/views/layout/main-sidebar.vue
+++ b/web/src/views/layout/main-sidebar.vue
@@ -317,7 +317,7 @@
}
.zt .sidebarDefaultWidth.sidebar-input-width>.is_menu-height{
width: 64px;
- transition: 1s;
+ //transition: 1s;
}
.zt .sidebarDefaultWidth.sidebar-input-width>.is_menu-height .menu-search_input{
margin-left: -10px;
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index 36dcfea..6155b6e 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -1,13 +1,13 @@
<template>
<div>
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="5">
- <div class="fa-card-a">
+ <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
<product-model-tree @on-selected="onProductSelected"/>
</div>
</el-col>
<el-col :span="19">
- <div class="mod-basicInfo-paramData}">
+ <div class="mod-basicInfo-paramData fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/basicInfo/ParamData/page"
delete-url="/basicInfo/ParamData/"
@dataLoaded="dataLoaded"
@@ -33,10 +33,9 @@
<zt-button 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}"
class="paramsDataTable"
-
- border @selection-change="table.selectionChangeHandle">
+ @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" :key="1" width="40" align="center"/>
<el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left"/>
<el-table-column v-if="dataForm.nodeType==='4'" :key="3" prop="baseOperatRatio" label="鍩烘湰鍙潬鎬ц繍琛屾瘮">
@@ -312,7 +311,26 @@
],
// editingCell:null,
dataList: [],
+ originalTableData:[],
originalData: null, // 璁板綍淇敼鍓嶇殑鏁版嵁
+ }
+ },
+ // 鍦ㄧ粍浠朵腑瀹氫箟 beforeRouteLeave 瀵艰埅瀹堝崼
+ beforeRouteLeave(to, from, next) {
+ console.log(this.$store.state.contentTabs,'this.$store.state.contentTabsActiveName')
+ if (this.hasUnsavedChanges()) { // 妫�鏌ユ槸鍚︽湁鏈繚瀛樼殑鍙樻洿
+ this.$confirm('鎮ㄦ湁鏈繚瀛樼殑鏇存敼锛岃鍏堜繚瀛樸�傛槸鍚︾户缁寮�锛�', '鎻愮ず', {
+ confirmButtonText: '淇濆瓨',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.handleSaveRows(); // 淇濆瓨鏁版嵁
+ next();
+ }).catch(() => {
+ next(false); // 鍙栨秷璺敱绂诲紑
+ });
+ } else {
+ next();
}
},
components: {
@@ -344,6 +362,8 @@
this.originalData = null
this.dataForm.dataThreeList = null
this.$refs.tableObj.query()
+ this.originalTableData = JSON.parse(JSON.stringify(this.dataList)); // 鏇存柊鍒濆鏁版嵁涓哄綋鍓嶆暟鎹�
+ console.log(this.originalTableData,'this.originalTableData 褰撳墠琛ㄦ牸json鏁版嵁')
}
},
edit(row) {
@@ -390,7 +410,13 @@
this.$set(dataList, 'isRemove', false)
console.log(dataList, 'dataList')
}
- }
+ this.originalTableData = JSON.parse(JSON.stringify(this.dataList))
+ console.log(this.originalTableData,'this.originalTableData 鍒濆琛ㄦ牸json鏁版嵁')
+ },
+ hasUnsavedChanges() {
+ // 妫�鏌ュ綋鍓嶈〃鏍兼暟鎹笌鍒濆鏁版嵁鏄惁鐩稿悓
+ return JSON.stringify(this.dataList) !== JSON.stringify(this.originalTableData);
+ },
}
}
</script>
diff --git a/web/src/views/modules/basicInfo/ProductModelTree.vue b/web/src/views/modules/basicInfo/ProductModelTree.vue
index fba71fb..79e571f 100644
--- a/web/src/views/modules/basicInfo/ProductModelTree.vue
+++ b/web/src/views/modules/basicInfo/ProductModelTree.vue
@@ -1,5 +1,5 @@
<template>
- <div class="product-tree-container " :style="'height:' + tree_Hei +'px'">
+ <div class="product-tree-container">
<el-input
placeholder="杈撳叆鍚嶇О杩涜杩囨护"
style="width: 60%"
@@ -36,7 +36,6 @@
return {
filterText: '',
productList: [],
- tree_Hei: document.documentElement.clientHeight - 200,
defaultProps: {
children: 'children',
label: 'name'
@@ -74,3 +73,8 @@
}
}
</script>
+<style>
+.product-tree-container{
+ height: 100%;
+}
+</style>
diff --git a/web/src/views/modules/basicInfo/TyProductModel.vue b/web/src/views/modules/basicInfo/TyProductModel.vue
index 7615626..bfb3068 100644
--- a/web/src/views/modules/basicInfo/TyProductModel.vue
+++ b/web/src/views/modules/basicInfo/TyProductModel.vue
@@ -1,7 +1,5 @@
<template>
-
- <el-card shadow="never" class="aui-card--fill">
- <div class="mod-tyProductModel-tyProductModel}">
+ <div class="mod-tyProductModel-tyProductModel} fa-card-a">
<zt-table-wraper query-url="/basicInfo/TyProductModel/tree" delete-url="/basicInfo/TyProductModel/" v-bind:paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
@@ -20,8 +18,8 @@
<zt-button 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}"
- border row-key="id"
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+ row-key="id"
@selection-change="table.selectionChangeHandle"
:cell-style="cellStyle"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
@@ -37,13 +35,12 @@
</template>
</el-table-column>
<el-table-column prop="sort" label="鎺掑簭"/>
- <zt-table-column-handle :table="table"/>
+ <zt-table-column-handle :table="table" width="150" />
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query"/>
</zt-table-wraper>
</div>
- </el-card>
</template>
<script>
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index cada5bf..855604c 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -1,13 +1,13 @@
-<template xmlns="">
+<template>
<div>
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="5">
- <div class="fa-card-a">
+ <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
<product-model-tree @on-selected="onProductSelected"/>
</div>
</el-col>
<el-col :span="19">
- <div class="mod-basicInfo-xhProductModel}">
+ <div class="mod-basicInfo-xhProductModel fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/basicInfo/XhProductModel/page"
delete-url="/basicInfo/XhProductModel/ "
:paging='false'
@@ -23,8 +23,8 @@
<zt-button 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}"
- border row-key="id"
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+ row-key="id"
@selection-change="table.selectionChangeHandle"
>
<el-table-column prop="name" label="鍚嶇О"/>
@@ -34,8 +34,8 @@
<el-image v-if="row.operatImg" :src="url+row.operatImg" style="height: 50px;width: 50px"></el-image>
</template>
</el-table-column>
- <el-table-column prop="sort" label="鎺掑簭"/>
- <zt-table-column-handle :table="table"/>
+ <el-table-column prop="sort" label="鎺掑簭" width="100px"/>
+ <zt-table-column-handle :table="table" width="150px"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
diff --git a/web/src/views/modules/sys/users.vue b/web/src/views/modules/sys/users.vue
index 1583f69..71a5da6 100644
--- a/web/src/views/modules/sys/users.vue
+++ b/web/src/views/modules/sys/users.vue
@@ -1,13 +1,13 @@
<template>
<div class="v-service-user">
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="5">
- <div class="fa-card-a">
+ <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
<zt-dept-tree @on-selected="onDeptSelected"/>
</div>
</el-col>
<el-col :span="19">
- <div class="fa-card-a">
+ <div class="fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="tableObj" v-slot="{ table }" delete-url="/sys/user"
export-url="/sys/user/export" query-url="/sys/userEx/page">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
diff --git a/web/src/views/modules/sysPictureBase/SysPictureBase.vue b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
index c4c67c9..69e8daf 100644
--- a/web/src/views/modules/sysPictureBase/SysPictureBase.vue
+++ b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
@@ -1,6 +1,5 @@
<template>
- <el-card shadow="never" class="aui-card--fill">
- <div class="mod-sysPictureBase-sysPictureBase}">
+ <div class="mod-sysPictureBase-sysPictureBase fa-card-a">
<zt-table-wraper query-url="/sysPictureBase/page" delete-url="/sysPictureBase/"
:paging='false'
v-slot="{ table }">
@@ -18,8 +17,8 @@
<zt-button 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}"
- border @selection-change="table.selectionChangeHandle">
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+ @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="鍥剧墖鍚嶇О"/>
<zt-table-column-dict prop="isDefault" label="鏄惁榛樿" dict="is_or_not"/>
@@ -37,7 +36,6 @@
<add-or-update @refreshDataList="table.query"/>
</zt-table-wraper>
</div>
- </el-card>
</template>
<script>
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index 78293e4..cc9b8ab 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -1,13 +1,13 @@
<template>
<div>
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="5">
- <div class="fa-card-a">
+ <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
<product-model-tree @on-selected="onProductSelected"/>
</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/"
:paging='false'
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 7db0238..dcaa6b1 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -18,49 +18,67 @@
<el-button type="primary" @click="saveDiagram()">鏆傚瓨</el-button>
<el-button type="primary" @click="analyzeDiagram()">淇濆瓨</el-button>
<el-button type="primary" @click="clearDiagram()">娓呯┖鍥惧舰</el-button>
+ <el-button @click="leftAlign()">
+ <i style="font-size: 1rem;" class="wt-iconfont icon-zuoduiqi"></i>
+ </el-button>
+ <el-button @click="centerAlign()">
+ <i style="font-size: 1rem;" class="wt-iconfont icon-chuizhiduiqi"></i>
+ </el-button>
+ <el-button @click="rightAlign()">
+ <i style="font-size: 1rem;" class="wt-iconfont icon-youduiqi"></i>
+ </el-button>
+ <el-button @click="topAlign()">
+ <i style="font-size: 1rem;" class="wt-iconfont icon-dingduiqi"></i>
+ </el-button>
+ <el-button @click="shuipingAlign()">
+ <i style="font-size: 1rem;" class="wt-iconfont icon-shuipingduiqi"></i>
+ </el-button>
+ <el-button @click="bottomAlign()">
+ <i style="font-size: 1rem;" class="wt-iconfont icon-diduiqi"></i>
+ </el-button>
</el-form-item>
- <el-form-item>
- <el-tooltip class="item" effect="dark" content="宸﹀榻�" placement="left">
- <el-button class="" style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF;"
- @click="leftAlign()"><i style="font-size: 2rem;"
- class="wt-iconfont icon-zuoduiqi"></i></el-button>
- </el-tooltip>
- </el-form-item>
- <el-form-item>
- <el-tooltip class="item" effect="dark" content="灞呬腑瀵归綈" placement="left">
- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"
- @click="centerAlign()"><i style="font-size: 2rem;"
- class="wt-iconfont icon-chuizhiduiqi"></i></el-button>
- </el-tooltip>
- </el-form-item>
- <el-form-item>
- <el-tooltip class="item" effect="dark" content="鍙冲榻�" placement="left">
- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"
- @click="rightAlign()"><i style="font-size: 2rem;"
- class="wt-iconfont icon-youduiqi"></i></el-button>
- </el-tooltip>
- </el-form-item>
- <el-form-item>
- <el-tooltip class="item" effect="dark" content="椤堕儴瀵归綈" placement="left">
- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"
- @click="topAlign()"><i style="font-size: 2rem;"
- class="wt-iconfont icon-dingduiqi"></i></el-button>
- </el-tooltip>
- </el-form-item>
- <el-form-item>
- <el-tooltip class="item" effect="dark" content="姘村钩瀵归綈" placement="left">
- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"
- @click="shuipingAlign()"><i style="font-size: 2rem;"
- class="wt-iconfont icon-shuipingduiqi"></i></el-button>
- </el-tooltip>
- </el-form-item>
- <el-form-item>
- <el-tooltip class="item" effect="dark" content="搴曢儴瀵归綈" placement="left">
- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"
- @click="bottomAlign()"><i style="font-size: 2rem;"
- class="wt-iconfont icon-diduiqi"></i></el-button>
- </el-tooltip>
- </el-form-item>
+<!-- <el-form-item>-->
+<!-- <el-tooltip class="item" effect="dark" content="宸﹀榻�" placement="left">-->
+<!-- <el-button class="" style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF;" @click="leftAlign()">-->
+<!-- <i style="font-size: 2rem;" class="wt-iconfont icon-zuoduiqi"></i>-->
+<!-- </el-button>-->
+<!-- </el-tooltip>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item>-->
+<!-- <el-tooltip class="item" effect="dark" content="灞呬腑瀵归綈" placement="left">-->
+<!-- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"-->
+<!-- @click="centerAlign()"><i style="font-size: 2rem;"-->
+<!-- class="wt-iconfont icon-chuizhiduiqi"></i></el-button>-->
+<!-- </el-tooltip>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item>-->
+<!-- <el-tooltip class="item" effect="dark" content="鍙冲榻�" placement="left">-->
+<!-- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"-->
+<!-- @click="rightAlign()"><i style="font-size: 2rem;"-->
+<!-- class="wt-iconfont icon-youduiqi"></i></el-button>-->
+<!-- </el-tooltip>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item>-->
+<!-- <el-tooltip class="item" effect="dark" content="椤堕儴瀵归綈" placement="left">-->
+<!-- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"-->
+<!-- @click="topAlign()"><i style="font-size: 2rem;"-->
+<!-- class="wt-iconfont icon-dingduiqi"></i></el-button>-->
+<!-- </el-tooltip>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item>-->
+<!-- <el-tooltip class="item" effect="dark" content="姘村钩瀵归綈" placement="left">-->
+<!-- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"-->
+<!-- @click="shuipingAlign()"><i style="font-size: 2rem;"-->
+<!-- class="wt-iconfont icon-shuipingduiqi"></i></el-button>-->
+<!-- </el-tooltip>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item>-->
+<!-- <el-tooltip class="item" effect="dark" content="搴曢儴瀵归綈" placement="left">-->
+<!-- <el-button style="margin-left: 0;padding: 2px;border: 1px solid #5F95FF"-->
+<!-- @click="bottomAlign()"><i style="font-size: 2rem;"-->
+<!-- class="wt-iconfont icon-diduiqi"></i></el-button>-->
+<!-- </el-tooltip>-->
+<!-- </el-form-item>-->
</el-form>
<div id="containerImg" style="border: 1px solid #EAEBEE;border-radius: 6px;
box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);">
@@ -544,8 +562,6 @@
imageUrl: require('/public/modelImg/' + item.imgPath + '.png'),
width: item.imgWidth,
height: item.imgHeight,
- x: item.imgWidth,
- y: item.imgHeight,
data: {
dataId: '',
nodeType: item.nodeType,
diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index e9a7e3e..cd7588f 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -35,8 +35,8 @@
</div>
</div>
</el-col>
- <el-col :span="17">
- <div style="height: calc(100vh - 165px);background: white">
+ <el-col :span="18">
+ <div class="fa-card-a">
<SimulatCurve ref="SimulatCurve"></SimulatCurve>
<SimulatData></SimulatData>
</div>
diff --git a/web/src/views/modules/taskReliability/SimulatData.vue b/web/src/views/modules/taskReliability/SimulatData.vue
index 6e529b0..9c22f5e 100644
--- a/web/src/views/modules/taskReliability/SimulatData.vue
+++ b/web/src/views/modules/taskReliability/SimulatData.vue
@@ -4,8 +4,9 @@
delete-url="" v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="400"
- @selection-change="table.selectionChangeHandle">
+ <el-table v-loading="table.dataLoading" :data="table.dataList"
+ @selection-change="table.selectionChangeHandle"
+ height="100px" v-adaptive="{bottomOffset:30}">
<el-table-column prop="name" label="鍚嶇О" />
<el-table-column prop="totalTime" label="鎬绘椂闂�"/>
<el-table-column prop="faultNum" label="鏁呴殰娆℃暟"/>
diff --git a/web/src/views/modules/taskReliability/Task.vue b/web/src/views/modules/taskReliability/Task.vue
index 53dc7af..4ded84a 100644
--- a/web/src/views/modules/taskReliability/Task.vue
+++ b/web/src/views/modules/taskReliability/Task.vue
@@ -1,8 +1,7 @@
<template>
<div class="mod-taskReliability-task}">
- <div>
- 浜у搧鑺傜偣锛�
- <zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/>
+ <div style="margin: 10px 0">
+ <zt-select v-model="dataForm.productId" placeholder="璇烽�夋嫨浜у搧鑺傜偣" :datas="productList" @change="onProductSelected"/>
</div>
<zt-table-wraper ref="tableObj" query-url="/taskReliability/Task/page" defaultNotQuery="true" :paging='false' delete-url="/taskReliability/Task/"
v-slot="{ table }">
@@ -12,9 +11,9 @@
<zt-button 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}"
@row-click="selectTask"
- border @selection-change="table.selectionChangeHandle">
+ @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="taskName" label="浠诲姟鍚嶇О"/>
<el-table-column prop="taskSort" label="浠诲姟椤哄簭"/>
diff --git a/web/src/views/modules/taskReliability/TaskPhase.vue b/web/src/views/modules/taskReliability/TaskPhase.vue
index fb6f829..272b6e0 100644
--- a/web/src/views/modules/taskReliability/TaskPhase.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase.vue
@@ -1,13 +1,13 @@
<template>
<div>
- <el-row :gutter="10">
+ <el-row :gutter="5">
<el-col :span="6">
- <div class="fa-card-a">
+ <div class="fa-card-a" style="margin-right: 5px;">
<task @onTaskSelected="onTaskSelected"/>
</div>
</el-col>
<el-col :span="11">
- <div class="mod-taskReliability-taskPhase}">
+ <div class="mod-taskReliability-taskPhase fa-card-a" style="margin-left: 5px;margin-right: 5px;">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/taskReliability/TaskPhase/page"
delete-url="/taskReliability/TaskPhase/"
:paging='false' v-slot="{ table }">
@@ -17,8 +17,8 @@
<zt-button 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}"
- border @row-click="selectPhase" @selection-change="table.selectionChangeHandle">
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+ @row-click="selectPhase" @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="phaseName" label="浠诲姟闃舵鍚嶇О"/>
<el-table-column prop="phaseDuration" label="闃舵鏃堕暱"/>
@@ -33,9 +33,7 @@
</div>
</el-col>
<el-col :span="7">
- <div class="fa-card-a">
<task-phase-model ref="model"/>
- </div>
</el-col>
</el-row>
</div>
diff --git a/web/src/views/modules/taskReliability/TaskPhaseModel.vue b/web/src/views/modules/taskReliability/TaskPhaseModel.vue
index ece30e0..d556748 100644
--- a/web/src/views/modules/taskReliability/TaskPhaseModel.vue
+++ b/web/src/views/modules/taskReliability/TaskPhaseModel.vue
@@ -1,5 +1,5 @@
<template>
- <div class="mod-taskReliability-taskPhaseModel}">
+ <div class="mod-taskReliability-taskPhaseModel fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/taskReliability/TaskPhaseModel/page"
:paging='false'
delete-url="/taskReliability/TaskPhaseModel/" v-slot="{ table }">
@@ -8,7 +8,7 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
- v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle"
+ v-adaptive="{bottomOffset:30}" border @selection-change="table.selectionChangeHandle"
row-key="id"
:cell-style="cellStyle"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
--
Gitblit v1.9.1