From 8d89100d8dfae2e33f6536c79e5fa74c6c374a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 27 Dec 2024 13:42:09 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=8E=A7=E5=88=B6=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/equipment/airBlower/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
index 92d6bb12..537503be 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
@@ -43,7 +43,7 @@
                     <el-button type="primary" :icon="Crop" class="defaultBtn" @click="openMeasure">测点选择</el-button>
                     <el-button style="color: rgb(0, 100, 170)" :icon="Download" class="defaultBtn" @click="downFun">数据导出</el-button>
                 </div>
-                <div class="headerRight">
+                <div class="headerRight" v-permission="[104]">
                     <el-popconfirm title="确认启动么？" @confirm="airBlowerOperate('setTurbineFastStart')">
                         <template #reference>
                             <el-button type="primary">{{ t('airBlower.start') }}</el-button>
@@ -230,6 +230,9 @@ import { adminBaseRoutePath } from '/@/router/static/adminBase'
 import { getRealValueListReq } from '/@/api/backend/deviceModel/request'
 import SelectPoint from '/@/views/backend/equipment/airBlower/selectPoint.vue'
 import RealDataChart from '/@/views/backend/equipment/airBlower/realDataChart.vue'
+import { permission } from '/@/utils/directive'
+const vPermission = permission()
+
 const router = useRouter()
 const { t } = useI18n()
 

From 84151f6f01875849cfade3f5d9787748a97f11a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 27 Dec 2024 14:14:34 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=EF=BC=9A=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8E=9F=E7=94=9F=E6=96=B9=E5=BC=8F=20=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=84=E4=BB=B6=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=85=AC=E5=85=B1=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/api/backend/index.ts          |  5 +-
 ui/dasadmin/src/components/upload/index.vue   | 46 ++++++++++
 .../equipment/equipmentManagement/index.vue   | 91 ++++++++++---------
 3 files changed, 97 insertions(+), 45 deletions(-)
 create mode 100644 ui/dasadmin/src/components/upload/index.vue

diff --git a/ui/dasadmin/src/api/backend/index.ts b/ui/dasadmin/src/api/backend/index.ts
index e3233464..c6f9ff58 100644
--- a/ui/dasadmin/src/api/backend/index.ts
+++ b/ui/dasadmin/src/api/backend/index.ts
@@ -301,14 +301,15 @@ export function delOtherParamsReq(params: any) {
 export function uploadOtherParamsFileReq(formData: FormData, V: string) {
     const token = encrypt_aes(adminInfo.token, V)
     return createAxios({
-        url: '/api/equipment//file/upload',
+        url: '/api/equipment/file/upload',
         method: 'POST',
         data: formData,
         headers: {
             'Content-Type': 'multipart/form-data',
             V,
             token,
-        }
+        },
+        timeout: 1000 * 60 * 2,
     },
         { customEncrypt: true })
 }
diff --git a/ui/dasadmin/src/components/upload/index.vue b/ui/dasadmin/src/components/upload/index.vue
new file mode 100644
index 00000000..14bd1f79
--- /dev/null
+++ b/ui/dasadmin/src/components/upload/index.vue
@@ -0,0 +1,46 @@
+<template>
+    <div class="uploadContainer" @click="upload">
+        <slot></slot>
+        <input ref="uploadRef" type="file" style="display: none" :multiple="props.multiple" @change="change" />
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+const props = defineProps({
+    multiple: {
+        type: Boolean,
+        default: false,
+    },
+    onChange: {
+        type: Function,
+        default: () => {},
+    },
+})
+
+const uploadRef = ref()
+
+const upload = (e:any) => {
+    e.stopPropagation()
+    uploadRef.value!.click()
+}
+
+const change = (payload: Event) => {
+    payload.preventDefault()
+    const files = (payload.target as HTMLInputElement).files
+    props.onChange(files)
+}
+const clearFiles = () => {
+    uploadRef.value!.value = ''
+}
+
+defineExpose({
+    clearFiles,
+})
+</script>
+
+<style scoped lang="scss">
+.uploadContainer {
+    height: 100%;
+}
+</style>
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index bbbe2ce7..b745654c 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -84,7 +84,15 @@
                 </el-main>
             </el-container>
             <!-- 机组设备弹窗 -->
-            <el-dialog v-model="type10002DialogVisible" width="800" :title="type10002DialogTitle" align-center :close-on-click-modal="false" @close="cancelType10002Dialog">
+            <el-dialog
+                v-model="type10002DialogVisible"
+                width="800"
+                :title="type10002DialogTitle"
+                align-center
+                :close-on-click-modal="false"
+                @close="cancelType10002Dialog"
+                :before-close="beforeCloseType10002Dialog"
+            >
                 <el-tabs v-model="activeName">
                     <el-form ref="deviceDataFormRef" label-width="auto" :model="deviceData" :rules="editAddDeviceRules">
                         <el-tab-pane label="风机参数" name="1">
