Merge remote-tracking branch 'remotes/origin/master'

# Conflicts:
#	04.系统编码/Frontend/src/components/RamanLidar.vue

04.系统编码/Frontend/src/components/DecisionSupport.vue

@@ -68,6 +68,15 @@
                             </template>
                         </el-image>
                     </div>
+                    <div class="instruction">
+                        <h2>高楼污染指数说明：</h2>
+                        <p>使用激光雷达数据反演PM2.5和PM10</p>
+                        <p>浓度廓线，基于PM2.5和PM10的平均</p>
+                        <p>值构建高楼污染指数，</p>
+                        <p> 高楼(60米)，</p>
+                        <p> 超高楼(200米)，</p>
+                        <p> 极高楼层(500米)</p>
+                    </div>
                 </div>
             </div>
         </div>
@@ -240,7 +249,7 @@ import { post } from '../uilts/axios';
                 }
                 .picture-block {
                     display: flex;
-                    align-items: center;
+                    align-items: end;
                     justify-content: center;
                 }
                 .picture {
@@ -248,15 +257,31 @@ import { post } from '../uilts/axios';
                     height: auto;
                     display: block;
                     .el-image {
-                        width:100%;
+                        width: 100%;
                         height: auto;
                         margin: 0 auto;
+                        :deep(.el-image__inner) {
+                            max-width: 99%;
+                            border: 1px solid #707070;
+                        }
                     }
 
                     &:last-of-type {
                         width: 6.44rem;
                     }
                 }
+                .instruction {
+                    margin-left: 0.4rem;
+                    color: #222222;
+
+                    h2 {
+                        font-size: 0.16rem;
+                    }
+
+                    p {
+                        margin-top: 0.15rem;
+                    }
+                }
             }
         }
     }

04.系统编码/Frontend/src/components/MicrowaveRadiation.vue

@@ -533,7 +533,7 @@
                         options.index = 0;
 
                     setCurrentPlayElement(element);
-                }, 5000)
+                }, 3000)
             }
 
             const clearTimer = () => {

04.系统编码/Frontend/src/components/RamanLidar.vue

@@ -50,9 +50,9 @@
             <div class="picture-view">
                 <span class="arrow arrow-prev" @click="onPrevImgClick"><img src="/images/prev-btn.png" /></span>
                 <span class="arrow arrow-next" @click="onNextImgClick"><img src="/images/next-btn.png" /></span>
-                <span class="save-btn" @click="onSaveClick" v-if="currentElement === 'PBLH'"><img src="/images/save.png" /></span>
-                <a :href="downloadImgUrl" download class="save-btn" v-else><img src="/images/save.png" /></a>
-                <div class="download-pictures" id="pictures" v-if="currentElement === 'PBLH'">
+                <!-- <span class="save-btn" @click="onSaveClick" v-if="currentElement === 'PBLH'"><img src="/images/save.png" /></span> -->
+                <a :href="downloadImgUrl" download class="save-btn" v-if="currentElement !== 'PBLH'"><img src="/images/save.png" /></a>
+                <div class="download-pictures hide" id="pictures">
                     <a v-for="(url, index) in urls" :key="index" download></a>
                 </div>
                 <div class="picture-container raman-picture-container">
@@ -348,7 +348,7 @@
                         options.index = 0;
 
                     setCurrentPlayElement(element);
-                }, 5000)
+                }, 3000)
             }
 
             const clearTimer = () => {
@@ -378,7 +378,7 @@
 
             const onSaveClick = () => {
                 let pictures = document.getElementById('pictures');
-                options.urls = [options.signalPBLHImgUrl, options.imgUrl];
+                options.urls = [options.imgUrl, options.signalPBLHImgUrl];
 
                 for (let i = 0; i < options.urls.length; i++) {
                     let img = new Image();

04.系统编码/Frontend/src/components/SynergyEvaluation.vue

@@ -55,7 +55,7 @@
                 <a v-for="(url, index) in urls" :key="index" download></a>
             </div>
             <div class="element-select" v-if="currentTab === 'element-change-trend' || currentTab === 'element-monitor'">
-                <div class="surface-temperature" v-if="currentTab === 'element-change-trend'">
+                <div class="surface-temperature" v-if="currentTab === 'element-change-trend' && currentCategory === 'LST'">
                     <span @click="onSurfaceTemperatureClick('time0130')" :class="{'active': currentSurfaceTemperatureTime === 'time0130'}">地表温度（01:30）</span>
                     <span @click="onSurfaceTemperatureClick('time1030')" :class="{'active': currentSurfaceTemperatureTime === 'time1030'}">地表温度（10:30）</span>
                     <span @click="onSurfaceTemperatureClick('time1330')" :class="{'active': currentSurfaceTemperatureTime === 'time1330'}">地表温度（13:30）</span>
@@ -109,7 +109,7 @@
                     </el-col>
                 </el-row>
             </div>
-            <div class="picture-view multi-picture-view" v-if="currentTab === 'element-change-trend' || currentTab === 'element-monitor'">
+            <div class="picture-view multi-picture-view" v-if="currentTab === 'element-change-trend' || currentTab === 'element-monitor'" :style="{'marginTop': currentTab === 'element-change-trend' && currentCategory !== 'LST' ? 'calc(0.34rem + 2px)' : 0}">
                 <el-row :gutter="0">
                     <el-col :span="4" v-for="(item, index) in trendItems" :key="index">
                         <el-image