Просмотр исходного кода

修改场站controller获取全部增加mapping地址

xusl 3 лет назад
Родитель
Сommit
c7e8dba594

+ 7 - 4
ipfcst-console/src/main/frontend/views/uploadFile/queryUploadFile/index.vue

@@ -3,6 +3,7 @@
     <div>
       <span style="font-weight: bold;font-size: 14px">文件生成日期:</span>
       <el-date-picker
+        style="width:150px"
         v-model="dataTime"
         type="date"
         placeholder="选择日期"
@@ -10,12 +11,12 @@
         @change="seachLogInfo"
       />
       <span style="font-weight: bold;font-size: 14px">场站名称:</span>
-      <el-select v-model="stationCode" size="small">
+      <el-select style="width:250px" v-model="stationCode" size="small">
         <el-option
           v-for="item in stationList"
           :key="item.stationCode"
           :label="item.name"
-          :value="item.id"
+          :value="item.stationCode"
         />
       </el-select>
       <span style="font-weight: bold;font-size: 14px">上报对象:</span>
@@ -260,6 +261,7 @@ export default {
         this.uploadProtocolEnum = res[3]
         this.fileTypeEnum = res[4]
         this.stationList = res[5]
+        console.log(res[5])
         this.updateFilterEvent()
       })
     },
@@ -340,10 +342,11 @@ export default {
     getStationList() {
       const a = this.$axios
       return new Promise(function(resolve, reject) {
-        a.get('/uploadObject/getFileType').then(res => {
+        a.get('/electricField/getElectricField').then(res => {
           resolve(res.data)
         }).catch((error) => {
-          this.$message.error('获取上报文件类型出错' + error)
+          alert(error)
+          this.$message.error('获取场站下拉框出错' + error)
         })
       })
     },

+ 1 - 1
ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ElectricFieldController.java

@@ -135,7 +135,7 @@ public class ElectricFieldController {
      * @return 所有场站信息
      */
 
-    @GetMapping(value = "/")
+    @GetMapping(value = "/getElectricField")
     public ResponseVO getElectricField() {
         try {
             List<ElectricField> electricFieldList = this.electricFieldService.getAll();