From 6bdeb3668666e6be8ad03e4c65ca3debc802a04a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 24 三月 2025 10:36:51 +0800
Subject: [PATCH] 设备页面-样式优化
---
src/components/Table/lims-table.vue | 4
src/views/CNAS/resourceDemand/device/component/borrow.vue | 98 ++--------------
src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue | 41 +++---
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue | 47 +++----
src/workers/DataWorker.worker.js | 38 +++---
src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue | 2
src/views/CNAS/resourceDemand/device/component/calibration.vue | 4
src/views/CNAS/resourceDemand/device/component/maintenance.vue | 86 ++-----------
8 files changed, 95 insertions(+), 225 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index f840a01..cb4eb0f 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -302,8 +302,8 @@
count += a.name.length;
}
});
- this.btnWidth = count * 15 + 60 + "px";
- return count * 15 + 60 + "px";
+ this.btnWidth = count * 18 + 60 + "px";
+ return count * 18 + 60 + "px";
},
getTitleWidth(row) {
if (row.label.includes('鏃堕棿') || row.label.includes('缂栧彿') || row.label.includes('鏍峰搧鍚嶇О') || row.label.includes('闆朵欢')) {
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
index 6cdd361..d503422 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
@@ -18,7 +18,7 @@
</div>
</div>
<lims-table :tableData="yearTableData" :column="yearColumnData" :page="yearPage" :tableLoading="yearLoading"
- height="40vh" @pagination="pagination" :rowClick="rowClick" key="yearTableData"></lims-table>
+ :height="'calc(100vh - 34em)'" @pagination="pagination" :rowClick="rowClick" key="yearTableData"></lims-table>
</div>
<div style="margin-top: 20px">
<div style="display: flex;justify-content: space-between;">
@@ -39,7 +39,7 @@
</div>
</div>
<lims-table :tableData="yearDetailTableData" :column="yearDetailColumnData" :page="yearDetailPage"
- :tableLoading="yearDetailLoading" height="40vh" @pagination="pagination1"
+ :tableLoading="yearDetailLoading" :height="'calc(100vh - 34em)'" @pagination="pagination1" ref="yearDetailTableData"
key="yearDetailTableData"></lims-table>
</div>
<!--鏂板淇敼寮规-->
@@ -196,20 +196,20 @@
{
label: '璁″垝鍚嶇О',
prop: 'monitorName',
- minWidth: '150px'
+ width: '150px'
}, {
label: '缂栧埗浜�',
prop: 'writeName',
- minWidth: '100'
+ width: '100'
}, {
label: '缂栧埗鏃ユ湡',
prop: 'writeTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'tag',
label: '瀹℃牳鐘舵��',
prop: 'examineStatus',
- minWidth: '100',
+ width: '100',
formatData: (params) => {
if (params === 0) {
return '涓嶉�氳繃';
@@ -231,20 +231,20 @@
}, {
label: '瀹℃牳鍐呭',
prop: 'examineRemark',
- minWidth: '100'
+ width: '100'
}, {
label: '瀹℃牳浜�',
prop: 'examineName',
- minWidth: '100'
+ width: '100'
}, {
label: '瀹℃牳鏃ユ湡',
prop: 'examineTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'tag',
label: '鎵瑰噯鐘舵��',
prop: 'ratifyStatus',
- minWidth: '100',
+ width: '100',
formatData: (params) => {
if (params === 0) {
return '涓嶆壒鍑�';
@@ -266,18 +266,17 @@
}, {
label: '鎵瑰噯鍐呭',
prop: 'ratifyRemark',
- minWidth: '100'
+ width: '100'
}, {
label: '鎵瑰噯浜�',
prop: 'ratifyName',
- minWidth: '100'
+ width: '100'
}, {
label: '鎵瑰噯鏃ユ湡',
prop: 'ratifyTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'action',
- minWidth: '190',
label: '鎿嶄綔',
fixed: 'right',
operation: [
@@ -355,30 +354,29 @@
}, {
label: '璁″垝寮�灞曟椂闂�',
prop: 'plannedTime',
- minWidth: '150px'
+ width: '150px'
}, {
label: '鐩戞帶椤圭洰',
prop: 'monitorProject',
- minWidth: '150px'
+ width: '150px'
}, {
label: '鍙傚姞鍗曚綅锛堜汉鍛橈級',
prop: 'participant',
- minWidth: '150px'
+ width: '190px'
}, {
label: '棰勭畻锛堝厓锛�',
prop: 'budget',
- minWidth: '150px'
+ width: '150px'
}, {
label: '缁勭粐浜哄憳',
prop: 'organization',
- minWidth: '150px'
+ width: '150px'
}, {
label: '鐩戞帶鏂瑰紡',
prop: 'monitorWay',
- minWidth: '150px'
+ width: '150px'
}, {
dataType: 'action',
- width: '280',
label: '鎿嶄綔',
fixed: 'right',
operation: [
@@ -661,6 +659,7 @@
this.yearDetailLoading = false
this.yearDetailTableData = res.data.records
this.yearDetailPage.total = res.data.total
+ this.$refs.yearDetailTableData.$refs.multipleTable.doLayout()
}).catch(err => {
console.log('err---', err);
this.yearDetailLoading = false
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
index 72c5e7e..80bc235 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
@@ -24,7 +24,7 @@
<div style="display: flex;justify-content: space-between;">
<el-form :model="yearDetailForm" ref="yearDetailForm" size="small" :inline="true">
<el-form-item>
- <el-radio-group v-model="yearDetailForm.causeType" @change="getYearDetailPlanList" size="small">
+ <el-radio-group v-model="yearDetailForm.causeType" @change="getYearDetailPlan" size="small">
<el-radio-button :label="1">瀹氭湡鐩戠潱</el-radio-button>
<el-radio-button :label="2">鍔ㄦ�佺洃鐫�</el-radio-button>
</el-radio-group>
@@ -36,7 +36,7 @@
<el-input v-model="yearDetailForm.superviseProject" placeholder="璇疯緭鍏�" size="small"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" size="mini" @click="getYearDetailPlanList">鏌ヨ</el-button>
+ <el-button type="primary" size="mini" @click="getYearDetailPlan">鏌ヨ</el-button>
<el-button size="mini" @click="clearDetail">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -45,8 +45,7 @@
</div>
</div>
<lims-table :tableData="yearDetailTableData" :column="yearDetailColumnData" :page="yearDetailPage"
- :tableLoading="yearDetailLoading" height="40vh" @pagination="pagination1"
- key="yearDetailTableData"></lims-table>
+ :tableLoading="yearDetailLoading" height="40vh" @pagination="pagination1" key="yearDetailColumnData"></lims-table>
</div>
<!--鏂板淇敼寮规-->
<detail-form-dialog v-if="formDia" ref="formDia" :superviseId="superviseId"
@@ -154,20 +153,19 @@
{
label: '璁″垝鍚嶇О',
prop: 'superviseName',
- minWidth: '150px'
+ width: '150px'
}, {
label: '缂栧埗浜�',
prop: 'writeUserName',
- minWidth: '100'
}, {
label: '缂栧埗鏃ユ湡',
prop: 'writeTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'tag',
label: '鎵瑰噯鐘舵��',
prop: 'ratifyStatus',
- minWidth: '100',
+ width: '100',
formatData: (params) => {
if (params === 0) {
return '涓嶆壒鍑�';
@@ -189,19 +187,16 @@
}, {
label: '鎵瑰噯鍐呭',
prop: 'ratifyRemark',
- minWidth: '100'
}, {
label: '鎵瑰噯浜�',
prop: 'ratifyUserName',
- minWidth: '100'
}, {
label: '鎵瑰噯鏃ユ湡',
prop: 'ratifyTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'action',
label: '鎿嶄綔',
- fixed: 'right',
operation: [
{
name: '鎵瑰噯',
@@ -259,32 +254,29 @@
{
label: '鐩戠潱鏃ユ湡',
prop: 'superviseTime',
- minWidth: '150px'
+ width: '120px'
}, {
label: '鐩戠潱鐩殑',
prop: 'supervisePurpose',
- minWidth: '150px',
- showOverflowTooltip: true,
+ width: '150px',
}, {
label: '鐩戞帶椤圭洰',
prop: 'superviseProject',
- minWidth: '150px'
+ width: '150px'
}, {
label: '琚洃鐫ｄ汉鍛�',
prop: 'supervisee',
- minWidth: '150px'
+ width: '120px'
}, {
label: '鐩戠潱鍘熷洜',
prop: 'superviseReason',
- minWidth: '150px'
+ width: '150px'
}, {
label: '澶囨敞',
prop: 'remark',
- minWidth: '150px'
}, {
dataType: 'action',
label: '鎿嶄綔',
- fixed: 'right',
operation: [
{
name: '缂栬緫',
@@ -353,6 +345,7 @@
size: 20,
total: 0
},
+ currentScrollPosition: 0,
superviseId: '',
formDia: false,
recordsDia: false,
@@ -404,11 +397,6 @@
pagination({ page, limit }) {
this.yearPage.current = page;
this.yearPage.size = limit;
- this.getYearPlanList();
- },
- pagination1({ page, limit }) {
- this.yearDetailPage.current = page;
- this.yearDetailPage.size = limit;
this.getYearPlanList();
},
// 瀵煎叆娴佺▼
@@ -536,6 +524,11 @@
// 骞村害璁″垝琛ㄦ牸锛岀偣鍑昏鏁版嵁鍚庡埛鏂拌鎯�
rowClick(row) {
this.superviseId = row.superviseId
+ this.getYearDetailPlan()
+ },
+ getYearDetailPlan () {
+ this.yearDetailPage.current = 1
+ this.yearDetailPage.size = 20
this.getYearDetailPlanList()
},
// 鑾峰彇骞村害鏄庣粏琛�
@@ -557,6 +550,10 @@
this.yearDetailLoading = false
})
},
+ pagination1(page) {
+ this.yearDetailPage.size = page.limit;
+ this.getYearDetailPlanList();
+ },
// 閲嶇疆鏄庣粏琛�
clearDetail() {
this.yearDetailForm = {
diff --git a/src/views/CNAS/resourceDemand/device/component/borrow.vue b/src/views/CNAS/resourceDemand/device/component/borrow.vue
index 67faf2d..4898f5f 100644
--- a/src/views/CNAS/resourceDemand/device/component/borrow.vue
+++ b/src/views/CNAS/resourceDemand/device/component/borrow.vue
@@ -2,25 +2,24 @@
<template>
<div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">娴佺▼缂栧彿锛�</div>
- <div><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.processNumber"
- @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
- <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
- </div>
- <div class="btns">
+ <el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
+ <el-form-item label="娴佺▼缂栧彿">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.processNumber"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <div>
<el-button size="small" type="primary" @click="add">鏂板</el-button>
<!-- <el-button size="small" type="primary" @click="handleDown" :loading="outLoading">瀵煎嚭</el-button>-->
</div>
</div>
- <div class="tables" style="margin-top: 10px;">
+ <div class="tables">
<lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 290px)'"
:page="page" @pagination="pagination"></lims-table>
- <!-- <ValueTable ref="ValueTable" :url="$api.deviceBorrow.deviceBorrowPage"
- :delUrl="$api.deviceBorrow.deleteDeviceBorrow" :componentData="componentData" :key="upIndex" /> -->
</div>
<el-dialog title="浠櫒璁惧棰�(鍊�)鐢ㄧ櫥璁�" top="5vh" :visible.sync="dialogVisible" width="60%">
<el-steps :active="currentStep" finish-status="success" align-center>
@@ -118,7 +117,6 @@
<el-col :span="12">
<el-form-item label="褰掕繕浜猴細" prop="rebackUser"
:rules="[{ required: currentStep === 1, message: '璇疯緭鍏ュ綊杩樹汉', trigger: 'change' }]">
- <!-- <el-input v-model="form.rebackUser" size="small" :disabled="currentStep !== 1"></el-input> -->
<el-select v-model="form.rebackUser" filterable placeholder="璇烽�夋嫨" clearable size="small"
style="width: 50%;" :disabled="currentStep !== 1">
<el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.name">
@@ -147,7 +145,6 @@
<el-col :span="12">
<el-form-item label="璁惧璐熻矗浜猴細" prop="deviceUser"
:rules="[{ required: currentStep === 1, message: '璇烽�夋嫨璁惧璐熻矗浜�', trigger: 'change' }]">
- <!-- <el-input v-model="form.deviceUser" size="small" :disabled="currentStep !== 1"></el-input> -->
<el-select v-model="form.deviceUser" filterable placeholder="璇烽�夋嫨" clearable size="small"
style="width: 50%;" :disabled="currentStep !== 1">
<el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.name">
@@ -160,7 +157,6 @@
<el-input type="textarea" v-model="form.note" :disabled="currentStep !== 1" size="small"></el-input>
</el-form-item>
</el-col>
-
</el-row>
</el-card>
<el-row style="margin-top: 1em;">
@@ -576,76 +572,10 @@
</script>
<style scoped>
-h4 {
- font-weight: 400;
- font-size: 16px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
- margin: 10px 0;
-}
-
-h4 .line {
- display: inline-block;
- width: 3px;
- height: 16px;
- background: #3A7BFA;
- margin-right: 4px;
-}
-
-.tables {
- width: 100%;
- height: calc(100vh - 15em);
-}
-
-.search {
- background-color: #fff;
- display: flex;
- align-items: center;
- position: relative;
margin-top: 10px;
-}
-
-.search_thing {
- display: flex;
- align-items: center;
- height: 40px;
-}
-
-.search_label {
- width: 70px;
- font-size: 14px;
- text-align: right;
-}
-
-.search_input {
- width: calc(100% - 120px);
-}
-
-.btns {
- position: absolute;
- right: 0px;
- top: 50%;
- transform: translate(0, -50%);
-}
-
-.btns_thing {
- position: absolute;
- right: 230px;
- top: 50%;
- transform: translate(0, -50%);
-}
-
-.form .search_label {
- width: 120px;
-}
-
-.el-radio {
- margin-right: 10px;
-}
-
-.el-radio-group {
- width: 100%;
- display: flex;
- margin-top: 12px;
}
</style>
diff --git a/src/views/CNAS/resourceDemand/device/component/calibration.vue b/src/views/CNAS/resourceDemand/device/component/calibration.vue
index 72f9359..b0fcdfa 100644
--- a/src/views/CNAS/resourceDemand/device/component/calibration.vue
+++ b/src/views/CNAS/resourceDemand/device/component/calibration.vue
@@ -36,8 +36,8 @@
</el-table-column>
</el-table>
<el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]"
- :total="search.total" layout="->,total, sizes, prev, pager, next, jumper" style="margin-right: 5%;"
- @size-change="handleSizeChange" @current-change="handleCurrentChange">
+ :total="search.total" layout="->,total, sizes, prev, pager, next, jumper"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" background>
</el-pagination>
</div>
<!-- 鏍″噯椤圭洰缁存姢 -->
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
index f837ef1..64e4de1 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
@@ -27,7 +27,7 @@
</el-table-column>
</el-table>
<el-pagination :current-page="1" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
- :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper"
+ :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper" background
@size-change="handleSizeChange1" @current-change="handleCurrentChange1">
</el-pagination>
</div>
diff --git a/src/views/CNAS/resourceDemand/device/component/maintenance.vue b/src/views/CNAS/resourceDemand/device/component/maintenance.vue
index 2b1ebbe..8bc91aa 100644
--- a/src/views/CNAS/resourceDemand/device/component/maintenance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/maintenance.vue
@@ -2,21 +2,22 @@
<template>
<div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">娴佺▼缂栧彿锛�</div>
- <div class="search_input"><el-input v-model="search.deviceNumber" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="getAllMessage(clickNodeVal.value)"></el-input></div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="mini" type="primary" @click="getAllMessage(clickNodeVal.value)">鏌ヨ</el-button>
- <el-button size="mini" @click="resetSearch">閲嶇疆</el-button>
- </div>
- <div class="btns">
+ <el-form :model="search" ref="search" size="small" :inline="true">
+ <el-form-item label="娴佺▼缂栧彿">
+ <el-input v-model="search.deviceNumber" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="getAllMessage(clickNodeVal.value)"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button size="mini" type="primary" @click="getAllMessage(clickNodeVal.value)">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetSearch">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <div>
<el-button size="small" type="primary" @click="dialogVisible = true; add()">娣诲姞缁存姢璁板綍</el-button>
<el-button :loading="outLoading" size="small" type="primary" @click="handleDownOne">瀵煎嚭</el-button>
</div>
</div>
- <div class="tables" style="margin-top: 10px;">
+ <div>
<el-table ref="table" :data="MaintainParam" height="calc(100vh - 20em)"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="120">
@@ -41,7 +42,7 @@
</el-table>
<el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]"
:total="search.total" layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
- @current-change="handleCurrentChange">
+ @current-change="handleCurrentChange" background>
</el-pagination>
</div>
<!-- 鏂板缓缁存姢 -->
@@ -276,66 +277,11 @@
</script>
<style scoped>
-h4 {
- font-weight: 400;
- font-size: 16px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
- margin: 10px 0;
-}
-
-h4 .line {
- display: inline-block;
- width: 3px;
- height: 16px;
- background: #3A7BFA;
- margin-right: 4px;
-}
-
-.tables {
- width: 100%;
- height: calc(100vh - 17em);
-}
-
-.search {
- background-color: #fff;
- display: flex;
- align-items: center;
- position: relative;
margin-top: 10px;
-}
-
-.search_thing {
- display: flex;
- align-items: center;
- height: 40px;
-}
-
-.search_label {
- width: 80px;
- font-size: 14px;
- text-align: right;
-}
-
-.search_input {
- width: 73%;
-}
-
-.btns {
- position: absolute;
- right: 0px;
- top: 50%;
- transform: translate(0, -50%);
-}
-
-.btns_thing {
- position: absolute;
- right: 230px;
- top: 50%;
- transform: translate(0, -50%);
-}
-
-.form .search_label {
- width: 120px;
+ align-items: flex-start;
}
</style>
diff --git a/src/workers/DataWorker.worker.js b/src/workers/DataWorker.worker.js
index b2e99c1..218ed78 100644
--- a/src/workers/DataWorker.worker.js
+++ b/src/workers/DataWorker.worker.js
@@ -65,27 +65,25 @@
if(i+1==arr[1]){
// 璧嬪�兼暟閲囦紭鍖栨楠岄」鍒楄〃
arrSpecial.push(n.i)
- setTimeout(()=>{
- let num0 = 0
- if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
- // 淇濈暀妯℃澘閰嶇疆鐨勫皬鏁扮偣浣嶆暟
- let str0 = n.v.ct.fa.split('.')[1]
- num0 = str0.length
- n.v.v = dataAcquisitionInfo[str].value[i]?Number(dataAcquisitionInfo[str].value[i]).toFixed(num0):dataAcquisitionInfo[str].value[i]
- }else{
- // 鐩存帴璧嬪��
- n.v.v = dataAcquisitionInfo[str].value[i]
+ let num0 = 0
+ if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
+ // 淇濈暀妯℃澘閰嶇疆鐨勫皬鏁扮偣浣嶆暟
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.length
+ n.v.v = dataAcquisitionInfo[str].value[i]?Number(dataAcquisitionInfo[str].value[i]).toFixed(num0):dataAcquisitionInfo[str].value[i]
+ }else{
+ // 鐩存帴璧嬪��
+ n.v.v = dataAcquisitionInfo[str].value[i]
+ }
+ // 浼犻�掔粰涓荤嚎绋�
+ result = {
+ method:'changeInput',
+ value:{
+ list:list,
+ n:n
}
- // 浼犻�掔粰涓荤嚎绋�
- result = {
- method:'changeInput',
- value:{
- list:list,
- n:n
- }
- }
- self.postMessage(JSON.stringify(result))
- },2000)
+ }
+ self.postMessage(JSON.stringify(result))
}
}
}else{
--
Gitblit v1.9.3