zy 2 лет назад
Родитель
Сommit
3317bb3a2b

+ 19 - 13
neim-biz/src/main/java/com/jiayue/biz/controller/ManualEntryController.java

@@ -1,9 +1,6 @@
 package com.jiayue.biz.controller;
 
-import com.jiayue.biz.domain.ProjectInfo;
-import com.jiayue.biz.domain.ProvincialEnergyStations;
-import com.jiayue.biz.domain.StationInfo;
-import com.jiayue.biz.domain.TotalityInfo;
+import com.jiayue.biz.domain.*;
 import com.jiayue.biz.service.*;
 import com.jiayue.common.core.controller.BaseController;
 import com.jiayue.common.core.domain.AjaxResult;
@@ -86,15 +83,24 @@ public class ManualEntryController extends BaseController {
     public void update(@RequestBody ProvincialEnergyStations provincialEnergyStations){
         manualEntryService.updateProvincialEnergyStations(provincialEnergyStations);
     }
-//    /*获取风机统计数据*/
-//    @GetMapping("/getFanModelDataList")
-//    public AjaxResult getFanModelDataList(){
-//        return AjaxResult.success(fanModelDataService.getFanModelDataList());
-//    }
-//   @GetMapping("/getFanModelDataList")
-//    public AjaxResult getFanModelDataList(@RequestBody ){
-//        return AjaxResult.success(fanModelDataService.updateFanModelData(););
-//    }
+
+    /*获取风机统计数据*/
+    @GetMapping("/getFanModelDataList")
+    public AjaxResult getFanModelDataList(@RequestBody String id) {
+        return AjaxResult.success(fanModelDataService.queryFanModelDataList(id));
+    }
+
+    @PostMapping("/saveFanModelData")
+    public AjaxResult updateFanModelData(@RequestBody FanModelData fanModelData) {
+        fanModelDataService.updateFanModelData(fanModelData);
+        return AjaxResult.success("200");
+    }
+
+    @DeleteMapping("/deleteFanModelData/{id}")
+    public AjaxResult deleteFanModelData(@PathVariable("id") String id) {
+        fanModelDataService.deleteFanModelData(id);
+        return AjaxResult.success("200");
+    }
 
     //项目进展解析
     @PostMapping("/projectProgressParse")

+ 45 - 2
neim-ui/src/views/manualEntry/projectEvolveEntry/index.vue

@@ -15,8 +15,24 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
+            <el-upload
+              :http-request="dataUpload"
+              :before-upload="beforeUpload"
+              class="el-upload-button"
+              action=""
+              ref="upload"
+            >
+              <el-button
+                @click="row=scope.row"
+                slot="trigger"
+                size="mini"
+                type="text"
+                icon="el-icon-upload2"
+              >上传进展
+              </el-button>
+            </el-upload>
             <el-button icon="el-icon-download" @click="handleClick(scope.row)" type="text" size="small">下载最新进展</el-button>
-            <el-button icon="el-icon-upload2" @click="handleClick(scope.row)" type="text" size="small">上传进展</el-button>
+<!--            <el-button icon="el-icon-upload2" @click="handleClick(scope.row)" type="text" size="small"></el-button>-->
             <el-button icon="el-icon-upload2" @click="handleClick(scope.row)" type="text" size="small">上传附件</el-button>
           </template>
         </el-table-column>
@@ -37,13 +53,14 @@
 </template>
 
 <script>
-import {getProjectInfo} from "@/api/biz/manualEntry/projectEvolveEntry";
+import {getProjectInfo,projectProgressParse} from "@/api/biz/manualEntry/projectEvolveEntry";
 
 export default {
   // 项目进展录入
   name: "index",
   data(){
     return{
+      row:'',
       tableData:[],
       page: {
         total: 0, // 总页数
@@ -65,6 +82,32 @@ export default {
         console.log('获取项目信息异常:'+err)
       })
     },
+    beforeUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 < 1024 // 这里做文件大小限制
+      if (!isLt2M) {
+        this.$message({
+          message: '上传文件大小不能超过1020M!',
+          type: 'warning'
+        })
+      }
+      return isLt2M
+    },
+    dataUpload(item) {
+      this.fullscreenLoading = true
+      const formData = new FormData()
+      formData.append('file', item.file)
+      formData.append("id", this.row.id)
+      projectProgressParse(formData).then((response) => {
+        this.$refs.upload.clearFiles()
+        this.fullscreenLoading = false
+        if (response && response.code === 200) {
+          // this.getAllWindTowerInfo()
+          this.$message.success(response.msg)
+        } else {
+          this.$message.error(response.msg)
+        }
+      })
+    },
     handleClick(row) {
       console.log(row);
     },