@@ -605,12 +613,9 @@
         <el-dialog v-model="attachmentDialogVisible" :title="attachmentDialogTitle" :width="800" :close-on-click-modal="false">
             <div class="attachmentContainer">
                 <div class="header">
-                    <!-- <el-button @click="uploadAttachment">添加附件</el-button> -->
-                    <el-upload ref="uploadRef" :show-file-list="false" :http-request="uploadAttachment" multiple>
-                        <template #trigger>
-                            <el-button type="primary">添加附件</el-button>
-                        </template>
-                    </el-upload>
+                    <CustomUpload multiple :onChange="uploadAttachment" ref="customUploadRef">
+                        <el-button type="primary" :loading="uploadAttachmentLoading">添加附件</el-button>
+                    </CustomUpload>
                 </div>
                 <div class="content">
                     <el-carousel indicator-position="outside" @change="changeImgIndex">
@@ -660,20 +665,12 @@ import {
     updateOtherParamsReq,
     delOtherParamsReq,
     uploadOtherParamsFileReq,
-    readFileReq,
 } from '/@/api/backend'
 import {
     ElTable,
     ElMessage,
     ElMessageBox,
     FormInstance,
-    UploadInstance,
-    genFileId,
-    UploadProps,
-    UploadRawFile,
-    UploadFile,
-    UploadFiles,
-    UploadRequestOptions,
 } from 'element-plus'
 import { useAdminInfo } from '/@/stores/adminInfo'
 import { encrypt_aes, generateRandomNumber } from '/@/utils/crypto'
@@ -681,6 +678,7 @@ import ControlPage from './control.vue'
 import MeasurementPage from './measurement.vue'
 import { ModelAttributeType } from '/@/views/backend/auth/model/type'
 import { theoreticalpowerCurveList } from '/@/api/backend/theoreticalpowerCurve/request'
+import CustomUpload from '/@/components/upload/index.vue'
 import { permission } from '/@/utils/directive'
 const vPermission = permission()
 
