fix: 测点模块接口联调

src/api/pointConfiguration.js

@@ -21,6 +21,14 @@ const deleteStandardpoint = (data) => {
     method: 'delete',
   })
 }
+// 生成
+const generateAdd = (pairs) => {
+  return request({
+    url: `/generate/add`,
+    method: 'post',
+    data: pairs,
+  })
+}
 // 设备点表
 // 查询  http://localhost:7020/windturbinetestingpointnew/list?pageNum=1&pageSize=1
 // 添加：ttp://localhost:7020/windturbinetestingpointnew/add
@@ -54,7 +62,7 @@ const deleteWindturbinetestingpointnew = (data) => {
 // 列表
 const windpowerstationpointnewList = (data) => {
   return request({
-    url: `/windpowerstationpointnew/list?id=${data.id}&code=${data.code}&name=${data.name}&model=${data.model}&uniformcode=${data.uniformcode}&windpowerstationid=${data.windpowerstationid}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    url: `/windpowerstationpointnew/list?name=${data.name}&type=${data.type}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
     method: 'get',
   })
 }
@@ -78,6 +86,7 @@ export default {
   deleteStandardpoint,
   standardpointList,
   addStandardpoint,
+  generateAdd,
   //
   windturbinetestingpointnewList,
   addWindturbinetestingpointnew,

src/api/station.js

@@ -100,7 +100,7 @@ const deleteLine =(data)=>{
 
 const windturbine =(data)=>{
   return request({
-      url:`/windturbine/companys?windpowerstationid=${data.windpowerstationid}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+      url:`/windturbine/companys?name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
       method:"get"
   })
 }

src/config/net.config.js

@@ -12,7 +12,7 @@ const network = {
   //消息框消失时间
   messageDuration: 3000,
   //最长请求时间
-  requestTimeout: 5000,
+  requestTimeout: 50000,
   //操作正常code，支持String、Array、int多种类型
   successCode: [200, 0],
   //登录失效code

src/views/pointConfiguration/components/TableEdit.vue

@@ -42,9 +42,9 @@ export default {
   data() {
     return {
       typeOptions: [
-        {value: '风机计算', label:'风机计算'},
-        {value: '场站计算', label:'场站计算'},
-        {value: '风机基础点', label:'风机基础点'},
+        {value: 'fjjs', label:'风机计算'},
+        {value: 'czjs', label:'场站计算'},
+        {value: 'fjjc', label:'风机基础点'},
       ],
       form: {
         id: '',

src/views/pointConfiguration/equipmentAllocation/components/TableEdit.vue

@@ -48,9 +48,9 @@ export default {
   data() {
     return {
       typeOptions: [
-        {value: '风机计算', label:'风机计算'},
-        {value: '场站计算', label:'场站计算'},
-        {value: '风机基础点', label:'风机基础点'},
+        {value: 'fjjs', label:'风机计算'},
+        {value: 'czjs', label:'场站计算'},
+        {value: 'fjjc', label:'风机基础点'},
       ],
       form: {
         id: '',

src/views/pointConfiguration/equipmentAllocation/index.vue

@@ -1,64 +1,118 @@
 <template>
   <div class="table-container">
     <!-- <vab-query-form> -->
-      <!-- <vab-query-form-left-panel> -->
-        <el-row>
-          <el-button @click="getBack" style="float: right; margin:0 0 10px 0">返回</el-button>
-        </el-row>
-        <el-form ref="form" :model="queryForm" :inline="true" @submit.native.prevent>
-          <el-form-item label="类型">
-              <el-select v-model="form.type" placeholder="请选择">
-                <el-option
-                  v-for="item in typeOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          <el-form-item label="名称">
-            <el-cascader
-            v-model="cascaderSel"
-            :options="optionscascader"
-            :props="{ checkStrictly: true }"
-            clearable></el-cascader>
-          </el-form-item>
-          <!-- <el-form-item label="型号"><el-input placeholder="请输入" v-model="form.model"></el-input></el-form-item>
-          <el-form-item label="统一编码"><el-input placeholder="请输入" v-model="form.uniformcode"></el-input></el-form-item>
-          <el-form-item label="场站编号"><el-input placeholder="请输入" v-model="form.windpowerstationid"></el-input></el-form-item> -->
-          <!-- <el-form-item label="类型">
-            <el-select v-model="form.type" placeholder="请选择">
-              <el-option
-                v-for="item in typeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item> -->
-          <el-form-item>
-            <el-button icon="el-icon-search" type="primary" native-type="submit" @click="fetchData">查询</el-button>
-          </el-form-item>
-          <el-form-item style="float: right;">
-            <el-button icon="el-icon-plus" type="primary" @click="handleAdd">添加</el-button>
-            <el-button icon="el-icon-delete" type="danger" @click="handleDelete">删除</el-button>
-          </el-form-item>
-        </el-form>
-      <!-- </vab-query-form-left-panel> -->
-      <!-- <vab-query-form-right-panel> -->
-        <!-- <UploadExcel style="margin-left: 10px;" @getResult="getMyExcelData"></UploadExcel>
+    <!-- <vab-query-form-left-panel> -->
+    <el-row>
+      <el-button @click="getBack" style="float: right; margin: 0 0 10px 0">
+        返回
+      </el-button>
+    </el-row>
+    <el-form
+      ref="form"
+      :model="queryForm"
+      :inline="true"
+      @submit.native.prevent
+    >
+      <el-form-item label="类型">
+        <el-select v-model="form.type" placeholder="请选择" clearable @change="typeChange">
+          <el-option
+            v-for="item in typeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="名称">
+        <el-select v-model="form.name" placeholder="请选择" clearable>
+          <el-option
+            v-for="item in nameOptions"
+            :key="item.uniformcode"
+            :label="item.name"
+            :value="item.uniformcode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          icon="el-icon-search"
+          type="primary"
+          native-type="submit"
+          @click="fetchData"
+        >
+          查询
+        </el-button>
+      </el-form-item>
+      <el-form-item style="float: right">
+        <el-button icon="el-icon-plus" type="primary" @click="handleAdd">
+          添加
+        </el-button>
+        <el-button icon="el-icon-delete" type="danger" @click="handleDelete">
+          删除
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <!-- </vab-query-form-left-panel> -->
+    <!-- <vab-query-form-right-panel> -->
+    <!-- <UploadExcel style="margin-left: 10px;" @getResult="getMyExcelData"></UploadExcel>
         <ExportExcel :exportList="exportExcel" partsName="公司"></ExportExcel> -->
-      <!-- </vab-query-form-right-panel> -->
+    <!-- </vab-query-form-right-panel> -->
     <!-- </vab-query-form> -->
-    <el-table ref="tableSort" v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText"
-      :height="height" @selection-change="setSelectRows">
-      <el-table-column show-overflow-tooltip type="selection" width="55"></el-table-column>
-      <el-table-column show-overflow-tooltip label="id" prop="id" align="center" sortable></el-table-column>
-      <el-table-column show-overflow-tooltip label="编码" prop="code" align="center" sortable></el-table-column>
-      <el-table-column show-overflow-tooltip label="名称" prop="name" align="center" sortable></el-table-column>
-      <el-table-column show-overflow-tooltip label="型号" prop="model" align="center" sortable></el-table-column>
-      <el-table-column show-overflow-tooltip label="统一编码" prop="uniformcode" align="center" sortable></el-table-column>
-      <el-table-column show-overflow-tooltip label="场站编号" prop="windpowerstationid" align="center" sortable></el-table-column>
+    <el-table
+      ref="tableSort"
+      v-loading="listLoading"
+      :data="list"
+      :element-loading-text="elementLoadingText"
+      :height="height"
+      @selection-change="setSelectRows"
+    >
+      <el-table-column
+        show-overflow-tooltip
+        type="selection"
+        width="55"
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="id"
+        prop="id"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="编码"
+        prop="code"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="名称"
+        prop="name"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="型号"
+        prop="model"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="统一编码"
+        prop="uniformcode"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="场站编号"
+        prop="windpowerstationid"
+        align="center"
+        sortable
+      ></el-table-column>
       <el-table-column show-overflow-tooltip label="操作" width="180px">
         <template #default="{ row }">
           <el-button type="text" @click="handleEdit(row)">编辑</el-button>
@@ -68,194 +122,254 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination :background="background" :current-page="queryForm.pageNo" :layout="layout"
-      :page-size="queryForm.pageSize" :total="total" @current-change="handleCurrentChange"
-      @size-change="handleSizeChange"></el-pagination>
-    <table-edit ref="edit" :options="options" @save-success="fetchData"></table-edit>
+    <el-pagination
+      :background="background"
+      :current-page="queryForm.pageNo"
+      :layout="layout"
+      :page-size="queryForm.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    ></el-pagination>
+    <table-edit
+      ref="edit"
+      :options="options"
+      @save-success="fetchData"
+    ></table-edit>
   </div>
 </template>
 <script>
-// import UploadExcel from '@/components/UploadExcel/index'
-// import ExportExcel from '@/components/ExportExcel/index'
-import TableEdit from './components/TableEdit'
-import api from '@/api/pointConfiguration'
-export default {
-   props: {
-    showValue: {
-      type: Object,
-      default: {}
-    },
-  },
-  components: {
-    // UploadExcel,
-    // ExportExcel,
-    TableEdit,
-  },
-  data() {
-    return {
-      cascaderSel:"",
-      optionscascader: [{
-        value: 'zhinan',
-        label: '指南',
-        children: [{
-          value: 'shejiyuanze',
-          label: '设计原则',
-          children: [{
-            value: 'yizhi',
-            label: '一致'
-          }, {
-            value: 'fankui',
-            label: '反馈'
-          }, {
-            value: 'xiaolv',
-            label: '效率'
-          }, {
-            value: 'kekong',
-            label: '可控'
-          }]
-        }, {
-          value: 'daohang',
-          label: '导航',
-          children: [{
-            value: 'cexiangdaohang',
-            label: '侧向导航'
-          }, {
-            value: 'dingbudaohang',
-            label: '顶部导航'
-          }]
-        }]
-      }],
-      typeOptions: [
-        {value: '风机计算', label:'风机计算'},
-        {value: '场站计算', label:'场站计算'},
-        {value: '风机基础点', label:'风机基础点'},
-      ],
-      form :{
-        // code: '',
-        type: '',
-        name: '',
-        // model: '',
-        // uniformcode: '',
-        // windpowerstationid: '',
-      },
-      // 
-      // fuzzyQuery: '',
-      listLoading: true,
-      list: [],
-      options: [],
-      exportExcel: [],
-      elementLoadingText: '正在加载...',
-      selectRows: '',
-      layout: 'total, sizes, prev, pager, next, jumper',
-      total: 0,
-      background: true,
-      exportList: [],
-      queryForm: {
-        pageNo: 1,
-        pageSize: 20,
+  // import UploadExcel from '@/components/UploadExcel/index'
+  // import ExportExcel from '@/components/ExportExcel/index'
+  import TableEdit from './components/TableEdit'
+  import api from '@/api/pointConfiguration'
+  export default {
+    props: {
+      showValue: {
+        type: Object,
+        default: {},
       },
-    };
-  },
-  created() {
-    this.form.type = this.showValue.type
-    this.form.name = this.showValue.name
-    this.fetchData()
-  },
-  computed: {
-    height() {
-      return this.$baseTableHeight() + 50
-    },
-  },
-  methods: {
-    getBack(){
-      this.$emit("cutState" , 1)
-    },
-    getMyExcelData(val) {
-      val.forEach(item => {
-        api.addCompanys(item).then(res => {
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '添加成功!'
-            });
-            this.fetchData()
-          }
-        })
-      })
-
     },
-    fetchData() {
-      this.listLoading = true
-      api.windturbinetestingpointnewList({
-        id: '',
-        type: this.form.code ? this.form.code : this.showValue.type,
-        name: this.form.name ? this.form.name : this.showValue.name,
-        // model: this.form.model,
-        // uniformcode: this.form.uniformcode,
-        // windpowerstationid: this.form.windpowerstationid,
-        pageNum: this.queryForm.pageNo,
-        pageSize: this.queryForm.pageSize,
-      }).then(res => {
-        if (res.data) {
-          this.listLoading = false
-          this.total = res.data.total
-          this.list = res.data.records
-          let exportExcel = []
-          res.data.records.forEach(item => {
-            exportExcel.push({
-              id: item.id,
-              name: item.name,
-              rid: item.rid,
-            })
-          })
-          this.exportExcel = exportExcel
-        }
-      })
-
+    components: {
+      // UploadExcel,
+      // ExportExcel,
+      TableEdit,
     },
-    handleSizeChange(val) {
-      this.queryForm.pageSize = val
-      this.fetchData()
+    data() {
+      return {
+        ArrayData: [],
+        nameOptions: [],
+        cascaderSel: '',
+        optionscascader: [
+          {
+            value: 'zhinan',
+            label: '指南',
+            children: [
+              {
+                value: 'shejiyuanze',
+                label: '设计原则',
+                children: [
+                  {
+                    value: 'yizhi',
+                    label: '一致',
+                  },
+                  {
+                    value: 'fankui',
+                    label: '反馈',
+                  },
+                  {
+                    value: 'xiaolv',
+                    label: '效率',
+                  },
+                  {
+                    value: 'kekong',
+                    label: '可控',
+                  },
+                ],
+              },
+              {
+                value: 'daohang',
+                label: '导航',
+                children: [
+                  {
+                    value: 'cexiangdaohang',
+                    label: '侧向导航',
+                  },
+                  {
+                    value: 'dingbudaohang',
+                    label: '顶部导航',
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+        typeOptions: [
+          { value: 'fjjs', label: '风机计算' },
+          { value: 'czjs', label: '场站计算' },
+          { value: 'fjjc', label: '风机基础点' },
+        ],
+        form: {
+          type: '',
+          name: '',
+        },
+        //
+        // fuzzyQuery: '',
+        listLoading: true,
+        list: [],
+        options: [],
+        exportExcel: [],
+        elementLoadingText: '正在加载...',
+        selectRows: '',
+        layout: 'total, sizes, prev, pager, next, jumper',
+        total: 0,
+        background: true,
+        exportList: [],
+        queryForm: {
+          pageNo: 1,
+          pageSize: 20,
+        },
+      }
     },
-    handleCurrentChange(val) {
-      this.queryForm.pageNo = val
+    created() {
+      this.form.type = this.showValue.type
+      this.form.name = this.showValue.name
       this.fetchData()
+      this.typeFetchDataAll()
     },
-    handleAdd() {
-      this.$refs['edit'].showEdit()
-    },
-    handleEdit(row) {
-      this.$refs['edit'].showEdit(row)
+    computed: {
+      height() {
+        return this.$baseTableHeight() + 50
+      },
     },
-    handleDelete(row) {
-      if (row.id || this.selectRows.length > 0) {
-        this.$baseConfirm('你确定要删除吗', null, async () => {
-          let ids = ''
-          if (this.selectRows.length > 0) {
-            ids = this.selectRows.map((item) => item.id).join()
+    methods: {
+      typeChange(data){
+        this.form.name = ""
+        this.ArrayData.forEach(element => {
+          if(data ===  element.value){
+            this.nameOptions = element.data
           }
-          api.deleteWindturbinetestingpointnew({
-            id: row.id || ids
-          }).then(res => {
-            if (res.data) {
-              this.$baseMessage('删除成功', 'success')
+        });
+      },
+      typeFetchDataAll(){
+        api.standardpointList({
+          id: '',
+          uniformcode: '',
+          name: '',
+          type: '',
+          pageNum: 1,
+          pageSize: 500,
+        }).then(res => {
+          if (res.data) {
+            let data = res.data.records
+            this.typeOptions.forEach((item) => {
+              let obj = {}
+              obj.value = item.value
+              obj.label = item.label
+              obj.data = []
+              data.forEach((element) => {
+                if (element.type == item.value) {
+                  obj.data.push(element)
+                }
+              })
+              this.ArrayData.push(obj)
+            })
+            this.ArrayData.forEach(element => {
+              if(element.value == this.showValue.type){
+                this.nameOptions = element.data
+              }
+            });
+          }
+        })
+      },
+      getBack() {
+        this.$emit('cutState', 1)
+      },
+      getMyExcelData(val) {
+        val.forEach((item) => {
+          api.addCompanys(item).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                type: 'success',
+                message: '添加成功!',
+              })
               this.fetchData()
             }
           })
         })
-      } else {
-        this.$baseMessage('未选中任何行', 'error')
-        return false
-      }
-    },
-    setSelectRows(val) {
-      this.selectRows = val
+      },
+      fetchData() {
+        this.listLoading = true
+        api
+          .windturbinetestingpointnewList({
+            id: '',
+            type: this.form.type,
+            name: this.form.name,
+            pageNum: this.queryForm.pageNo,
+            pageSize: this.queryForm.pageSize,
+          })
+          .then((res) => {
+            if (res.data) {
+              this.listLoading = false
+              this.total = res.data.total
+              this.list = res.data.records
+              let exportExcel = []
+              res.data.records.forEach((item) => {
+                exportExcel.push({
+                  id: item.id,
+                  name: item.name,
+                  rid: item.rid,
+                })
+              })
+              this.exportExcel = exportExcel
+            }
+          })
+      },
+      handleSizeChange(val) {
+        this.queryForm.pageSize = val
+        this.fetchData()
+      },
+      handleCurrentChange(val) {
+        this.queryForm.pageNo = val
+        this.fetchData()
+      },
+      handleAdd() {
+        this.$refs['edit'].showEdit()
+      },
+      handleEdit(row) {
+        this.$refs['edit'].showEdit(row)
+      },
+      handleDelete(row) {
+        if (row.id || this.selectRows.length > 0) {
+          this.$baseConfirm('你确定要删除吗', null, async () => {
+            let ids = ''
+            if (this.selectRows.length > 0) {
+              ids = this.selectRows.map((item) => item.id).join()
+            }
+            api
+              .deleteWindturbinetestingpointnew({
+                id: row.id || ids,
+              })
+              .then((res) => {
+                if (res.data) {
+                  this.$baseMessage('删除成功', 'success')
+                  this.fetchData()
+                }
+              })
+          })
+        } else {
+          this.$baseMessage('未选中任何行', 'error')
+          return false
+        }
+      },
+      setSelectRows(val) {
+        this.selectRows = val
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="less" scoped>
- a{
-  float: right;
- }
-</style>
+  a {
+    float: right;
+  }
+</style>

src/views/pointConfiguration/index.vue

@@ -4,10 +4,10 @@
       <!-- <vab-query-form> -->
         <!-- <vab-query-form-left-panel> -->
           <el-form ref="form" :model="queryForm" :inline="true" @submit.native.prevent>
-            <el-form-item label="统一编码"><el-input placeholder="请输入" v-model="form.uniformcode"></el-input></el-form-item>
-            <el-form-item label="名称"><el-input placeholder="请输入" v-model="form.name"></el-input></el-form-item>
+            <el-form-item label="统一编码"><el-input placeholder="请输入" v-model="form.uniformcode" clearable></el-input></el-form-item>
+            <el-form-item label="名称"><el-input placeholder="请输入" v-model="form.name" clearable></el-input></el-form-item>
             <el-form-item label="类型">
-              <el-select v-model="form.type" placeholder="请选择">
+              <el-select v-model="form.type" placeholder="请选择" clearable>
                 <el-option
                   v-for="item in typeOptions"
                   :key="item.value"
@@ -22,6 +22,7 @@
             <el-form-item style="float: right;">
               <el-button icon="el-icon-plus" type="primary" @click="handleAdd">添加</el-button>
               <el-button icon="el-icon-delete" type="danger" @click="handleDelete">删除</el-button>
+              <el-button type="primary" @click="generate">生成</el-button>
             </el-form-item>
           </el-form>
         <!-- </vab-query-form-left-panel> -->
@@ -36,13 +37,14 @@
         <el-table-column show-overflow-tooltip label="id" prop="id" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="统一编码" prop="uniformcode" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="名称" prop="name" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip label="类型" prop="type" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip label="操作" width="200px">
+        <el-table-column show-overflow-tooltip label="类型" prop="type" align="center" sortable :formatter="dateFormat"></el-table-column>
+        <el-table-column show-overflow-tooltip label="操作" width="240px">
           <template #default="{ row }">
             <el-button type="text" @click="handleEdit(row)">编辑</el-button>
             <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            <el-button type="text" @click="equipmentAllocation(row)" v-show="row.type === '风机计算' || row.type === '风机基础点'">设备点表配置</el-button>
-            <el-button type="text" @click="stationAllocation(row)" v-show="row.type === '场站计算'">场站点表配置</el-button>
+            <el-button type="text" @click="generate(row)">生成</el-button>
+            <el-button type="text" @click="equipmentAllocation(row)" v-show="row.type === 'fjjs' || row.type === 'fjjc'">设备点表配置</el-button>
+            <el-button type="text" @click="stationAllocation(row)" v-show="row.type === 'czjs'">场站点表配置</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -75,9 +77,9 @@ export default {
       showState: 1,
       showData: {},
       typeOptions: [
-        {value: '风机计算', label:'风机计算'},
-        {value: '场站计算', label:'场站计算'},
-        {value: '风机基础点', label:'风机基础点'},
+        {value: 'fjjs', label:'风机计算'},
+        {value: 'czjs', label:'场站计算'},
+        {value: 'fjjc', label:'风机基础点'},
       ],
       form :{
         uniformcode: '',
@@ -111,6 +113,13 @@ export default {
     },
   },
   methods: {
+    dateFormat(row, column, cellValue, index) {
+      for (const iterator of this.typeOptions) {
+        if(row.type === iterator.value){
+          return iterator.label
+        }
+      }
+    },
     cutState(data){
       this.showState = data
     },
@@ -161,7 +170,6 @@ export default {
           this.exportExcel = exportExcel
         }
       })
-
     },
     handleSizeChange(val) {
       this.queryForm.pageSize = val
@@ -177,6 +185,27 @@ export default {
     handleEdit(row) {
       this.$refs['edit'].showEdit(row)
     },
+    generate(row) {
+      if (row.uniformcode || this.selectRows.length > 0) {
+        this.$baseConfirm('你确定要生成吗', null, async () => {
+          let uniformcodeArr = []
+          if (this.selectRows.length > 0) {
+            this.selectRows.forEach(element => {
+              uniformcodeArr.push(element.uniformcode)
+            });
+          }
+          api.generateAdd({points: [row.uniformcode] || uniformcodeArr}).then(res => {
+            if (res.data) {
+              this.$baseMessage('生成成功', 'success')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$baseMessage('未选中任何行', 'error')
+        return false
+      }
+    },
     handleDelete(row) {
       if (row.id || this.selectRows.length > 0) {
         this.$baseConfirm('你确定要删除吗', null, async () => {

src/views/pointConfiguration/stationAllocation/components/TableEdit.vue

@@ -48,9 +48,9 @@ export default {
   data() {
     return {
       typeOptions: [
-        {value: '风机计算', label:'风机计算'},
-        {value: '场站计算', label:'场站计算'},
-        {value: '风机基础点', label:'风机基础点'},
+        { value: 'fjjs', label: '风机计算' },
+        { value: 'czjs', label: '场站计算' },
+        { value: 'fjjc', label: '风机基础点' },
       ],
       form: {
         id: '',

src/views/pointConfiguration/stationAllocation/index.vue

@@ -6,28 +6,44 @@
           <el-button @click="getBack" style="float: right; margin:0 0 10px 0">返回</el-button>
         </el-row>
         <el-form ref="form" :model="queryForm" :inline="true" @submit.native.prevent>
-          <el-form-item label="编码"><el-input placeholder="请输入" v-model="form.code"></el-input></el-form-item>
-          <el-form-item label="名称"><el-input placeholder="请输入" v-model="form.name"></el-input></el-form-item>
-          <el-form-item label="型号"><el-input placeholder="请输入" v-model="form.model"></el-input></el-form-item>
-          <el-form-item label="统一编码"><el-input placeholder="请输入" v-model="form.uniformcode"></el-input></el-form-item>
-          <el-form-item label="场站编号"><el-input placeholder="请输入" v-model="form.windpowerstationid"></el-input></el-form-item>
-          <!-- <el-form-item label="类型">
-            <el-select v-model="form.type" placeholder="请选择">
+          <el-form-item label="类型">
+            <el-select v-model="form.type" placeholder="请选择" clearable @change="typeChange">
               <el-option
                 v-for="item in typeOptions"
                 :key="item.value"
                 :label="item.label"
-                :value="item.value">
-              </el-option>
+                :value="item.value"
+              ></el-option>
             </el-select>
-          </el-form-item> -->
-          <el-form-item>
-            <el-button icon="el-icon-search" type="primary" native-type="submit" @click="fetchData">查询</el-button>
           </el-form-item>
-          <el-form-item style="float: right;">
-            <el-button icon="el-icon-plus" type="primary" @click="handleAdd">添加</el-button>
-            <el-button icon="el-icon-delete" type="danger" @click="handleDelete">删除</el-button>
+          <el-form-item label="名称">
+            <el-select v-model="form.name" placeholder="请选择" clearable>
+              <el-option
+                v-for="item in nameOptions"
+                :key="item.uniformcode"
+                :label="item.name"
+                :value="item.uniformcode"
+              ></el-option>
+            </el-select>
           </el-form-item>
+          <el-form-item>
+        <el-button
+          icon="el-icon-search"
+          type="primary"
+          native-type="submit"
+          @click="fetchData"
+        >
+          查询
+        </el-button>
+        </el-form-item>
+        <el-form-item style="float: right">
+          <el-button icon="el-icon-plus" type="primary" @click="handleAdd">
+            添加
+          </el-button>
+          <el-button icon="el-icon-delete" type="danger" @click="handleDelete">
+            删除
+          </el-button>
+        </el-form-item>
         </el-form>
       <!-- </vab-query-form-left-panel> -->
       <!-- <vab-query-form-right-panel> -->
@@ -78,17 +94,16 @@ export default {
   },
   data() {
     return {
+      ArrayData: [],
+      nameOptions: [],
       typeOptions: [
-        {value: '风机计算', label:'风机计算'},
-        {value: '场站计算', label:'场站计算'},
-        {value: '风机基础点', label:'风机基础点'},
+        { value: 'fjjs', label: '风机计算' },
+        { value: 'czjs', label: '场站计算' },
+        { value: 'fjjc', label: '风机基础点' },
       ],
-      form :{
-        code: '',
+      form: {
+        type: '',
         name: '',
-        model: '',
-        uniformcode: '',
-        windpowerstationid: '',
       },
       // 
       // fuzzyQuery: '',
@@ -109,9 +124,10 @@ export default {
     };
   },
   created() {
-    this.fetchData()
-    this.form.code = this.showValue.code
+    this.form.type = this.showValue.type
     this.form.name = this.showValue.name
+    this.fetchData()
+    this.typeFetchDataAll()
   },
   computed: {
     height() {
@@ -119,6 +135,45 @@ export default {
     },
   },
   methods: {
+    typeChange(data){
+      this.form.name = ""
+      this.ArrayData.forEach(element => {
+        if(data ===  element.value){
+          this.nameOptions = element.data
+        }
+      });
+    },
+    typeFetchDataAll(){
+      api.standardpointList({
+        id: '',
+        uniformcode: '',
+        name: '',
+        type: '',
+        pageNum: 1,
+        pageSize: 500,
+      }).then(res => {
+        if (res.data) {
+          let data = res.data.records
+          this.typeOptions.forEach((item) => {
+            let obj = {}
+            obj.value = item.value
+            obj.label = item.label
+            obj.data = []
+            data.forEach((element) => {
+              if (element.type == item.value) {
+                obj.data.push(element)
+              }
+            })
+            this.ArrayData.push(obj)
+          })
+          this.ArrayData.forEach(element => {
+            if(element.value == this.showValue.type){
+              this.nameOptions = element.data
+            }
+          });
+        }
+      })
+    },
     getBack(){
       this.$emit("cutState" , 1)
     },
@@ -140,11 +195,11 @@ export default {
       this.listLoading = true
       api.windpowerstationpointnewList({
         id: '',
-        code: this.form.code ? this.form.code : this.showValue.code,
-        name: this.form.name ? this.form.name : this.showValue.name,
-        model: this.form.model,
-        uniformcode: this.form.uniformcode,
-        windpowerstationid: this.form.windpowerstationid,
+        type: this.form.type,
+        name: this.form.name,
+        // model: this.form.model,
+        // uniformcode: this.form.uniformcode,
+        // windpowerstationid: this.form.windpowerstationid,
         pageNum: this.queryForm.pageNo,
         pageSize: this.queryForm.pageSize,
       }).then(res => {

src/views/stationConfiguration/windterbin/index.vue

@@ -5,7 +5,7 @@
         <div class="left">
           <div class="left-item">
             <div style="width: 70px;">名称：</div>
-            <el-input v-model="fuzzyQuery" placeholder="请输入" clearable />
+            <el-input v-model="fuzzyQuery_name" placeholder="请输入" clearable />
           </div>
           <el-button icon="el-icon-search" type="primary" native-type="submit" @click="fetchData">
             查询
@@ -70,7 +70,7 @@ export default {
   },
   data() {
     return {
-      fuzzyQuery: '',
+      fuzzyQuery_name: '',
       listLoading: true,
       list: [],
       options: [],
@@ -129,7 +129,7 @@ export default {
     },
     fetchData() {
       api.windturbine({
-        windpowerstationid: this.selectValue,
+        name: this.fuzzyQuery_name,
         pageNum: this.queryForm.pageNo,
         pageSize: this.queryForm.pageSize,
       }).then(res => {