xusl 1 năm trước cách đây
mục cha
commit
5d2fabaebc

BIN
ipfcst/ipfcst-console/src/main/frontend/assets/login-null.jpg


BIN
ipfcst/ipfcst-console/src/main/frontend/assets/login.jpg


BIN
ipfcst/ipfcst-console/src/main/frontend/assets/login_zh.jpg


BIN
ipfcst/ipfcst-console/src/main/frontend/assets/logo.png


+ 1 - 15
ipfcst/ipfcst-console/src/main/frontend/views/login/index.vue

@@ -97,21 +97,7 @@
     },
     methods: {
       changeLoginPage() {
-        this.$axios.get('/consoleVersion/gs/').then(resp => {
-          this.tableLoading = false
-          if (resp && resp.code === 0) {
-            var data = resp.data
-            if(data === '0'){
-              // 嘉越登陆页
-              this.login_bg_style.backgroundImage = 'url(' + require('../../assets/login.jpg') + ')'
-            }
-            if(data === '1'){
-              // 广州兆和登陆页
-              this.login_bg_style.backgroundImage = 'url(' + require('../../assets/login_zh.jpg') + ')'
-            }
-          }
-        })
-
+        this.login_bg_style.backgroundImage = 'url(' + require('../../assets/login-null.jpg') + ')'
       },
       showPwd() {
         if (this.passwordType === 'password') {

+ 1 - 1
ipfcst/ipfcst-console/src/main/resources/application.yml

@@ -25,7 +25,7 @@ spring:
       # 数据源配置
       username: root
       password: '!QAZ2root'
-      url: jdbc:mysql://localhost:3306/ipfcst-v3?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://192.168.1.205:3306/ipfcst-znzx2?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
       driver-class-name: com.mysql.cj.jdbc.Driver
       # 初始化 最小 最大
       initial-size: 10

+ 1 - 1
ipfcst/ipfcst-console/vue.config.js

@@ -27,7 +27,7 @@ module.exports = {
   publicPath: './',
   outputDir: 'dist',
   assetsDir: 'assets',
-  lintOnSave: process.env.NODE_ENV === 'development',
+  lintOnSave: false,
   productionSourceMap: false,
   pages: {
     index: {

BIN
ipfcst/ipfcst-reportquery/src/main/frontend/assets/login.jpg


BIN
ipfcst/ipfcst-reportquery/src/main/frontend/assets/login_bg.jpg


BIN
ipfcst/ipfcst-reportquery/src/main/frontend/assets/login_zh.jpg


BIN
ipfcst/ipfcst-reportquery/src/main/frontend/assets/logo.png


+ 12 - 0
ipfcst/ipfcst-reportquery/src/main/frontend/views/datav/bottomEcharts.vue

@@ -1,7 +1,17 @@
 <template>
   <div>
+  <el-select v-model="efiType" placeholder="请选择类型" @change="changeStationCode">
+    <el-option
+      v-for="item in efiTypeList"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value">
+    </el-option>
+  </el-select>
+  <div>
     <div id="charts"/>
   </div>
+  </div>
 </template>
 
 <script>
@@ -11,6 +21,8 @@ export default {
   name: 'Rightbotton',
   data() {
     return {
+      efiType:'E1',
+      efiTypeList: [{value: 'E1', label: '光伏'}, {value: 'E2', label: '风电'}],
       timer: '',
       time: [],
       chart: null,

+ 115 - 122
ipfcst/ipfcst-reportquery/src/main/frontend/views/datav/index.vue

@@ -5,29 +5,29 @@
       <el-row style="width: 100%">
         <el-col :span="6">
           <div style="text-align: center">
-            <span class="elname">{{ this.elName }}</span>
+            <span class="elname"></span>
           </div>
         </el-col>
         <el-col :span="3.5">
           <div style="display: flex;justify-content: space-around;padding-top: 2.5%">
             <div class="myswitch">
-              <el-switch
-                v-model="sign"
-                class="switchStyle"
-                style="margin-left:20px;"
-                active-text="限电"
-                active-color="red"
-                active-value="1"
-                inactive-text="不限电"
-                inactive-value="0"
-                inactive-color="#40E0D0"
-                @change="saveXD"
-              />
+              <!--              <el-switch-->
+              <!--                v-model="sign"-->
+              <!--                class="switchStyle"-->
+              <!--                style="margin-left:20px;"-->
+              <!--                active-text="限电"-->
+              <!--                active-color="red"-->
+              <!--                active-value="1"-->
+              <!--                inactive-text="不限电"-->
+              <!--                inactive-value="0"-->
+              <!--                inactive-color="#40E0D0"-->
+              <!--                @change="saveXD"-->
+              <!--              />-->
             </div>
             <div class="qrcodeDiv">
-              <svg class="icon" aria-hidden="true" @click="openQrcodeDrawer">
-                <use xlink:href="#icon-erweima"></use>
-              </svg>
+              <!--              <svg class="icon" aria-hidden="true" @click="openQrcodeDrawer">-->
+              <!--                <use xlink:href="#icon-erweima"></use>-->
+              <!--              </svg>-->
               <!--<img src="./img/QRcode.png" width="40px" height="40px" style="cursor: pointer" @click="openQrcodeDrawer">-->
             </div>
           </div>
@@ -35,46 +35,39 @@
         <el-col :span="7">
           <div style="width:80%;margin-left: 5%">
             <dv-border-box-7 :color="['#0c71d4']"
-                             style="height: 50px;line-height: 25px; text-align:center;border-radius: 10px">
-              <span class="title-gl" style="color: #f4f4f5;font-size: 25px;font-family: 'mytext'"
-                    @click="changeConsole">
+                             style="text-align:center;border-radius: 10px">
+              <span style="color: #f4f4f5;font-size: 25px;font-family: 'mytext'">
                 功率预测数据平台
               </span>
-              <div style="display: flex;justify-content: space-evenly;font-size: 10px;color: #f4f4f5;">
-                <div>后台管理:{{ this.consoleVersion }}</div>
-                <div>统计查询:{{ this.reportVersion }}</div>
-                <div>系统监控:{{ this.monitorVersion }}</div>
-                <div>lib:{{ this.libVersion }}</div>
-              </div>
             </dv-border-box-7>
           </div>
         </el-col>
         <el-col :span="6">
           <div style="display: flex;justify-content: space-around;margin-top: 2.5%">
-            <div>
-              <audio muted ref="mySummaryAudio" :src="summaryAudioUrl"/>
-              <el-button class="waringbutt" size="small" @click="openDraw">
-                修改通道告警通知
-              </el-button>
-            </div>
-            <el-tooltip effect="dark" placement="bottom">
-              <div slot="content">{{isAbnormalInfo}}</div>
-              <el-button :class="statusFlag=='true'? 'barbutt' : 'waringbutt'" size="small" @click="equipmentInfo">
-                环境数据展示
-              </el-button>
-            </el-tooltip>
+            <!--            <div>-->
+            <!--              <audio muted ref="mySummaryAudio" :src="summaryAudioUrl"/>-->
+            <!--              <el-button class="waringbutt" size="small" @click="openDraw">-->
+            <!--                修改通道告警通知-->
+            <!--              </el-button>-->
+            <!--            </div>-->
+            <!--            <el-tooltip effect="dark" placement="bottom">-->
+            <!--              <div slot="content">{{isAbnormalInfo}}</div>-->
+            <!--              <el-button :class="statusFlag=='true'? 'barbutt' : 'waringbutt'" size="small" @click="equipmentInfo">-->
+            <!--                环境数据展示-->
+            <!--              </el-button>-->
+            <!--            </el-tooltip>-->
 
             <el-button class="waringbutt" size="small" @click="jump">
               后台数据展示
             </el-button>
-            <el-tooltip placement="bottom" content="扫码小程序" effect="dark" v-show="showAbout">
-              <el-button class="waringbutt" icon="el-icon-full-screen" circle size="small"
-                         @click="appletsDialogVisible=true"/>
-            </el-tooltip>
-            <el-tooltip placement="bottom" content="关于我们" effect="dark" v-show="showAbout">
-              <el-button class="waringbutt" icon="el-icon-s-custom" circle size="small"
-                         @click="aboutusDialogVisible=true"/>
-            </el-tooltip>
+            <!--            <el-tooltip placement="bottom" content="扫码小程序" effect="dark" v-show="showAbout">-->
+            <!--              <el-button class="waringbutt" icon="el-icon-full-screen" circle size="small"-->
+            <!--                         @click="appletsDialogVisible=true"/>-->
+            <!--            </el-tooltip>-->
+            <!--            <el-tooltip placement="bottom" content="关于我们" effect="dark" v-show="showAbout">-->
+            <!--              <el-button class="waringbutt" icon="el-icon-s-custom" circle size="small"-->
+            <!--                         @click="aboutusDialogVisible=true"/>-->
+            <!--            </el-tooltip>-->
           </div>
         </el-col>
       </el-row>
@@ -317,9 +310,9 @@
         aboutusDialogVisible: false,
         appletsDialogVisible: false,
         time: '',
-        sign: '0',
+        // sign: '0',
         value15: '0',
-        elName: '',
+        // elName: '',
         eqId: '',
         timer: '',
         qrtimer: '',
@@ -379,8 +372,8 @@
       this.daysRemainTimer = setInterval(this.getServiceExpirationDays, 1000 * 60 * 60)
       this.nowTime()
       this.nowTimer = setInterval(this.nowTime, 1000 * 60)
-      this.queryXD()
-      this.getVersion()
+      // this.queryXD()
+      // this.getVersion()
       this.init()
       this.getEl()
       this.test = setInterval(this.init, 60 * 1000)
@@ -415,14 +408,14 @@
         if (gs != "2") {
           this.showAbout = true
         }
-        Promise.all([this.getChannelStatus(), this.getChannelAlarmInfo()]).then((res) => {
+        Promise.all([this.getChannelStatus()]).then((res) => {
           this.analysisList = res[0].analysisList
           this.callBackList = res[0].callBackList
           this.dataexchangeList = res[0].dataexchangeList
           this.uploadList = res[0].uploadList
-          this.channelAlarmList = res[1]
+          // this.channelAlarmList = res[1]
           var data = []
-          var valueList = []
+          // var valueList = []
           if (this.analysisList.length > 0) {
             for (var i = 0; i < this.analysisList.length; i++) {
               if (this.analysisList[i].channelStatus === '0') {
@@ -479,42 +472,42 @@
             }
           }
 
-          for (var i = 0; i < this.channelAlarmList.length; i++) {
-            for (var j = 0; j < data.length; j++) {
-              if (data[j].id === this.channelAlarmList[i].channelId) {
-                valueList.push(data[j].key)
-              }
-            }
-          }
+          // for (var i = 0; i < this.channelAlarmList.length; i++) {
+          //   for (var j = 0; j < data.length; j++) {
+          //     if (data[j].id === this.channelAlarmList[i].channelId) {
+          //       valueList.push(data[j].key)
+          //     }
+          //   }
+          // }
           this.dataList = data
-          this.valueList = valueList
-          this.getLeftChannel()
-          this.getEnvirStatus()
+          // this.valueList = valueList
+          // this.getLeftChannel()
+          // this.getEnvirStatus()
         })
       },
-      getLeftChannel() {
-        var waringLeft = this.dataList
-        var waringRight = this.valueList
-        var temp = []
-        for (let i = 0; i < waringLeft.length; i++) {
-          var flag = true
-          a:for (let j = 0; j < waringRight.length; j++) {
-            var is = waringRight[j].indexOf('-')
-            var right = waringRight[j].substring((is + 1), (waringRight[j].length + 1))
-            if (waringLeft[i].id == right) {
-              flag = false
-              break a
-            }
-          }
-          if (flag) {
-            temp.push(waringLeft[i])
-            if (waringLeft[i].channelStatus == '0') {
-              this.summaryAudioClick()
-              break
-            }
-          }
-        }
-      },
+      // getLeftChannel() {
+      //   var waringLeft = this.dataList
+      //   var waringRight = this.valueList
+      //   var temp = []
+      //   for (let i = 0; i < waringLeft.length; i++) {
+      //     var flag = true
+      //     a:for (let j = 0; j < waringRight.length; j++) {
+      //       var is = waringRight[j].indexOf('-')
+      //       var right = waringRight[j].substring((is + 1), (waringRight[j].length + 1))
+      //       if (waringLeft[i].id == right) {
+      //         flag = false
+      //         break a
+      //       }
+      //     }
+      //     if (flag) {
+      //       temp.push(waringLeft[i])
+      //       if (waringLeft[i].channelStatus == '0') {
+      //         this.summaryAudioClick()
+      //         break
+      //       }
+      //     }
+      //   }
+      // },
       /*父给子通道信息*/
       toTunnelList(list, name) {
         this.onshow = true
@@ -591,34 +584,34 @@
           this.libVersion = res.data[0].libVersion
         })
       },
-      saveXD(val) {
-        var sign = 0
-        if (val === '1') {
-          sign = 1
-        }
-        var PowerLimitPlanSign = {
-          id: 1,
-          sign: sign
-        }
-        this.$axios.post('/dashboard/savePowerLimitPlanSign', PowerLimitPlanSign).then(res => {
-
-        }).catch((error) => {
-          this.$message.error('保存限电标识出错' + error)
-        })
-      },
-      queryXD() {
-        this.$axios.get('/dashboard/getPowerLimitPlanSign').then((res) => {
-          if (res.data.sign === 1) {
-            // 限电
-            this.sign = '1'
-          } else {
-            // 不限电
-            this.sign = '0'
-          }
-        }).catch((error) => {
-          this.$message.error('查询限电标识出错' + error)
-        })
-      },
+      // saveXD(val) {
+      //   var sign = 0
+      //   if (val === '1') {
+      //     sign = 1
+      //   }
+      //   var PowerLimitPlanSign = {
+      //     id: 1,
+      //     sign: sign
+      //   }
+      //   this.$axios.post('/dashboard/savePowerLimitPlanSign', PowerLimitPlanSign).then(res => {
+      //
+      //   }).catch((error) => {
+      //     this.$message.error('保存限电标识出错' + error)
+      //   })
+      // },
+      // queryXD() {
+      //   this.$axios.get('/dashboard/getPowerLimitPlanSign').then((res) => {
+      //     if (res.data.sign === 1) {
+      //       // 限电
+      //       this.sign = '1'
+      //     } else {
+      //       // 不限电
+      //       this.sign = '0'
+      //     }
+      //   }).catch((error) => {
+      //     this.$message.error('查询限电标识出错' + error)
+      //   })
+      // },
       equipmentInfo() {
         this.filterbg = true
         this.topup = true
@@ -650,15 +643,15 @@
       openDraw() {
         this.drawer = true
       },
-      openQrcodeDrawer() {
-        this.qrcodeDrawer = true
-        this.qrtimer = new Date().getTime()
-        this.url = ''
-      },
-      colseQrcode() {
-        this.qrcodeDrawer = false
-        this.url = '/aboutus.png'
-      },
+      // openQrcodeDrawer() {
+      //   this.qrcodeDrawer = true
+      //   this.qrtimer = new Date().getTime()
+      //   this.url = ''
+      // },
+      // colseQrcode() {
+      //   this.qrcodeDrawer = false
+      //   this.url = '/aboutus.png'
+      // },
       summaryAudioClick() {
         const that = this
         if (that.summaryAudioStatus == 'pause') {

+ 1 - 17
ipfcst/ipfcst-reportquery/src/main/frontend/views/login/index.vue

@@ -97,23 +97,7 @@ export default {
   },
   methods: {
     changeLoginPage() {
-      this.$store.dispatch("getGs").then(() => {
-        localStorage.setItem("gs",this.gs)
-        if(this.gs === '0'){
-          // 嘉越登陆页
-          this.login_bg_style.backgroundImage = 'url(' + require('../../assets/login.jpg') + ')'
-        }
-        if(this.gs === '1'){
-          // 广州兆和登陆页
-          this.login_bg_style.backgroundImage = 'url(' + require('../../assets/login_zh.jpg') + ')'
-        }
-        if(this.gs === '2'){
-          // 广州兆和登陆页
-          this.login_bg_style.backgroundImage = 'url(' + require('../../assets/login-null.jpg') + ')'
-        }
-      }).catch(()=>{
-        this.login_bg_style.backgroundImage = 'url(' + require('../../assets/login.jpg') + ')'
-      })
+      this.login_bg_style.backgroundImage = 'url(' + require('../../assets/login-null.jpg') + ')'
     },
     showPwd() {
       if (this.passwordType === 'password') {

+ 51 - 50
ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/DashboardService.java

@@ -386,41 +386,42 @@ public class DashboardService extends BaseService {
     // 拼装解析文件通道状态
     Long time = new Date().getTime();
     List<FileAnalysisRecord> fileAnalysisRecordList = fileAnalysisRecordRepository.findByCreateTimeBetween(DateTimeUtil.getDayStartTime(time), DateTimeUtil.getDayLastTime(time));
-    // 过滤出短期成功的
-    List<FileAnalysisRecord> dqList = fileAnalysisRecordList.stream().filter(w -> "DQ".equals(w.getFileType())).collect(Collectors.toList());
-    String dqStatus = "0";
-    String dqTips = "";
-    if (dqList.size() > 0) {
-      dqList.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
-      dqStatus = dqList.get(0).getFileStatus();
-      dqTips = "最后解析短期时间:" + DateFormatUtils.format(dqList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
-    } else {
-      dqTips = "今日未解析过短期文件";
-    }
     List<ChannelStatusDto> analysisList = new ArrayList<>();
-    ChannelStatusDto dqAnalysisDto = new ChannelStatusDto();
-    dqAnalysisDto.setChannelId("DQ");
-    dqAnalysisDto.setChannelName("短期文件");
-    dqAnalysisDto.setChannelStatus(dqStatus);
-    dqAnalysisDto.setTips(dqTips);
-    analysisList.add(dqAnalysisDto);
-
-    List<FileAnalysisRecord> nwpList = fileAnalysisRecordList.stream().filter(w -> "NWP".equals(w.getFileType())).collect(Collectors.toList());
-    String nwpStatus = "0";
-    String nwpTips = "";
-    if (nwpList.size() > 0) {
-      nwpList.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
-      nwpStatus = nwpList.get(0).getFileStatus();
-      nwpTips = "最后解析NWP时间:" + DateFormatUtils.format(nwpList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
-    } else {
-      nwpTips = "今日未解析过NWP文件";
-    }
-    ChannelStatusDto nwpAnalysisDto = new ChannelStatusDto();
-    nwpAnalysisDto.setChannelId("NWP");
-    nwpAnalysisDto.setChannelName("NWP文件");
-    nwpAnalysisDto.setChannelStatus(nwpStatus);
-    nwpAnalysisDto.setTips(nwpTips);
-    analysisList.add(nwpAnalysisDto);
+    // 过滤出短期成功的
+//    List<FileAnalysisRecord> dqList = fileAnalysisRecordList.stream().filter(w -> "DQ".equals(w.getFileType())).collect(Collectors.toList());
+//    String dqStatus = "0";
+//    String dqTips = "";
+//    if (dqList.size() > 0) {
+//      dqList.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
+//      dqStatus = dqList.get(0).getFileStatus();
+//      dqTips = "最后解析短期时间:" + DateFormatUtils.format(dqList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+//    } else {
+//      dqTips = "今日未解析过短期文件";
+//    }
+//    List<ChannelStatusDto> analysisList = new ArrayList<>();
+//    ChannelStatusDto dqAnalysisDto = new ChannelStatusDto();
+//    dqAnalysisDto.setChannelId("DQ");
+//    dqAnalysisDto.setChannelName("短期文件");
+//    dqAnalysisDto.setChannelStatus(dqStatus);
+//    dqAnalysisDto.setTips(dqTips);
+//    analysisList.add(dqAnalysisDto);
+//
+//    List<FileAnalysisRecord> nwpList = fileAnalysisRecordList.stream().filter(w -> "NWP".equals(w.getFileType())).collect(Collectors.toList());
+//    String nwpStatus = "0";
+//    String nwpTips = "";
+//    if (nwpList.size() > 0) {
+//      nwpList.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
+//      nwpStatus = nwpList.get(0).getFileStatus();
+//      nwpTips = "最后解析NWP时间:" + DateFormatUtils.format(nwpList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+//    } else {
+//      nwpTips = "今日未解析过NWP文件";
+//    }
+//    ChannelStatusDto nwpAnalysisDto = new ChannelStatusDto();
+//    nwpAnalysisDto.setChannelId("NWP");
+//    nwpAnalysisDto.setChannelName("NWP文件");
+//    nwpAnalysisDto.setChannelStatus(nwpStatus);
+//    nwpAnalysisDto.setTips(nwpTips);
+//    analysisList.add(nwpAnalysisDto);
 
     // 短期一期
     List<FileAnalysisRecord> dqList1 = fileAnalysisRecordList.stream().filter(w -> "DQ1".equals(w.getFileType())).collect(Collectors.toList());
@@ -429,14 +430,14 @@ public class DashboardService extends BaseService {
     if (dqList1.size() > 0) {
       dqList1.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
       dqStatus1 = dqList1.get(0).getFileStatus();
-      dqTips1 = "最后解析短期一期时间:" + DateFormatUtils.format(dqList1.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+      dqTips1 = "最后解析光伏短期时间:" + DateFormatUtils.format(dqList1.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
     } else {
-      dqTips1 = "今日未解析过短期一期文件";
+      dqTips1 = "今日未解析过光伏短期文件";
     }
 
     ChannelStatusDto dqAnalysisDto1 = new ChannelStatusDto();
-    dqAnalysisDto1.setChannelId("DQYQ");
-    dqAnalysisDto1.setChannelName("短期一期文件");
+    dqAnalysisDto1.setChannelId("DQ1");
+    dqAnalysisDto1.setChannelName("光伏短期文件");
     dqAnalysisDto1.setChannelStatus(dqStatus1);
     dqAnalysisDto1.setTips(dqTips1);
     analysisList.add(dqAnalysisDto1);
@@ -447,13 +448,13 @@ public class DashboardService extends BaseService {
     if (nwpList1.size() > 0) {
       nwpList1.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
       nwpStatus1 = nwpList1.get(0).getFileStatus();
-      nwpTips1 = "最后解析NWP一期时间:" + DateFormatUtils.format(nwpList1.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+      nwpTips1 = "最后解析光伏NWP时间:" + DateFormatUtils.format(nwpList1.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
     } else {
-      nwpTips1 = "今日未解析过NWP一期文件";
+      nwpTips1 = "今日未解析过光伏NWP文件";
     }
     ChannelStatusDto nwpAnalysisDto1 = new ChannelStatusDto();
-    nwpAnalysisDto1.setChannelId("NWPYQ");
-    nwpAnalysisDto1.setChannelName("NWP一期文件");
+    nwpAnalysisDto1.setChannelId("NWP1");
+    nwpAnalysisDto1.setChannelName("光伏NWP文件");
     nwpAnalysisDto1.setChannelStatus(nwpStatus1);
     nwpAnalysisDto1.setTips(nwpTips1);
     analysisList.add(nwpAnalysisDto1);
@@ -465,14 +466,14 @@ public class DashboardService extends BaseService {
     if (dqList2.size() > 0) {
       dqList2.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
       dqStatus2 = dqList2.get(0).getFileStatus();
-      dqTips2 = "最后解析短期二期时间:" + DateFormatUtils.format(dqList2.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+      dqTips2 = "最后解析风电短期时间:" + DateFormatUtils.format(dqList2.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
     } else {
-      dqTips2 = "今日未解析过短期二期文件";
+      dqTips2 = "今日未解析过风电短期文件";
     }
 
     ChannelStatusDto dqAnalysisDto2 = new ChannelStatusDto();
-    dqAnalysisDto2.setChannelId("DQEQ");
-    dqAnalysisDto2.setChannelName("短期二期文件");
+    dqAnalysisDto2.setChannelId("DQ2");
+    dqAnalysisDto2.setChannelName("风电短期文件");
     dqAnalysisDto2.setChannelStatus(dqStatus2);
     dqAnalysisDto2.setTips(dqTips2);
     analysisList.add(dqAnalysisDto2);
@@ -483,13 +484,13 @@ public class DashboardService extends BaseService {
     if (nwpList2.size() > 0) {
       nwpList2.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
       nwpStatus2 = nwpList2.get(0).getFileStatus();
-      nwpTips2 = "最后解析NWP二期时间:" + DateFormatUtils.format(nwpList2.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+      nwpTips2 = "最后解析风电NWP时间:" + DateFormatUtils.format(nwpList2.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
     } else {
-      nwpTips2 = "今日未解析过NWP二期文件";
+      nwpTips2 = "今日未解析过风电NWP文件";
     }
     ChannelStatusDto nwpAnalysisDto2 = new ChannelStatusDto();
-    nwpAnalysisDto2.setChannelId("NWPEQ");
-    nwpAnalysisDto2.setChannelName("NWP二期文件");
+    nwpAnalysisDto2.setChannelId("NWP2");
+    nwpAnalysisDto2.setChannelName("风电NWP文件");
     nwpAnalysisDto2.setChannelStatus(nwpStatus2);
     nwpAnalysisDto2.setTips(nwpTips2);
     analysisList.add(nwpAnalysisDto2);

+ 1 - 1
ipfcst/ipfcst-reportquery/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       # 数据源配置
       username: root
       password: '!QAZ2root'
-      url: jdbc:mysql://localhost:3306/ipfcst-v3?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://192.168.1.205:3306/ipfcst-znzx2?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
       driver-class-name: com.mysql.cj.jdbc.Driver
       # 初始化 最小 最大
       initial-size: 5

+ 1 - 1
ipfcst/ipfcst-reportquery/vue.config.js

@@ -27,7 +27,7 @@ module.exports = {
   publicPath: './',
   outputDir: 'dist',
   assetsDir: 'assets',
-  lintOnSave: process.env.NODE_ENV === 'development',
+  lintOnSave: false,
   productionSourceMap: false,
   pages: {
     index: {