@@ -1262,8 +1260,6 @@ const getCurDialogState = () => {
     }
 }
 const saveDeviceData = () => {
-    // console.log(deviceData, 'deviceData')
-
     deviceDataFormRef.value?.validate((valid: boolean) => {
         if (valid) {
             deviceData.standard = deviceData.standard ? 1 : 0
@@ -1344,6 +1340,24 @@ const saveDeviceData = () => {
         }
     })
 }
+const beforeCloseType10002Dialog = (done: () => void) =>{
+    if (addImgList.value.length) {
+        ElMessageBox.confirm('上传图片未保存，确认取消？', '', {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+        })
+            .then(() => {
+                done()
+                addImgList.value = []
+                imgList.value = []
+            })
+            .catch(() => {})
+    } else {
+        done()
+        imgList.value = []
+    }
+}
 const cancelType10002Dialog = () => {
     if (addImgList.value.length) {
         ElMessageBox.confirm('上传图片未保存，确认取消？', '', {
@@ -1410,30 +1424,26 @@ const setOtherParamsFormData = (data: any = {}) => {
 const attachmentDialogVisible = ref(false)
 const attachmentDialogTitle = ref('风机详细信息')
 
-const uploadRef = ref<UploadInstance>()
-const uploadAttachment = (file: UploadRequestOptions) => {
+const customUploadRef = ref()
+const uploadAttachmentLoading =ref(false)
+const uploadAttachment = (files: FileList) => {
+    uploadAttachmentLoading.value = true
     const formData = new FormData()
-    formData.append('fileList', file.file)
+    for (let i = 0; i < files.length; i++) {
+        formData.append('fileList', files[i])
+    }
     const v = generateRandomNumber(16)
     return uploadOtherParamsFileReq(formData, v).then((res) => {
-        addImgList.value.push({
-            name: file.file.name,
-            url: res.data[0].url,
-            component: attachmentComponent.value,
+        customUploadRef.value?.clearFiles()
+        res.data.forEach((item:{ name:string, url:string})=>{
+            addImgList.value.push({
+                name: item.name,
+                url: item.url,
+                component: attachmentComponent.value,
+            })
         })
-        addImgList.value.push({
-            name: file.file.name,
-            url: res.data[1].url,
-            component: attachmentComponent.value,
-        })
-        const imgListUrl = imgList.value.map((item: any) => item.url)
-        for (let i = addImgList.value.length - 1; i >= 0; i--) {
-            if (imgListUrl.includes('/api/equipment/file/read?path=' + addImgList.value[i].url)) {
-                const index = imgList.value.findIndex((item: any) => item.url === '/api/equipment/file/read?path=' + addImgList.value[i].url)
-                imgList.value.splice(index, 1)
-            }
-        }
         previewImg([...imgList.value, ...addImgList.value])
+        uploadAttachmentLoading.value = false
     })
 }
 const setUploadImgInfo = (id: string) => {
@@ -1442,13 +1452,7 @@ const setUploadImgInfo = (id: string) => {
         item.deviceId = id
     })
 }
-const handleExceed: UploadProps['onExceed'] = (files) => {
-    uploadRef.value!.clearFiles()
-    const file = files[0] as UploadRawFile
-    file.uid = genFileId()
-    uploadRef.value!.handleStart(file)
-    uploadRef.value!.submit()
-}
+
 const attachmentComponent = ref('')
 const openAttachment = (type: string) => {
     attachmentComponent.value = type
@@ -1491,6 +1495,7 @@ const previewImgIndex = ref(0)
 const changeImgIndex = (index: number) => {
     previewImgIndex.value = index
 }
+
 </script>
 
 <style scoped lang="scss">

From 5b84583b833ce8acb2cd50aa4606bc4007ac7aca Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 27 Dec 2024 15:38:19 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/LoggerController.java    | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 das/src/main/java/com/das/modules/admin/controller/LoggerController.java

diff --git a/das/src/main/java/com/das/modules/admin/controller/LoggerController.java b/das/src/main/java/com/das/modules/admin/controller/LoggerController.java
new file mode 100644
index 00000000..32edcfa6
--- /dev/null
+++ b/das/src/main/java/com/das/modules/admin/controller/LoggerController.java
@@ -0,0 +1,51 @@
+package com.das.modules.admin.controller;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/logger/")
+public class LoggerController {
+    private static final Logger logger = LogManager.getLogger(LoggerController.class);
+
+    /**
+     * 查询当前日志级别
+     *
+     * @return 当前所有日志级别
+     */
+    @GetMapping("/list")
+    public Map<String, String> listLogLevels() {
+        LoggerContext context = (LoggerContext) LogManager.getContext(false);
+        return context.getConfiguration().getLoggers().values().stream()
+                .collect(Collectors.toMap(
+                        LoggerConfig::getName,
+                        loggerConfig -> loggerConfig.getLevel().toString()
+                ));
+    }
+
+    /**
+     * 更新日志级别
+     *
+     * @param loggerName 日志名称
+     * @param level      日志级别 (TRACE, DEBUG, INFO, WARN, ERROR, FATAL)
+     * @return 更新结果
+     */
+    @PostMapping("/update")
+    public String updateLogLevel(String loggerName, String level) {
+        try {
+            Configurator.setLevel(loggerName, org.apache.logging.log4j.Level.valueOf(level.toUpperCase()));
+            logger.info("Updated logger [{}] to level [{}]", loggerName, level);
+            return String.format("Logger [%s] updated to level [%s]", loggerName, level);
+        } catch (IllegalArgumentException e) {
+            logger.error("Invalid log level [{}]", level, e);
+            return String.format("Invalid log level [%s]. Valid levels: TRACE, DEBUG, INFO, WARN, ERROR, FATAL.", level);
+        }
+    }
+}
\ No newline at end of file

From 7d51b0fc7ac33237fefcc43a44a561170e70f9b7 Mon Sep 17 00:00:00 2001
From: yu <tianyu414x@126.com>
Date: Fri, 27 Dec 2024 15:44:58 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=20=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE-=E5=88=A0=E9=99=A4=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/service/impl/SysEnumServiceImpl.java        | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
index 70f06a89..2ae3ceee 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
@@ -173,13 +173,7 @@ public class SysEnumServiceImpl implements SysEnumService {
      */
     @Override
     public void deleteEnumValues(SysEnumValuesDto sysEnumValuesDto) {
-        SysEnumValues sysEnumValues = new SysEnumValues();
-        BeanCopyUtils.copy(sysEnumValuesDto,sysEnumValues);
-        SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
-        sysEnumValues.setUpdatedBy(sysUserVo.getAccount());
-        sysEnumValues.setUpdatedTime(new Date());
-        sysEnumValues.setIsActive(0);
-        sysEnumValuesMapper.updateById(sysEnumValues);
+        sysEnumValuesMapper.deleteById(sysEnumValuesDto.getId());
     }
 
     /**

From 63fe0253794b015934e0972435d1630ea183c171 Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Fri, 27 Dec 2024 16:04:54 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/dashboard.vue | 6 +++---
 ui/dasadmin/src/views/backend/home/home.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index d7c38d14..0e830ae8 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -38,7 +38,7 @@
 
                                     <div class="small-value">
                                         <span class="content-number">{{realData.attributeMap.windfarmdayprodenergy}}</span>
-                                        <span>万kWh</span>
+                                        <span>MWh</span>
                                     </div>
                                     <div class="small-title">日发电量</div>
                                 </div>
@@ -48,7 +48,7 @@
 
                                     <div class="small-value">
                                         <span class="content-number">{{realData.attributeMap.windfarmmonthprodenergy}}</span>
-                                        <span>万kWh</span>
+                                        <span>MWh</span>
                                     </div>
                                     <div class="small-title">本月发电量</div>
                                 </div>
@@ -58,7 +58,7 @@
 
                                     <div class="small-value">
                                         <span class="content-number">{{realData.attributeMap.windfarmyearprodenergy}}</span>
-                                        <span>万kWh</span>
+                                        <span>MWh</span>
                                     </div>
                                     <div class="small-title">年发电量</div>
                                 </div>
diff --git a/ui/dasadmin/src/views/backend/home/home.vue b/ui/dasadmin/src/views/backend/home/home.vue
index af88c841..61ab69de 100644
--- a/ui/dasadmin/src/views/backend/home/home.vue
+++ b/ui/dasadmin/src/views/backend/home/home.vue
@@ -21,9 +21,9 @@
                                             <div class="small-base">平均风速:<span>{{ realData.attributeMap.windfarmavgwindspeed}}m/s</span></div>
                                             <div class="small-base">实时有功:<span>{{ realData.attributeMap.windfarmactivepower}}kW</span></div>
                                             <div class="small-base">实时无功:<span>{{ realData.attributeMap.windfarmreactivepower}}kVar</span></div>
-                                            <div class="small-base">日发电量:<span>{{ realData.attributeMap.windfarmdayprodenergy}}万kWh</span></div>
-                                            <div class="small-base">月发电量:<span>{{ realData.attributeMap.windfarmmonthprodenergy}}万kWh</span></div>
-                                            <div style="padding: 0;" class="small-base">年发电量:<span>{{ realData.attributeMap.windfarmyearprodenergy}}万kWh</span></div>
+                                            <div class="small-base">日发电量:<span>{{ realData.attributeMap.windfarmdayprodenergy}}MWh</span></div>
+                                            <div class="small-base">月发电量:<span>{{ realData.attributeMap.windfarmmonthprodenergy}}MWh</span></div>
+                                            <div style="padding: 0;" class="small-base">年发电量:<span>{{ realData.attributeMap.windfarmyearprodenergy}}MWh</span></div>
                                         </div>
                                         <div class="overviewItem" style="border: none;">
                                             <div class="small-base"><i class="powerprod"></i>并网:<span>{{ realData.attributeMap.turbinecountpowerprod}}台</span></div>

From d3df39411573159f41622e3ace35565c632d8052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 27 Dec 2024 16:11:30 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=9F=BA=E7=A1=80=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=B7=A5=E7=A8=8B=EF=BC=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BB=8E=E6=9E=9A=E4=B8=BE=E5=80=BC=E8=8E=B7=E5=8F=96=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=98=BE=E7=A4=BA=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/equipmentManagement/index.vue   | 150 ++++++++++++++----
 1 file changed, 116 insertions(+), 34 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index b745654c..9e0f78e1 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -178,13 +178,26 @@
                                         />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="所属线路:">
-                                        <el-input placeholder="请输入所属线路" v-model="deviceData.belongLine" style="width: 200px" />
+                            </el-row>
+                            <el-row>
+                                <el-col :span="9">
+                                    <el-form-item label="所属工程">
+                                        <el-select placeholder="请选择所属工程" v-model="deviceData.belongProject">
+                                            <el-option v-for="item in belongprojectList" :key="item.id" :value="item.value"></el-option>
+                                        </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="10" :offset="1">
-                                    <el-button @click="openAttachment('风机')">风机详情</el-button>
+                                <el-col :span="9">
+                                    <el-form-item label="所属线路:">
+                                        <el-select placeholder="请选择所属线路" v-model="deviceData.belongLine">
+                                            <el-option v-for="item in belongLineList" :key="item.id" :value="item.value"></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="3">
+                                    <div style="padding-left: 26px; width: 100%; height: 100%">
+                                        <el-button @click.stop="openAttachment('风机')">风机详情</el-button>
+                                    </div>
                                 </el-col>
                             </el-row>
                             <el-row>
@@ -274,7 +287,7 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="3" :offset="1">
-                                    <el-button @click="openAttachment('变桨')">详情…</el-button>
+                                    <el-button @click.stop="openAttachment('变桨')">详情…</el-button>
                                 </el-col>
                                 <el-col :span="10">
                                     <el-form-item label="叶片1型号:">
@@ -287,7 +300,7 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="3" :offset="1">
-                                    <el-button @click="openAttachment('叶片1')">详情…</el-button>
+                                    <el-button @click.stop="openAttachment('叶片1')">详情…</el-button>
                                 </el-col>
                                 <el-col :span="10">
                                     <el-form-item label="叶片1轴承型号:">
@@ -310,7 +323,7 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="3" :offset="1">
-                                    <el-button @click="openAttachment('叶片2')">详情…</el-button>
+                                    <el-button @click.stop="openAttachment('叶片2')">详情…</el-button>
                                 </el-col>
                                 <el-col :span="10">
                                     <el-form-item label="叶片2轴承型号:">
@@ -333,7 +346,7 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="3" :offset="1">
-                                    <el-button @click="openAttachment('叶片3')">详情…</el-button>
+                                    <el-button @click.stop="openAttachment('叶片3')">详情…</el-button>
                                 </el-col>
                                 <el-col :span="10">
                                     <el-form-item label="叶片3轴承型号:">
@@ -356,7 +369,7 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="3" :offset="1">
-                                    <el-button @click="openAttachment('主轴承')">详情…</el-button>
+                                    <el-button @click.stop="openAttachment('主轴承')">详情…</el-button>
                                 </el-col>
                                 <el-col :span="10">
                                     <el-form-item label="齿轮箱型号:">
@@ -369,7 +382,7 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="3" :offset="1">
-                                    <el-button @click="openAttachment('齿轮箱')">详情…</el-button>
+                                    <el-button @click.stop="openAttachment('齿轮箱')">详情…</el-button>
                                 </el-col>
                                 <el-col :span="10">
                                     <el-form-item label="发电机型号:">
@@ -382,7 +395,7 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="3" :offset="1">
-                                    <el-button @click="openAttachment('发电机')">详情…</el-button>
+                                    <el-button @click.stop="openAttachment('发电机')">详情…</el-button>
                                 </el-col>
                                 <el-col :span="10">
                                     <el-form-item label="交流器型号:">
@@ -395,7 +408,7 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="3" :offset="1">
-                                    <el-button @click="openAttachment('交流器')">详情…</el-button>
+                                    <el-button @click.stop="openAttachment('交流器')">详情…</el-button>
                                 </el-col>
                                 <el-col :span="12">
                                     <el-form-item label="主控系统型号:">
@@ -413,10 +426,10 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="4">
-                                    <el-button @click="openAttachment('塔基柜')">塔基柜详情</el-button>
+                                    <el-button @click.stop="openAttachment('塔基柜')">塔基柜详情</el-button>
                                 </el-col>
                                 <el-col :span="4">
-                                    <el-button @click="openAttachment('机舱柜')">机舱柜详情</el-button>
+                                    <el-button @click.stop="openAttachment('机舱柜')">机舱柜详情</el-button>
                                 </el-col>
                             </el-row>
                         </el-tab-pane>
@@ -635,7 +648,13 @@
                                         preview-teleported
                                         style="width: 100%; height: 100%"
                                     ></el-image>
-                                    <!-- <img :src="item.url" alt="" style="width: auto; height: 100%" /> -->
+                                    <div class="delImg">
+                                        <el-popconfirm title="确认删除该图片吗？" @confirm="delImg(item)">
+                                            <template #reference>
+                                                <el-button @click.stop type="danger" :icon="CloseBold" circle />
+                                            </template>
+                                        </el-popconfirm>
+                                    </div>
                                 </div>
                             </el-carousel-item>
                         </template>
@@ -648,7 +667,7 @@
 
 <script setup lang="ts">
 import { ref, reactive, computed, onMounted, nextTick, watch } from 'vue'
-import { Search, CirclePlusFilled, Upload, Download } from '@element-plus/icons-vue'
+import { Search, CirclePlusFilled, Upload, Download, CloseBold } from '@element-plus/icons-vue'
 import {
     equipTree,
     equipQuery,
@@ -666,12 +685,7 @@ import {
     delOtherParamsReq,
     uploadOtherParamsFileReq,
 } from '/@/api/backend'
-import {
-    ElTable,
-    ElMessage,
-    ElMessageBox,
-    FormInstance,
-} from 'element-plus'
+import { ElTable, ElMessage, ElMessageBox, FormInstance } from 'element-plus'
 import { useAdminInfo } from '/@/stores/adminInfo'
 import { encrypt_aes, generateRandomNumber } from '/@/utils/crypto'
 import ControlPage from './control.vue'
@@ -680,6 +694,7 @@ import { ModelAttributeType } from '/@/views/backend/auth/model/type'
 import { theoreticalpowerCurveList } from '/@/api/backend/theoreticalpowerCurve/request'
 import CustomUpload from '/@/components/upload/index.vue'
 import { permission } from '/@/utils/directive'
+import { enumListQuery } from '/@/api/backend/Enumeration/request'
 const vPermission = permission()
 
 const adminInfo = useAdminInfo()
@@ -785,10 +800,26 @@ const defaultEquipmentProps = {
     children: 'equipChildren',
 }
 
+const belongLineList = ref<{ value: string;id:string }[]>([])
+const belongprojectList = ref<{ value: string;id:string }[]>([])
+const getEnumList = () => {
+    enumListQuery({ enumTypeId: '1872545505561620482' }).then((res) => {
+        belongprojectList.value = res.data.rows.map((item: { description: string; id: string }) => {
+            return { id: item.id, value: item.description }
+        })
+    })
+    enumListQuery({ enumTypeId: '1872549920439873537' }).then((res) => {
+        belongLineList.value = res.data.rows.map((item: { description: string; id: string }) => {
+            return { id: item.id, value: item.description }
+        })
+    })
+}
+
 onMounted(() => {
     equipTypeList()
     equipOrgList()
     equipOrgBelonging()
+    getEnumList()
 })
 
 const formQuery = reactive({
@@ -1234,6 +1265,7 @@ const originDeviceData: any = {
     orgId: '',
     parentEquipmentId: '',
     iotModelId: '',
+    belongProject: '',
     belongLine: '',
     standard: 0,
     nominalCapacity: '',
@@ -1340,9 +1372,10 @@ const saveDeviceData = () => {
         }
     })
 }
-const beforeCloseType10002Dialog = (done: () => void) =>{
-    if (addImgList.value.length) {
-        ElMessageBox.confirm('上传图片未保存，确认取消？', '', {
+const beforeCloseType10002Dialog = (done: () => void) => {
+    if (addImgList.value.length || delImgState.value) {
+        const title = delImgState.value ? '删除图片未保存，确认取消？' : '上传图片未保存，确认取消？'
+        ElMessageBox.confirm(title, '', {
             confirmButtonText: '确认',
             cancelButtonText: '取消',
             type: 'warning',
@@ -1351,6 +1384,7 @@ const beforeCloseType10002Dialog = (done: () => void) =>{
                 done()
                 addImgList.value = []
                 imgList.value = []
+                delImgState.value = false
             })
             .catch(() => {})
     } else {
@@ -1359,8 +1393,9 @@ const beforeCloseType10002Dialog = (done: () => void) =>{
     }
 }
 const cancelType10002Dialog = () => {
-    if (addImgList.value.length) {
-        ElMessageBox.confirm('上传图片未保存，确认取消？', '', {
+    if (addImgList.value.length || delImgState.value) {
+        const title = delImgState.value ? '删除图片未保存，确认取消？' : '上传图片未保存，确认取消？'
+        ElMessageBox.confirm(title, '', {
             confirmButtonText: '确认',
             cancelButtonText: '取消',
             type: 'warning',
@@ -1369,6 +1404,7 @@ const cancelType10002Dialog = () => {
                 type10002DialogVisible.value = false
                 addImgList.value = []
                 imgList.value = []
+                delImgState.value = false
             })
             .catch(() => {})
     } else {
@@ -1425,7 +1461,7 @@ const attachmentDialogVisible = ref(false)
 const attachmentDialogTitle = ref('风机详细信息')
 
 const customUploadRef = ref()
-const uploadAttachmentLoading =ref(false)
+const uploadAttachmentLoading = ref(false)
 const uploadAttachment = (files: FileList) => {
     uploadAttachmentLoading.value = true
     const formData = new FormData()
@@ -1435,7 +1471,7 @@ const uploadAttachment = (files: FileList) => {
     const v = generateRandomNumber(16)
     return uploadOtherParamsFileReq(formData, v).then((res) => {
         customUploadRef.value?.clearFiles()
-        res.data.forEach((item:{ name:string, url:string})=>{
+        res.data.forEach((item: { name: string; url: string }) => {
             addImgList.value.push({
                 name: item.name,
                 url: item.url,
@@ -1461,14 +1497,19 @@ const openAttachment = (type: string) => {
     const list = otherParamsForm.sysEquipmentDocsList.filter((item: { component: string; name: string; url: string }) => {
         return item.component === type
     })
-    if (list.length) {
-        previewImg(list)
+    const addList = addImgList.value.filter((item: { component: string }) => {
+        return item.component === type
+    })
+    const allList = [...list, ...addList]
+    if (allList.length) {
+        previewImg(allList)
     } else {
         imgList.value = []
     }
 }
 const reg = /\/thumbnailPic\//
 const hasPathReg = /\/api\/equipment\/file\/read\?path=/
+const readImgAddPath = '/api/equipment/file/read?path='
 const previewImg = (list: { url: string }[]) => {
     const picList: any = []
     for (let item of list) {
@@ -1477,7 +1518,7 @@ const previewImg = (list: { url: string }[]) => {
             continue
         }
         if (reg.test(item.url)) {
-            picList.push({ url: '/api/equipment/file/read?path=' + item.url })
+            picList.push({ url: readImgAddPath + item.url })
         }
     }
     imgList.value = picList
@@ -1495,7 +1536,29 @@ const previewImgIndex = ref(0)
 const changeImgIndex = (index: number) => {
     previewImgIndex.value = index
 }
-
+const delImgState = ref(false)
+const delImg = (imgData: { url: string }) => {
+    imgList.value.splice(previewImgIndex.value, 1)
+    const hasThumbnailPicOnImgList = otherParamsForm.sysEquipmentDocsList.findIndex(
+        (item: { url: string }) => readImgAddPath + item.url === imgData.url
+    )
+    if (hasThumbnailPicOnImgList !== -1) {
+        otherParamsForm.sysEquipmentDocsList.splice(hasThumbnailPicOnImgList, 1)
+        const originPic = otherParamsForm.sysEquipmentDocsList.findIndex(
+            (item: { url: string }) => readImgAddPath + item.url === imgData.url.replace(/\/thumbnailPic\//, '/pic/')
+        )
+        otherParamsForm.sysEquipmentDocsList.splice(originPic, 1)
+        delImgState.value = true
+    }
+    const hasThumbnailPicOnAddImgList = addImgList.value.findIndex((item: { url: string }) => readImgAddPath + item.url === imgData.url)
+    if (hasThumbnailPicOnAddImgList !== -1) {
+        addImgList.value.splice(hasThumbnailPicOnImgList, 1)
+        const originPic = addImgList.value.findIndex(
+            (item: { url: string }) => readImgAddPath + item.url === imgData.url.replace(/\/thumbnailPic\//, '/pic/')
+        )
+        addImgList.value.splice(originPic, 1)
+    }
+}
 </script>
 
 <style scoped lang="scss">
@@ -1632,11 +1695,30 @@ $paginationHeight: 32px;
         width: 100%;
         height: 305px;
         .imgContainer {
+            position: relative;
             display: flex;
             justify-content: center;
             align-items: center;
             width: 100%;
             height: 100%;
+            &:hover {
+                .delImg {
+                    opacity: 1;
+                }
+            }
+            .delImg {
+                position: absolute;
+                right: 0;
+                top: 0;
+                width: 20px;
+                height: 20px;
+                opacity: 0;
+                transition: opacity 0.3s;
+                .el-button {
+                    width: 100%;
+                    height: 100%;
+                }
+            }
         }
     }
 }

From fb4fee62f57044e1e233fb1e21a7cdb84ebc1339 Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Fri, 27 Dec 2024 16:20:00 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/dashboard.vue | 6 +++---
 ui/dasadmin/src/views/backend/home/home.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index 0e830ae8..d7c38d14 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -38,7 +38,7 @@
 
                                     <div class="small-value">
                                         <span class="content-number">{{realData.attributeMap.windfarmdayprodenergy}}</span>
-                                        <span>MWh</span>
+                                        <span>万kWh</span>
                                     </div>
                                     <div class="small-title">日发电量</div>
                                 </div>
@@ -48,7 +48,7 @@
 
                                     <div class="small-value">
                                         <span class="content-number">{{realData.attributeMap.windfarmmonthprodenergy}}</span>
-                                        <span>MWh</span>
+                                        <span>万kWh</span>
                                     </div>
                                     <div class="small-title">本月发电量</div>
                                 </div>
@@ -58,7 +58,7 @@
 
                                     <div class="small-value">
                                         <span class="content-number">{{realData.attributeMap.windfarmyearprodenergy}}</span>
-                                        <span>MWh</span>
+                                        <span>万kWh</span>
                                     </div>
                                     <div class="small-title">年发电量</div>
                                 </div>
diff --git a/ui/dasadmin/src/views/backend/home/home.vue b/ui/dasadmin/src/views/backend/home/home.vue
index 61ab69de..af88c841 100644
--- a/ui/dasadmin/src/views/backend/home/home.vue
+++ b/ui/dasadmin/src/views/backend/home/home.vue
@@ -21,9 +21,9 @@
                                             <div class="small-base">平均风速:<span>{{ realData.attributeMap.windfarmavgwindspeed}}m/s</span></div>
                                             <div class="small-base">实时有功:<span>{{ realData.attributeMap.windfarmactivepower}}kW</span></div>
                                             <div class="small-base">实时无功:<span>{{ realData.attributeMap.windfarmreactivepower}}kVar</span></div>
-                                            <div class="small-base">日发电量:<span>{{ realData.attributeMap.windfarmdayprodenergy}}MWh</span></div>
-                                            <div class="small-base">月发电量:<span>{{ realData.attributeMap.windfarmmonthprodenergy}}MWh</span></div>
-                                            <div style="padding: 0;" class="small-base">年发电量:<span>{{ realData.attributeMap.windfarmyearprodenergy}}MWh</span></div>
+                                            <div class="small-base">日发电量:<span>{{ realData.attributeMap.windfarmdayprodenergy}}万kWh</span></div>
+                                            <div class="small-base">月发电量:<span>{{ realData.attributeMap.windfarmmonthprodenergy}}万kWh</span></div>
+                                            <div style="padding: 0;" class="small-base">年发电量:<span>{{ realData.attributeMap.windfarmyearprodenergy}}万kWh</span></div>
                                         </div>
                                         <div class="overviewItem" style="border: none;">
                                             <div class="small-base"><i class="powerprod"></i>并网:<span>{{ realData.attributeMap.turbinecountpowerprod}}台</span></div>

From 648f42a11d6d84bfb0f2b74f22bf3e3e16ee4f78 Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Fri, 27 Dec 2024 16:56:26 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E8=8E=B7=E5=8F=96=E6=89=80=E5=B1=9E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/home/home.vue | 24 ++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/home/home.vue b/ui/dasadmin/src/views/backend/home/home.vue
index af88c841..aa845e02 100644
--- a/ui/dasadmin/src/views/backend/home/home.vue
+++ b/ui/dasadmin/src/views/backend/home/home.vue
@@ -9,9 +9,10 @@
                             <div class="cardLabel">风机矩阵</div>
                             <div class="cardBtn">
                                 <el-radio-group v-model="overviewSlotData" @change="changeUpdate">
-                                    <el-radio value="">全部</el-radio>
+                                    <el-radio v-for="item in belongprojectList" :value="item.value">{{ item.name }}</el-radio>
+<!--                                    <el-radio value="">全部</el-radio>
                                     <el-radio value="一期">一期</el-radio>
-                                    <el-radio value="二期">二期</el-radio>
+                                    <el-radio value="二期">二期</el-radio>-->
                                 </el-radio-group>
                             </div>
                             <div class="headerRight">
@@ -52,14 +53,14 @@ import {  onMounted, reactive, ref, onUnmounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import WindContent from '/@/views/backend/home/windMatrixpage.vue'
 import { getWindFarmRealData, getWindTurbineMatrixData } from '/@/api/backend/dashboard.ts'
-import { dayjs, ElMessage, ElMessageBox, TableInstance } from 'element-plus'
-import { getRealTimeState,malFunctionKeys } from '/@/views/backend/equipment/airBlower/utils.ts'
+import { ElMessage, TableInstance } from 'element-plus'
+import { getRealTimeState } from '/@/views/backend/equipment/airBlower/utils.ts'
 import { useRoute } from 'vue-router'
 import { getParamList } from '/@/api/backend/SystemParam/request'
-import { queryfaultCodeDict } from '/@/api/backend/theoreticalpowerCurve/request'
 import { useEnumStore } from '/@/stores/enums'
 import { useFaultsStore } from '/@/stores/faults'
 import {equipList} from "/@/api/backend/realData/request";
+import { enumListQuery } from '/@/api/backend/Enumeration/request'
 
 
 const route = useRoute()
@@ -73,6 +74,18 @@ let myTable = ref<TableInstance>()
 
 const overviewSlotData= ref('')
 
+const belongprojectList = ref<{ value: string;name:string }[]>([
+    { value: '',name:'全部' },
+])
+
+const getEnumList = () => {
+    enumListQuery({ enumTypeId: '1872545505561620482' }).then((res) => {
+         res.data.rows.map((item: { description: string; value: string }) => {
+             belongprojectList.value.push({ value: item.description, name: item.description })
+        })
+    })
+}
+
 const realData = ref({
     windFarmId: '',
     attributeMap: {},
@@ -397,6 +410,7 @@ const sizeChange = () => {
 }
 
 onMounted(() => {
+    getEnumList()
     getList()
     window.addEventListener('resize', sizeChange)
     sizeChange()

From f8279e4b529c9126b0d4b255d780cac93172b463 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 27 Dec 2024 17:01:33 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/admin/controller/LoggerController.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/das/src/main/java/com/das/modules/admin/controller/LoggerController.java b/das/src/main/java/com/das/modules/admin/controller/LoggerController.java
index 32edcfa6..cf41ce9a 100644
--- a/das/src/main/java/com/das/modules/admin/controller/LoggerController.java
+++ b/das/src/main/java/com/das/modules/admin/controller/LoggerController.java
@@ -1,5 +1,6 @@
 package com.das.modules.admin.controller;
 
+import com.das.common.result.R;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -21,13 +22,13 @@ public class LoggerController {
      * @return 当前所有日志级别
      */
     @GetMapping("/list")
-    public Map<String, String> listLogLevels() {
+    public R<Map<String, String>> listLogLevels() {
         LoggerContext context = (LoggerContext) LogManager.getContext(false);
-        return context.getConfiguration().getLoggers().values().stream()
+        return R.success(context.getConfiguration().getLoggers().values().stream()
                 .collect(Collectors.toMap(
                         LoggerConfig::getName,
                         loggerConfig -> loggerConfig.getLevel().toString()
-                ));
+                )));
     }
 
     /**
@@ -38,14 +39,14 @@ public class LoggerController {
      * @return 更新结果
      */
     @PostMapping("/update")
-    public String updateLogLevel(String loggerName, String level) {
+    public R<String> updateLogLevel(String loggerName, String level) {
         try {
             Configurator.setLevel(loggerName, org.apache.logging.log4j.Level.valueOf(level.toUpperCase()));
             logger.info("Updated logger [{}] to level [{}]", loggerName, level);
-            return String.format("Logger [%s] updated to level [%s]", loggerName, level);
+            return R.success( String.format("Logger [%s] updated to level [%s]", loggerName, level));
         } catch (IllegalArgumentException e) {
             logger.error("Invalid log level [{}]", level, e);
-            return String.format("Invalid log level [%s]. Valid levels: TRACE, DEBUG, INFO, WARN, ERROR, FATAL.", level);
+            return R.fail(String.format("Invalid log level [%s]. Valid levels: TRACE, DEBUG, INFO, WARN, ERROR, FATAL.", level));
         }
     }
 }
\ No newline at end of file