Browse Source

fix:搜索问题修改

chenxinlei 2 years ago
parent
commit
92cbe4d039

+ 1 - 1
src/api/station.js

@@ -30,7 +30,7 @@ const lines = (data) => {
 
 const regionList = (data) => {
   return request({
-    url: `/region/List?id=${data.id}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    url: `/region/List?companyid=${data.companyid}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
     method: 'get',
   })
 }

+ 45 - 45
src/api/table.js

@@ -1,81 +1,81 @@
 import request from '@/utils/request'
 
-const projectplan =(data)=>{
+const projectplan = (data) => {
   return request({
-      url:`projectplan/listByPage?projectid=${data.projectid}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
-      method:"get"
+    url: `projectplan/listByPage?windpower=${data.windpower}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
+    method: 'get',
   })
 }
-const addProjectplan =(pairs)=>{
+const addProjectplan = (pairs) => {
   return request({
-      url:`projectplan/add-modify-projectplan`,
-      method:"post",
-      data: pairs
+    url: `projectplan/add-modify-projectplan`,
+    method: 'post',
+    data: pairs,
   })
 }
-const removeProjectplan =(data)=>{
+const removeProjectplan = (data) => {
   return request({
-      url:`/projectplan/remove-projectplans/${data.id}`,
-      method:"delete",
+    url: `/projectplan/remove-projectplans/${data.id}`,
+    method: 'delete',
   })
 }
-const wtls=(data)=>{
+const wtls = (data) => {
   return request({
-      url:`/back/wtls`,
-      method:"get"
+    url: `/back/wtls`,
+    method: 'get',
   })
 }
 
-const indicators =(data)=>{
+const indicators = (data) => {
   return request({
-      url:`indicators/List?stationid=${data.windpowerstationid}&stationname=${data.name}&pageNum=${data.pagenum}&pageSize=${data.pagesize}`,
-      method:"get"
+    url: `indicators/List?stationid=${data.windpowerstationid}&stationname=${data.name}&pageNum=${data.pagenum}&pageSize=${data.pagesize}`,
+    method: 'get',
   })
 }
-const addIndicators =(pairs)=>{
+const addIndicators = (pairs) => {
   return request({
-      url:`indicators/add`,
-      method:"post",
-      data: pairs
+    url: `indicators/add`,
+    method: 'post',
+    data: pairs,
   })
 }
-const removeIndicators =(data)=>{
+const removeIndicators = (data) => {
   return request({
-      url:`/indicators/${data.id}`,
-      method:"delete",
+    url: `/indicators/${data.id}`,
+    method: 'delete',
   })
 }
-const newtreeTreels=(data)=>{
-  return request({ 
-      url:`/newtree/treels?tag=${data.tag}`,
-      method:"get"
+const newtreeTreels = (data) => {
+  return request({
+    url: `/newtree/treels?tag=${data.tag}`,
+    method: 'get',
   })
 }
 
 // 可研电量
-const projectstudy =(data)=>{
+const projectstudy = (data) => {
   return request({
-      url:`/projectstudy/List?id=${data.id}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
-      method:"get"
+    url: `/projectstudy/List?id=${data.id}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    method: 'get',
   })
 }
-const addProjectstudy =(pairs)=>{
+const addProjectstudy = (pairs) => {
   return request({
-      url:`/projectstudy/add`,
-      method:"post",
-      data: pairs
+    url: `/projectstudy/add`,
+    method: 'post',
+    data: pairs,
   })
 }
-const deleteProjectstudy =(data)=>{
+const deleteProjectstudy = (data) => {
   return request({
-      url:`/projectstudy/remove-study/${data.id}`,
-      method:"delete",
+    url: `/projectstudy/remove-study/${data.id}`,
+    method: 'delete',
   })
 }
-const treels=(data)=>{
+const treels = (data) => {
   return request({
-      url:`/newtree/treels`,
-      method:"get"
+    url: `/newtree/treels`,
+    method: 'get',
   })
 }
 export default {
@@ -83,12 +83,12 @@ export default {
   addProjectplan,
   removeProjectplan,
   wtls,
-	treels,
+  treels,
   indicators,
   addIndicators,
   removeIndicators,
   newtreeTreels,
-	addProjectstudy,
-	projectstudy,
-	deleteProjectstudy
-};
+  addProjectstudy,
+  projectstudy,
+  deleteProjectstudy,
+}

+ 2 - 2
src/views/index/index.vue

@@ -3,7 +3,7 @@
     <vab-query-form>
       <vab-query-form-left-panel>
         <el-form ref="form" :model="queryForm" :inline="true" @submit.native.prevent >
-          <el-form-item label="工程编号">
+          <el-form-item label="风场编号">
             <!-- <el-cascader class="cascaders" v-model="cascaderSel" :options="options" style="width: 200px"
               :props="{ checkStrictly: true, label: 'name', value: 'id' , children:'children', expandTrigger: 'hover' }" clearable>
             </el-cascader> -->
@@ -179,7 +179,7 @@ export default {
     async fetchData() {
       this.listLoading = true
       api.projectplan({
-        projectid: this.fuzzyQuery[2] || "",
+        windpower: this.fuzzyQuery[2] || "",
         pagenum: this.queryForm.pageNo,
         pagesize: this.queryForm.pageSize,
       }).then(res => {

+ 2 - 2
src/views/stationConfiguration/area/index.vue

@@ -4,7 +4,7 @@
       <div class="title">
         <div class="left">
           <div class="left-item">
-            <div style="width: 70px;">公司:</div>
+            <div style="width: 70px;">公司编号:</div>
             <el-select v-model="selectValue" placeholder="请选择" clearable>
               <el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
@@ -139,7 +139,7 @@ export default {
     },
     fetchData() {
       api.regionList({
-        id: this.selectValue,
+        companyid: this.selectValue,
         name: this.fuzzyQuery,
         pageNum: this.queryForm.pageNo,
         pageSize: this.queryForm.pageSize,

+ 1 - 1
src/views/stationConfiguration/period/index.vue

@@ -173,7 +173,7 @@ export default {
     },
     fetchData() {
       api.projectList({
-        windpowerstationid: this.selectValue,
+        windpowerstationid: this.selectValue[2] || "",
         name: this.fuzzyQuery,
         pageNum: this.queryForm.pageNo,
         pageSize: this.queryForm.pageSize,