From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue | 78 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 29 deletions(-)
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 2fc53ba..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
@@ -4,33 +4,34 @@
<el-col :span="12">
<div class="header">
<div>璇曢獙鍖哄煙</div>
- <div>
- 鍚嶇О锛�
- <el-input v-model="search.testAreaName" clearable size="small" style="width: 120px"></el-input>
- <el-button size="small" type="primary" @click="initData">鏌ヨ</el-button>
- <el-button size="small" type="primary" @click="clickAdd">鏂� 澧�</el-button>
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">鍚嶇О</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="search.testAreaName"
+ @keyup.enter.native="initData"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button size="mini" type="primary" @click="initData">鏌ヨ</el-button>
+ <el-button size="mini" type="primary" @click="clickAdd">鏂� 澧�</el-button>
+ </div>
</div>
</div>
<el-table :data="tableData" height="calc(100vh - 18em)" highlight-current-row style="width: 100%"
: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="edit(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>
@@ -47,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>
@@ -185,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>
@@ -236,8 +242,10 @@
responsibleOptions: [],
approvalDialog: false,
approvalLoading: false,
- subjoin: '',
approvalRow: {},
+ recordForm: {
+ registrarUserId: ''
+ }
}
},
mounted() {
@@ -261,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
@@ -327,6 +336,7 @@
},
clickRow(row) {
this.saveRow = row
+ this.search1.current = 1
this.initData1(row.dateId)
},
edit(row) {
@@ -397,6 +407,13 @@
}
});
},
+ // 鍒ゆ柇娓╂箍搴﹀尯闂村彉鑹�
+ tableRowClassName({row, rowIndex}) {
+ if (row.isIssue == 1) {
+ return 'warning-row';
+ }
+ return '';
+ },
handleSizeChange(val) {
this.search.size = val;
this.initData();
@@ -407,11 +424,11 @@
},
handleSizeChange1(val) {
this.search1.size = val;
- this.initData1();
+ this.initData1(this.saveRow.dateId);
},
handleCurrentChange1(val) {
this.search1.current = val;
- this.initData1();
+ this.initData1(this.saveRow.dateId);
},
clickAdd() {
this.dialogVisible = true
@@ -427,4 +444,7 @@
display: flex;
justify-content: space-between;
}
+>>>.warning-row {
+ background: #eea7ae;
+}
</style>
--
Gitblit v1.9.3