From 38379d9638fe40e62aae64a14c83f0de8c88fa11 Mon Sep 17 00:00:00 2001
From: Smile-Xin <13622060635@163.com>
Date: Sat, 8 Feb 2025 17:31:26 +0800
Subject: [PATCH] 2.08

---
 ui/dasadmin/.env.development                  |  1 +
 .../src/views/backend/home/windMatrixpage.vue |  7 ++-
 .../src/views/backend/report/SingleReport.vue | 57 ++++++++++---------
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/ui/dasadmin/.env.development b/ui/dasadmin/.env.development
index 0349de0f..557a688e 100644
--- a/ui/dasadmin/.env.development
+++ b/ui/dasadmin/.env.development
@@ -8,6 +8,7 @@ VITE_BASE_PATH = './'
 # 本地
 #  VITE_APP_PROXY=[["/api","http://192.168.130.22:8080/api"]]
 # 线上
+  # VITE_APP_PROXY=[["/api","https://192.168.151.18:6379/api"]]
   VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]]
   
 
diff --git a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue
index 2738c424..e61bb5e2 100644
--- a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue
+++ b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue
@@ -443,7 +443,11 @@ const getSafeImagePath = (item, type) => {
 }
 .wind-default {
     background-image: linear-gradient(180deg, #f0f6ff 0%, #ffffff 50%);
-    border: 1px solid #e1edf6;
+    border: 1px solid #ffffff;
+    // border: 1px solid #e1edf6;
+    opacity: 1;
+    background: transparent;
+
 }
 .wind-offline {
     background-image: linear-gradient(180deg, #dddddd 0%, #ffffff 93%);
@@ -475,6 +479,7 @@ const getSafeImagePath = (item, type) => {
         display: flex;
         box-sizing: border-box;
         width: 170px;
+        // width: 170px;
         height: 110px;
         margin-top: 8px;
         margin-bottom: 8px;
diff --git a/ui/dasadmin/src/views/backend/report/SingleReport.vue b/ui/dasadmin/src/views/backend/report/SingleReport.vue
index c27cb0e0..1048bc2f 100644
--- a/ui/dasadmin/src/views/backend/report/SingleReport.vue
+++ b/ui/dasadmin/src/views/backend/report/SingleReport.vue
@@ -2,7 +2,32 @@
     <div class="report" style="width: 100%; height: 100%">
         <div class="topForm">
             <div class="forms">
-                <el-space>
+                <div>
+                    <el-space style="margin-top: 10px">
+                        <div style="min-width: 30px">模板</div>
+                        <el-select v-model="template" placeholder="请选择模板" class="templateSelect commonSelect">
+                            <el-option v-for="v in reportTemplateList" :key="v.value" :label="v.label" :value="v.value" @click="changeTemplate">
+                                <template #default>
+                                    <div class="tamplateOption">
+                                        <span>{{ v.label }}</span>
+                                        <el-icon style="color: red" @click="delReportTemplate(v.value)">
+                                            <Delete />
+                                        </el-icon>
+                                    </div>
+                                </template>
+                            </el-option>
+                        </el-select>
+                        <div style="width: 20px"></div>
+                        <!-- <div>{{ t('statAnalysis.attributes') }}</div>
+                                <el-input
+                                    style="width: 200px; height: 40px"
+                                    v-model="currentChoose"
+                                    :placeholder="'请选择' + t('statAnalysis.attributes')"
+                                ></el-input>
+                                <el-button type="primary" size="small" :icon="Plus" circle @click="chooseMeasurePoint"> </el-button> -->
+                    </el-space>
+                </div>
+                <el-space class="parameters">
                     <div style="min-width: 30px">{{ t('statAnalysis.deviceId') }}</div>
                     <el-select
                         v-model="windBlowerValue"
@@ -40,31 +65,7 @@
                         <el-option v-for="v in calFunctions" :key="v.value" :label="v.label" :value="v.value"></el-option>
                     </el-select>
                 </el-space>
-                <div>
-                    <el-space style="margin-top: 10px">
-                        <div style="min-width: 30px">模板</div>
-                        <el-select v-model="template" placeholder="请选择模板" class="templateSelect commonSelect">
-                            <el-option v-for="v in reportTemplateList" :key="v.value" :label="v.label" :value="v.value" @click="changeTemplate">
-                                <template #default>
-                                    <div class="tamplateOption">
-                                        <span>{{ v.label }}</span>
-                                        <el-icon style="color: red" @click="delReportTemplate(v.value)">
-                                            <Delete />
-                                        </el-icon>
-                                    </div>
-                                </template>
-                            </el-option>
-                        </el-select>
-                        <div style="width: 20px"></div>
-                        <!-- <div>{{ t('statAnalysis.attributes') }}</div>
-                                <el-input
-                                    style="width: 200px; height: 40px"
-                                    v-model="currentChoose"
-                                    :placeholder="'请选择' + t('statAnalysis.attributes')"
-                                ></el-input>
-                                <el-button type="primary" size="small" :icon="Plus" circle @click="chooseMeasurePoint"> </el-button> -->
-                    </el-space>
-                </div>
+                
             </div>
             <div class="buttons">
                 <el-button class="button" :icon="Search" @click="queryHistoryData" type="primary">查询</el-button>
@@ -689,4 +690,8 @@ onMounted(() => {
     align-items: center;
     justify-content: space-between;
 }
+.parameters{
+
+}
+
 </style>