From b26f4356507b705cc944dba3b77c8c7746a95a41 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 10 四月 2025 13:06:56 +0800
Subject: [PATCH] 温湿度展示信息调整
---
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue | 56 +++++++++++++++++++++++++++++++++++---------------------
src/api/structural/structureTestObjectPart.js | 2 +-
2 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/api/structural/structureTestObjectPart.js b/src/api/structural/structureTestObjectPart.js
index c0a9f0d..41ca1ce 100644
--- a/src/api/structural/structureTestObjectPart.js
+++ b/src/api/structural/structureTestObjectPart.js
@@ -60,7 +60,7 @@
export function deleteProductPart(query) {
return request({
url: '/productPart/deleteProductPart',
- method: 'post',
+ method: 'delete',
params: query
})
}
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
index c5019a7..c43c3c2 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
@@ -20,22 +20,18 @@
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@row-click="clickRow">
<el-table-column label="搴忓彿" type="index" width="60" align="center"></el-table-column>
- <el-table-column label="鏈堝害鏃堕棿" min-width="180" prop="monthDate"></el-table-column>
+ <el-table-column label="鏈堝害鏃堕棿" min-width="100" prop="monthDate"></el-table-column>
<el-table-column label="璇曢獙鍖哄煙鍚嶇О" min-width="180" prop="testAreaName"></el-table-column>
- <el-table-column label="纭鐘舵��" min-width="180" prop="isAffirm">
- <template slot-scope="scope">
- <el-tag type="danger" v-if="scope.row.isAffirm == 0">鏈‘璁�</el-tag>
- <el-tag type="success" v-if="scope.row.isAffirm == 1">宸茬‘璁�</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="澧炶ˉ淇℃伅" min-width="180" prop="subjoin"></el-table-column>
+ <el-table-column label="璁板綍鍛�" min-width="120" prop="registrarUserName"></el-table-column>
+ <el-table-column label="娓╁害鍖洪棿" min-width="100" prop="temperatureSection"></el-table-column>
+ <el-table-column label="婀垮害鍖洪棿" min-width="100" prop="humiditySection"></el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" min-width="180" align="center">
<template v-slot="scope">
<el-button size="small" type="text" @click="downLoadPost(scope.row)">瀵煎嚭</el-button>
<!-- <el-button size="small" type="text" @click="edit(scope.row)">缂栬緫</el-button>-->
- <el-button :disabled="scope.row.isAffirm === '1'" size="small" type="text"
- @click="openApprovalDialog(scope.row)">纭</el-button>
- <el-button size="small" type="text" @click="deleteRowFun(scope.row)">鍒犻櫎</el-button>
+ <el-button size="small" type="text"
+ @click="openApprovalDialog(scope.row)">璁板綍鍛樼粦瀹�</el-button>
+<!-- <el-button size="small" type="text" @click="deleteRowFun(scope.row)">鍒犻櫎</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -52,7 +48,7 @@
澧�</el-button>
</div>
</div>
- <el-table :data="tableData1" height="calc(100vh - 18em)" style="width: 100%"
+ <el-table :data="tableData1" height="calc(100vh - 18em)" style="width: 100%" :row-class-name="tableRowClassName">
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="60" align="center"></el-table-column>
<el-table-column label="鏃ユ湡" min-width="100" prop="recordDate"></el-table-column>
@@ -190,14 +186,19 @@
<el-button type="primary" :loading="submitLoading" @click="addPowerSupplyStability1">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog :visible.sync="approvalDialog" title="纭" width="30%" @close="subjoin = ''">
- <span>
- 澧炶ˉ淇℃伅锛�
- <el-input v-model="subjoin" type="textarea"></el-input>
- </span>
+ <el-dialog :visible.sync="approvalDialog" title="璁板綍鍛樼粦瀹�" width="30%" @open="openDialog">
+ <el-form ref="recordForm" :model="recordForm">
+ <el-form-item label="璁板綍鍛�: ">
+ <el-select v-model="recordForm.registrarUserId" clearable filterable placeholder="璇烽�夋嫨" size="small"
+ style="width: 80%;">
+ <el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
<span slot="footer" class="dialog-footer">
- <el-button :loading="approvalLoading" @click="subjoin = '', approvalDialog = false">涓嶇‘璁�</el-button>
- <el-button :loading="approvalLoading" type="primary" @click="handleApproval">纭� 璁�</el-button>
+ <el-button :loading="approvalLoading" @click="approvalDialog = false">鍙栨秷</el-button>
+ <el-button :loading="approvalLoading" type="primary" @click="handleApproval">淇濆瓨</el-button>
</span>
</el-dialog>
</div>
@@ -241,8 +242,10 @@
responsibleOptions: [],
approvalDialog: false,
approvalLoading: false,
- subjoin: '',
approvalRow: {},
+ recordForm: {
+ registrarUserId: ''
+ }
}
},
mounted() {
@@ -266,12 +269,13 @@
openApprovalDialog(row) {
this.approvalDialog = true
this.approvalRow = row
+ this.recordForm.registrarUserId = row.registrarUserId
},
handleApproval() {
this.approvalLoading = true
const params = {
dateId: this.approvalRow.dateId,
- subjoin: this.subjoin,
+ registrarUserId: this.recordForm.registrarUserId
}
affirmFeTempHumDate(params).then(res => {
this.approvalLoading = false
@@ -403,6 +407,13 @@
}
});
},
+ // 鍒ゆ柇娓╂箍搴﹀尯闂村彉鑹�
+ tableRowClassName({row, rowIndex}) {
+ if (row.isIssue == 1) {
+ return 'warning-row';
+ }
+ return '';
+ },
handleSizeChange(val) {
this.search.size = val;
this.initData();
@@ -433,4 +444,7 @@
display: flex;
justify-content: space-between;
}
+>>>.warning-row {
+ background: #eea7ae;
+}
</style>
--
Gitblit v1.9.3