Browse Source

fix:场站搜索条件修改

chenxinlei 2 years ago
parent
commit
ab90e4cc84
2 changed files with 124 additions and 117 deletions
  1. 121 114
      src/api/station.js
  2. 3 3
      src/views/stationConfiguration/station/index.vue

+ 121 - 114
src/api/station.js

@@ -1,201 +1,208 @@
 import request from '@/utils/request'
 
-const companys=(data)=>{
-  return request({ 
-      url:`/listByPage?id=${data.id}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
-      method:"get"
+const companys = (data) => {
+  return request({
+    url: `/listByPage?id=${data.id}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    method: 'get',
   })
 }
-const addCompanys=(pairs)=>{
+const addCompanys = (pairs) => {
   return request({
-      url:`/companys`,
-      method:"post",
-      data: pairs
+    url: `/companys`,
+    method: 'post',
+    data: pairs,
   })
 }
-const deleteCompanys =(data)=>{
+const deleteCompanys = (data) => {
   return request({
-      url:`/remove-companys/${data.id}`,
-      method:"delete",
+    url: `/remove-companys/${data.id}`,
+    method: 'delete',
   })
 }
-const lines=(data)=>{
+const lines = (data) => {
   return request({
-      url:`/line/listByPage?id=${data.id}&name=${encodeURIComponent(data.name)}&pagenum=${data.pageNum}&pagesize=${data.pageSize}`,
-      method:"get"
+    url: `/line/listByPage?id=${data.id}&name=${encodeURIComponent(
+      data.name
+    )}&pagenum=${data.pageNum}&pagesize=${data.pageSize}`,
+    method: 'get',
   })
 }
 
-const regionList =(data)=>{
+const regionList = (data) => {
   return request({
-      url:`/region/List?id=${data.id}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
-      method:"get"
+    url: `/region/List?id=${data.id}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    method: 'get',
   })
 }
-const addRegion =(pairs)=>{
+const addRegion = (pairs) => {
   return request({
-      url:`/region/save`,
-      method:"post",
-      data: pairs
+    url: `/region/save`,
+    method: 'post',
+    data: pairs,
   })
 }
-const deleteRegion =(data)=>{
+const deleteRegion = (data) => {
   return request({
-      url:`/region/${data.id}`,
-      method:"delete",
+    url: `/region/${data.id}`,
+    method: 'delete',
   })
 }
 
-const windpowerstationList =(data)=>{
+const windpowerstationList = (data) => {
   return request({
-      url:`/windpowerstation/List?id=${data.id}&name=${data.name}&companyid=${data.companyid}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
-      method:"get"
+    url: `/windpowerstation/List?id=${data.id}&code=${data.code}&companyid=${data.companyid}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    method: 'get',
   })
 }
-const addWindpowerstation =(pairs)=>{
+const addWindpowerstation = (pairs) => {
   return request({
-      url:`/windpowerstation/add`,
-      method:"post",
-      data: pairs
+    url: `/windpowerstation/add`,
+    method: 'post',
+    data: pairs,
   })
 }
-const deleteWindpowerstation =(data)=>{
+const deleteWindpowerstation = (data) => {
   return request({
-      url:`/windpowerstation/${data.id}`,
-      method:"delete",
+    url: `/windpowerstation/${data.id}`,
+    method: 'delete',
   })
 }
-const projectList =(data)=>{
+const projectList = (data) => {
   return request({
-      url:`/project/List?windpowerstationid=${data.windpowerstationid}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
-      method:"get"
+    url: `/project/List?windpowerstationid=${data.windpowerstationid}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    method: 'get',
   })
 }
-const addProject =(pairs)=>{
+const addProject = (pairs) => {
   return request({
-      url:`/project/add`,
-      method:"post",
-      data: pairs
+    url: `/project/add`,
+    method: 'post',
+    data: pairs,
   })
 }
-const deleteProject =(data)=>{
+const deleteProject = (data) => {
   return request({
-      url:`/project/${data.id}`,
-      method:"delete",
+    url: `/project/${data.id}`,
+    method: 'delete',
   })
 }
-const addLine =(pairs)=>{
+const addLine = (pairs) => {
   return request({
-      url:`/line/add-Line`,
-      method:"post",
-      data: pairs
+    url: `/line/add-Line`,
+    method: 'post',
+    data: pairs,
   })
 }
-const deleteLine =(data)=>{
+const deleteLine = (data) => {
   return request({
-      url:`/line/remove-lines/${data.id}`,
-      method:"delete",
+    url: `/line/remove-lines/${data.id}`,
+    method: 'delete',
   })
 }
 
-const windturbine =(data)=>{
+const windturbine = (data) => {
   return request({
-      url:`/windturbine/companys?pageNum=${data.pageNum}&pageSize=${data.pageSize}&name=${encodeURIComponent(data.name)}`,
-      method:"get"
+    url: `/windturbine/companys?pageNum=${data.pageNum}&pageSize=${
+      data.pageSize
+    }&name=${encodeURIComponent(data.name)}`,
+    method: 'get',
   })
 }
-const addWindturbine =(pairs)=>{
+const addWindturbine = (pairs) => {
   return request({
-      url:`/windturbine/add`,
-      method:"post",
-      data: pairs
+    url: `/windturbine/add`,
+    method: 'post',
+    data: pairs,
   })
 }
-const deleteWindturbine =(data)=>{
+const deleteWindturbine = (data) => {
   return request({
-      url:`/windturbine/${data.id}`,
-      method:"delete",
+    url: `/windturbine/${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 equipmentmodel =(data)=>{
+const equipmentmodel = (data) => {
   return request({
-      url:`/equipmentmodel/listByPage?name=${encodeURIComponent(data.name)}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
-      method:"get"
+    url: `/equipmentmodel/listByPage?name=${encodeURIComponent(
+      data.name
+    )}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    method: 'get',
   })
 }
-const addEquipmentmodel =(pairs)=>{
+const addEquipmentmodel = (pairs) => {
   return request({
-      url:`/equipmentmodel/save`,
-      method:"post",
-      data: pairs
+    url: `/equipmentmodel/save`,
+    method: 'post',
+    data: pairs,
   })
 }
-const deleteEquipmentmodel =(data)=>{
+const deleteEquipmentmodel = (data) => {
   return request({
-      url:`/equipmentmodel/remove-manufacturer/${data.id}`,
-      method:"delete",
+    url: `/equipmentmodel/remove-manufacturer/${data.id}`,
+    method: 'delete',
   })
 }
 
-const meterpoint =(data)=>{
+const meterpoint = (data) => {
   return request({
-      url:`/meterpoint/listByPage?name=${encodeURIComponent(data.name)}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
-      method:"get"
+    url: `/meterpoint/listByPage?name=${encodeURIComponent(
+      data.name
+    )}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    method: 'get',
   })
 }
-const addMeterpoint =(pairs)=>{
+const addMeterpoint = (pairs) => {
   return request({
-      url:`/meterpoint/save`,
-      method:"post",
-      data: pairs
+    url: `/meterpoint/save`,
+    method: 'post',
+    data: pairs,
   })
 }
-const deleteMeterpoint =(data)=>{
+const deleteMeterpoint = (data) => {
   return request({
-      url:`/meterpoint/remove-meterpoint/${data.id}`,
-      method:"delete",
+    url: `/meterpoint/remove-meterpoint/${data.id}`,
+    method: 'delete',
   })
 }
 
-
-const getStationPersis =(data)=>{
+const getStationPersis = (data) => {
   return request({
-		url:`/windpowerstation/getStationPersis?station=${data.station}&startdate=${data.startdate}&enddate=${data.enddate}`,
-		method:"get"
+    url: `/windpowerstation/getStationPersis?station=${data.station}&startdate=${data.startdate}&enddate=${data.enddate}`,
+    method: 'get',
   })
 }
-const getAdmList =(data)=>{
+const getAdmList = (data) => {
   return request({
-		url:`/windpowerstation/getAdmList?companyid=${data.companyid}&regionid=${data.regionid}`,
-		method:"get"
+    url: `/windpowerstation/getAdmList?companyid=${data.companyid}&regionid=${data.regionid}`,
+    method: 'get',
   })
 }
 // 区域保存 post:http://localhost:7020/region/save2
 // 区域更新 Put:http://localhost:7020/region/editRegions
-const addSave =(pairs)=>{
+const addSave = (pairs) => {
   return request({
-      url:`/region/save2`,
-      method:"post",
-      data: [pairs]
+    url: `/region/save2`,
+    method: 'post',
+    data: [pairs],
   })
 }
-const editSave =(pairs)=>{
+const editSave = (pairs) => {
   return request({
-      url:`/region/editRegions`,
-      method:"put",
-      data: [pairs]
-		})
+    url: `/region/editRegions`,
+    method: 'put',
+    data: [pairs],
+  })
 }
-const standardpoint =(data)=>{
+const standardpoint = (data) => {
   return request({
-		url:`/standardpoint/list?pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
-		method:"get"
+    url: `/standardpoint/list?pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    method: 'get',
   })
 }
 export default {
@@ -220,15 +227,15 @@ export default {
   addWindturbine,
   deleteWindturbine,
   newtreeTreels,
-	equipmentmodel,
-	addEquipmentmodel,
+  equipmentmodel,
+  addEquipmentmodel,
 
-	deleteEquipmentmodel,
-	meterpoint,
-	addMeterpoint,
+  deleteEquipmentmodel,
+  meterpoint,
+  addMeterpoint,
 
-	deleteMeterpoint,
-	getStationPersis,
-	getAdmList,
-	standardpoint,
-};
+  deleteMeterpoint,
+  getStationPersis,
+  getAdmList,
+  standardpoint,
+}

+ 3 - 3
src/views/stationConfiguration/station/index.vue

@@ -11,7 +11,7 @@
             </el-select>
           </div>
           <div class="left-item">
-            <div style="width: 100px;">风场名称:</div>
+            <div style="width: 100px;">风场编码:</div>
             <el-input v-model="fuzzyQuery" placeholder="请输入" clearable />
           </div>
           <el-button icon="el-icon-search" type="primary" native-type="submit" @click="handleQuery">
@@ -41,7 +41,7 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip label="区域编号" prop="regionid" align="center" sortable width="160">
         </el-table-column>
-        <el-table-column show-overflow-tooltip label="编码" prop="code" align="center" sortable width="100">
+        <el-table-column show-overflow-tooltip label="风场编码" prop="code" align="center" sortable width="100">
         </el-table-column>
         <el-table-column show-overflow-tooltip label="地址" prop="address" align="center" sortable width="180">
         </el-table-column>
@@ -169,7 +169,7 @@ export default {
       api.windpowerstationList({
         id: '',
         companyid: this.selectValue,
-        name: this.fuzzyQuery,
+        code: this.fuzzyQuery,
         pageNum: this.queryForm.pageNo,
         pageSize: this.queryForm.pageSize,
       }).then(res => {