From e9c7fa1915cd2afbadaef1884324fa7cd5aaaf25 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 29 七月 2025 10:12:06 +0800
Subject: [PATCH] Merge branch 'dev_y_ztns' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev_y_ztns
---
src/views/CNAS/resourceDemand/facilitiesEnvironment/index.vue | 81 ++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 45 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/index.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/index.vue
index 3c6f34b..a904884 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/index.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/index.vue
@@ -1,50 +1,41 @@
<template>
- <div class="main">
- <el-tabs v-model="activeName" :lazy="true" type="border-card">
- <el-tab-pane label="璁炬柦鍜岀幆澧冩潯浠惰姹�" name="璁炬柦鍜岀幆澧冩潯浠惰姹�">
- <FacilitiesEnvironmentalConditions v-if="activeName === '璁炬柦鍜岀幆澧冩潯浠惰姹�'"/>
- </el-tab-pane>
+ <div class="capacity-scope">
+ <el-tabs v-model="activeName" :lazy="true" type="border-card">
+ <el-tab-pane label="璁炬柦鍜岀幆澧冩潯浠惰姹�" name="璁炬柦鍜岀幆澧冩潯浠惰姹�">
+ <FacilitiesEnvironmentalConditions v-if="activeName === '璁炬柦鍜岀幆澧冩潯浠惰姹�'"/>
+ </el-tab-pane>
+ <el-tab-pane label="涓夊簾澶勭悊" name="涓夊簾澶勭悊">
+ <a6-three-wastes-treatment v-if="activeName === '涓夊簾澶勭悊'"></a6-three-wastes-treatment>
+ </el-tab-pane>
+ <el-tab-pane label="杩涘嚭浜哄憳绠＄悊" name="杩涘嚭浜哄憳绠＄悊">
+ <personnel-management v-if="activeName === '杩涘嚭浜哄憳绠＄悊'"></personnel-management>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+</template>
- <el-tab-pane label="涓夊簾澶勭悊" name="涓夊簾澶勭悊">
- <a6-three-wastes-treatment v-if="activeName === '涓夊簾澶勭悊'"></a6-three-wastes-treatment>
- </el-tab-pane>
- <el-tab-pane label="杩涘嚭浜哄憳绠＄悊" name="杩涘嚭浜哄憳绠＄悊">
- <personnel-management v-if="activeName === '杩涘嚭浜哄憳绠＄悊'"></personnel-management>
- </el-tab-pane>
- </el-tabs>
- </div>
- </template>
-
- <script>
- import FacilitiesEnvironmentalConditions from "../facilitiesEnvironment/component/facilities-environmental-conditions.vue";
-// // 澶栨潵浜哄憳绠＄悊
-// import ExternalPersonnelManagement from "../facilitiesEnvironment/component/Personnel-management.vue";
- import A6ThreeWastesTreatment from '../facilitiesEnvironment/component/three-wastes-treatment.vue';
- import PersonnelManagement from '../facilitiesEnvironment/component/Personnel-management.vue';
-
- export default {
- components: {
- // PersonnelManagement,
- A6ThreeWastesTreatment,
- PersonnelManagement,
- FacilitiesEnvironmentalConditions
- },
- data() {
- return {
- activeName: '璁炬柦鍜岀幆澧冩潯浠惰姹�',
- }
+<script>
+import FacilitiesEnvironmentalConditions from "../facilitiesEnvironment/component/facilities-environmental-conditions.vue";
+import A6ThreeWastesTreatment from '../facilitiesEnvironment/component/three-wastes-treatment.vue';
+import PersonnelManagement from '../facilitiesEnvironment/component/Personnel-management.vue';
+export default {
+ name: 'FacilitiesEnvironment',
+ components: {
+ A6ThreeWastesTreatment,
+ PersonnelManagement,
+ FacilitiesEnvironmentalConditions
+ },
+ data() {
+ return {
+ activeName: '璁炬柦鍜岀幆澧冩潯浠惰姹�',
}
}
- </script>
+}
+</script>
+<style scoped>
+.main {
+ width: 100%;
+ border-radius: 15px;
+}
- <style scoped>
- .main {
- padding: 15px 0;
- width: 100%;
- border-radius: 15px;
- }
- v-deep .el-tabs--border-card>.el-tabs__content {
- height: calc(100vh - 9em);
- padding: 0;
- }
- </style>
+</style>
--
Gitblit v1.9.3