update

meas-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@ spring:
     druid:
       # 主库数据源
       master:
-#        url: jdbc:mysql://101.126.133.7:9006/meas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: root
-#        password: 404cf3eae29df38f
-        url: jdbc:mysql://127.0.0.1:3306/meas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://101.126.133.7:9006/meas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: 404cf3eae29df38f
+#        url: jdbc:mysql://127.0.0.1:3306/meas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: root
+#        password: 123456
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

meas-admin/src/main/resources/application.yml

@@ -68,14 +68,14 @@ spring:
   # redis 配置
   redis:
     # 地址 101.126.133.7
-#    host: 101.126.133.7
-    host: 127.0.0.1
+    host: 101.126.133.7
+#    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码 Z;G4AS:Vor'YF#p?
-    password:
+    password: Z;G4AS:Vor'YF#p?
     # 连接超时时间
     timeout: 10s
     lettuce:

meas_web/src/views/meas/env/data.vue

@@ -4,12 +4,11 @@
       <el-row>
         <el-form-item label="对比数据选择" label-width="120px">
           <el-radio-group v-model="contrastType">
-            <el-radio :label="1">光谱辐射处理后目标3~5</el-radio>
-            <el-radio :label="2">光谱辐射处理后目标8~14</el-radio>
-            <el-radio :label="3">光谱辐射计算后数据3~5</el-radio>
-            <el-radio :label="4">光谱辐射计算后数据8~14</el-radio>
-            <el-radio :label="5">透过率曲线3~5</el-radio>
-            <el-radio :label="6">透过率曲线8~14</el-radio>
+            <el-radio :label="1">中波光谱辐射强度</el-radio>
+            <el-radio :label="2">长波光谱辐射强度</el-radio>
+            <el-radio :label="5">中波透过率曲线</el-radio>
+            <el-radio :label="6">长波透过率曲线</el-radio>
+            <el-radio :label="7">角度辐射强度</el-radio>
           </el-radio-group>
         </el-form-item>
         <div class="mod-bd" style="float: right;padding-bottom: 10px;">
@@ -218,7 +217,7 @@ export default {
       var num = this.envDataRightList.length;
       this.envDataList.forEach((item) => {
         if (this.ids.includes(item.id) && !ids.includes(item.id)) {
-          num = Number(num) + 1; 
+          num = Number(num) + 1;
         }
       })
       if(num <= 20){