温度及密度接口调试

src/api/tentative/testtempreature.js

@@ -0,0 +1,60 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-manager/trial/param/temperature-density/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/blade-manager/trial/param/temperature-density/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/blade-manager/trial/param/temperature-density/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/blade-manager/trial/param/temperature-density/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-manager/trial/param/temperature-density/submit',
+    method: 'post',
+    data: row
+  })
+}
+//导入压实密度参数
+// 上传导入模板
+
+export const importTemperaturetParam = (row) => {
+    return request({
+        // ty  application/json
+        url: '/api/blade-manager/trial/param/temperature-density/import-excel',
+        method: 'post',
+        data: row
+    })
+}

src/views/tentative/importDialog.vue

@@ -59,7 +59,13 @@
 
 <script>
 import {importParam} from "@/api/tentative/testpram";
+import {importTemperaturetParam} from "@/api/tentative/testtempreature";
 export default {
+  props:{
+    importDialogType:Number,
+    temonLoad:Function,
+    paramLoad:Function
+  },
     data(){
         return{
             importFormVisible:false,
@@ -67,7 +73,7 @@ export default {
                 name: '',
                 region: '',
                 type: '',
-                isCovered:1,
+                isCovered:"1",
             },
              //文件上传
          fileList: [],
@@ -79,7 +85,8 @@ export default {
   
     methods:{
         show(){
-            this.importFormVisible=true
+            this.importFormVisible=true;
+            this.fileList=[]
         },
         handleExceed(files, fileList) {
             this.$message.warning(`当前限制选择 1个文件，请删除原文件后再选择文件上传`);
@@ -117,7 +124,8 @@ export default {
         },
         //确定导入
         importSubmit(){
-             const loading = this.$loading({
+          if(this.fileList.length>0){
+            const loading = this.$loading({
                 lock: true,
                 text: 'Loading',
                 spinner: 'el-icon-loading',
@@ -125,19 +133,42 @@ export default {
             });
              let formData = new FormData()
             formData.append('file', this.fileList[0].raw);
-            formData.append('isCovered', this.formLabelAlign.isCovered)
-            importParam(formData).then(() => {
-                this.$message({
-                message: '上传文件成功',
-                type: 'success'
-                })
-                loading.close();
-            }).catch(() => {
-                loading.close();
-            });
+            formData.append('isCovered', this.formLabelAlign.isCovered);
+              if(this.importDialogType===1){
+                importParam(formData).then(() => {
+                  this.$message({
+                  message: '上传文件成功',
+                  type: 'success'
+                  })
+                  loading.close();
+                   this.importFormVisible=false;
+                   this.temonLoad();
+              }).catch(() => {
+                  loading.close();
+              });
+            }else{
+                 importTemperaturetParam(formData).then(() => {
+                    this.$message({
+                    message: '上传文件成功',
+                    type: 'success'
+                    })
+                    loading.close();
+                    this.importFormVisible=false;
+                     this.paramLoad();
+                }).catch(() => {
+                      loading.close();
+                  })
+                   
+            }
+            
+          }else{
+            // console.log('上次文件');
+            this.$message.warning('请上传模板')
+          }
+             
 
             this.$refs.file3.clearFiles();
-            this.importFormVisible=false;
+          
         },
     }
 }

src/views/tentative/parameter.vue

@@ -42,7 +42,7 @@
             </el-tabs>
       </div>
  <!-- 导入参数弹窗 -->
-  <importDialog ref="importDialog"/>
+  <importDialog ref="importDialog" @paramLoad="onLoad"  :importDialogType="importDialogType"/>
   </basic-container>
   
 </template>
@@ -59,6 +59,7 @@ export default {
      data() {
       return {
         activeName: 'first',
+        importDialogType:1,
         page: {
           pageSize: 20,
           currentPage:1

src/views/tentative/temperature.vue

@@ -34,7 +34,7 @@
             </template>
         </avue-crud>
            <!-- 导入参数弹窗 -->
-        <importDialog ref="importDialog"/>
+        <importDialog ref="importDialog" :importDialogType="importDialogType" @temonLoad="onLoad"/>
     </div>
 
  
@@ -42,6 +42,7 @@
 
 <script>
 import importDialog from './importDialog.vue';
+import {getList,add, update, remove} from "@/api/tentative/testtempreature";
 export default {
   components:{
     importDialog,
@@ -49,6 +50,7 @@ export default {
   },
      data() {
       return {
+        importDialogType:2,
         activeName: 'first',
         page: {
           pageSize: 20,
@@ -90,11 +92,11 @@ export default {
           dialogClickModal: false,
           column:[
              {
-              label:'姓名',
-              prop:'name'
+              label:'温度',
+              prop:'temperature'
             }, {
-              label:'性别',
-              prop:'sex'
+              label:'密度',
+              prop:'waterDensity'
             }
           ]
         },
@@ -111,16 +113,16 @@ export default {
   },
     methods: {
    
-       onLoad(page, params = {}) {
-         //模拟分页
-        this.page.total = 40
-        // this.loading = true;
-        // // getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => {
-        // //   this.data = res.data.data;
-        // //   this.loading = false;
-        // //   this.selectionClear();
-        // // });
-      },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.tableData = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
       refreshChange() {
         this.onLoad(this.page, this.query);
       },
@@ -133,35 +135,35 @@ export default {
       handleClick(tab, event) {
         console.log(tab, event);
       },
-      rowSave (row, done, loading) {
+     rowSave (row, done, loading) {
           console.log(row,'row');
-    //   add(row).then(() => {
-    //     this.onLoad(this.page);
-    //     this.$message({
-    //       type: "success",
-    //       message: "操作成功!"
-    //     });
-    //     done();
-    //   }, error => {
-    //     loading();
-    //     window.console.log(error);
-    //   });
-    },
-   addUpdate(form,index,done,loading){
-     console.log(form,'编辑');
-      this.$message.success('模拟网络请求')
-      setTimeout(() => {
-        this.$message.success('关闭按钮等待')
-        loading()
-      }, 1000)
-      setTimeout(() => {
-        this.$message.success(
-          '编辑数据' + JSON.stringify(form) + '数据序号' + index
-        )
-        done()
-      }, 2000)
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
+      },
+     addUpdate(row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
     },
-      handleDelete () {
+
+    handleDelete () {
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
@@ -172,11 +174,11 @@ export default {
         type: "warning"
       })
         .then(() => {
-        //   return delTabInfoAll(this.ids);
-          console.log(this.ids,'this.ids删除');
+          return remove(this.ids);
+      
         })
         .then(() => {
-        //   this.onLoad(this.page);//刷新表格数据
+          this.onLoad(this.page);//刷新表格数据
           this.$message({
             type: "success",
             message: "操作成功!"