fix: 公司管理 , 区域管理 页面字段增加 , 接口入参调整 / 场站配置全部模块表格样式调整 / 测点配置, 按钮显示状态修改

src/api/pointConfiguration.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // 列表
 const standardpointList = (data) => {
   return request({
-    url: `/standardpoint/list?id=${data.id}&code=${data.code}&name=${data.name}&type=${data.type}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    url: `/standardpoint/list?id=${data.id}&uniformcode=${data.uniformcode}&name=${data.name}&type=${data.type}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
     method: 'get',
   })
 }
@@ -28,7 +28,7 @@ const deleteStandardpoint = (data) => {
 // 列表
 const windturbinetestingpointnewList = (data) => {
   return request({
-    url: `/windturbinetestingpointnew/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: `/windturbinetestingpointnew/list?type=${data.type}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
     method: 'get',
   })
 }

src/api/station.js

@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
 const companys=(data)=>{
-  return request({
-      url:`/listByPage?id=${data.id}&name=${data.name}&pagenum=${data.pageNum}&pagesize=${data.pageSize}`,
+  return request({ 
+      url:`/listByPage?id=${data.id}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
       method:"get"
   })
 }

src/views/pointConfiguration/components/TableEdit.vue

@@ -4,8 +4,8 @@
       <!-- <el-form-item label="id" prop="id">
         <el-input placeholder="请输入" class="inputs" v-model.trim="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>
       </el-form-item> -->
-      <el-form-item label="统一编码" prop="code">
-        <el-input placeholder="请输入" class="inputs" v-model.trim="form.code" autocomplete="off"></el-input>
+      <el-form-item label="统一编码" prop="uniformcode">
+        <el-input placeholder="请输入" class="inputs" v-model.trim="form.uniformcode" autocomplete="off"></el-input>
       </el-form-item>
       <el-form-item label="名称" prop="name">
         <el-input placeholder="请输入" class="inputs" v-model.trim="form.name" autocomplete="off"></el-input>
@@ -48,13 +48,13 @@ export default {
       ],
       form: {
         id: '',
-        code: '',
+        uniformcode: '',
         name: '',
         type: '',
       },
       rules: {
         // id: [{ required: true, trigger: 'blur', message: '请输入' }],
-        code: [{ required: true, trigger: 'blur', message: '请输入' }],
+        uniformcode: [{ required: true, trigger: 'blur', message: '请输入' }],
         name: [{ required: true, trigger: 'blur', message: '请输入' }],
         type: [{ required: true, trigger: 'blur', message: '请输入' }],
       },

src/views/pointConfiguration/equipmentAllocation/index.vue

@@ -6,11 +6,26 @@
           <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-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-input placeholder="请输入" v-model="form.windpowerstationid"></el-input></el-form-item> -->
           <!-- <el-form-item label="类型">
             <el-select v-model="form.type" placeholder="请选择">
               <el-option
@@ -39,7 +54,7 @@
       :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="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>
@@ -78,17 +93,50 @@ export default {
   },
   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: '',
+        // code: '',
+        type: '',
         name: '',
-        model: '',
-        uniformcode: '',
-        windpowerstationid: '',
+        // model: '',
+        // uniformcode: '',
+        // windpowerstationid: '',
       },
       // 
       // fuzzyQuery: '',
@@ -109,9 +157,9 @@ 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()
   },
   computed: {
     height() {
@@ -140,11 +188,11 @@ export default {
       this.listLoading = true
       api.windturbinetestingpointnewList({
         id: '',
-        code: this.form.code ? this.form.code : this.showValue.code,
+        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,
+        // model: this.form.model,
+        // uniformcode: this.form.uniformcode,
+        // windpowerstationid: this.form.windpowerstationid,
         pageNum: this.queryForm.pageNo,
         pageSize: this.queryForm.pageSize,
       }).then(res => {

src/views/pointConfiguration/index.vue

@@ -4,7 +4,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-input placeholder="请输入" v-model="form.code"></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.name"></el-input></el-form-item>
             <el-form-item label="类型">
               <el-select v-model="form.type" placeholder="请选择">
@@ -34,15 +34,15 @@
         :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="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="260px">
+        <el-table-column show-overflow-tooltip label="操作" width="200px">
           <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)">设备点表配置</el-button>
-            <el-button type="text" @click="stationAllocation(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>
           </template>
         </el-table-column>
       </el-table>
@@ -80,7 +80,7 @@ export default {
         {value: '风机基础点', label:'风机基础点'},
       ],
       form :{
-        code: '',
+        uniformcode: '',
         name: '',
         type: '',
       },
@@ -140,7 +140,7 @@ export default {
       this.listLoading = true
       api.standardpointList({
         id: '',
-        code: this.form.code,
+        uniformcode: this.form.uniformcode,
         name: this.form.name,
         type: this.form.type,
         pageNum: this.queryForm.pageNo,

src/views/pointConfiguration/stationAllocation/index.vue

@@ -39,7 +39,7 @@
       :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="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>

src/views/stationConfiguration/area/components/TableEdit.vue

@@ -4,11 +4,14 @@
       <el-form-item label="id" prop="id">
         <el-input class="inputs" v-model.trim="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>
       </el-form-item>
-      <el-form-item label="公司名称" prop="name">
+      <el-form-item label="公司编号" prop="companyid">
+        <el-input class="inputs" v-model.trim="form.companyid" autocomplete="off"></el-input>
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
         <el-input class="inputs" v-model.trim="form.name" autocomplete="off"></el-input>
       </el-form-item>
-      <el-form-item label="code" prop="code">
-        <el-input class="inputs" v-model.trim="form.code" autocomplete="off"></el-input>
+      <el-form-item label="别名" prop="aname">
+        <el-input class="inputs" v-model.trim="form.aname" autocomplete="off"></el-input>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -32,13 +35,15 @@ export default {
     return {
       form: {
         id: '',
+        companyid: '',
         name: '',
-        code: '',
+        aname: '',
       },
       rules: {
         id: [{ required: true, trigger: 'blur', message: '请输入' }],
+        companyid: [{ required: true, trigger: 'blur', message: '请输入' }],
         name: [{ required: true, trigger: 'blur', message: '请输入' }],
-        code: [{ required: true, trigger: 'blur', message: '请输入' }],
+        aname: [{ required: true, trigger: 'blur', message: '请输入' }],
       },
       title: '',
       dialogFormVisible: false,

src/views/stationConfiguration/area/index.vue

@@ -6,8 +6,7 @@
           <div class="left-item">
             <div>公司：</div>
             <el-select v-model="selectValue" placeholder="请选择" clearable>
-              <el-option v-for="item in stationList" :key="item.rid" :label="item.name" :value="item.rid">
-              </el-option>
+              <el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </div>
           <div class="left-item">
@@ -30,10 +29,25 @@
       <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="name" 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="操作" width="180px">
+        <el-table-column width="60" show-overflow-tooltip label="id" prop="id" align="center" sortable fixed="left"></el-table-column>
+        <el-table-column width="100" show-overflow-tooltip label="公司编号" prop="companyid" align="center" sortable fixed="left"></el-table-column>
+        <el-table-column width="100" show-overflow-tooltip label="名称" prop="name" align="center" sortable fixed="left"></el-table-column>
+        <el-table-column width="150" show-overflow-tooltip label="别名" prop="aname" align="center" sortable></el-table-column>
+        <el-table-column width="150" show-overflow-tooltip label="风电装机容量" prop="windcapacity" align="center" sortable></el-table-column>
+        <el-table-column width="150" show-overflow-tooltip label="风电容量单位" prop="windcapacityUnit" align="center" sortable></el-table-column>
+        <el-table-column width="150" show-overflow-tooltip label="风电装机数量" prop="windquantity" align="center" sortable></el-table-column>
+        <el-table-column width="150" show-overflow-tooltip label="光伏装机容量" prop="capacity" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="光伏容量单位" prop="capacityUnit" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="光伏装机数量集中" prop="quantityjz" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="光伏装机数量组串" prop="quantityzc" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入风电装机容量2" prop="jrwindcapacity" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位2" prop="jrwindcapacityUnit" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入风电装机数量2" prop="jrwindquantity" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入光伏装机容量2" prop="jrcapacity" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位2" prop="jrcapacityUnit" align="center" sortable></el-table-column>
+        <el-table-column width="190" show-overflow-tooltip label="接入光伏装机数量集中" prop="jrquantityjz" align="center" sortable></el-table-column>
+        <el-table-column width="190" show-overflow-tooltip label="接入光伏装机数量组串" prop="jrquantityzc" align="center" sortable></el-table-column>
+        <el-table-column show-overflow-tooltip label="操作" width="180px" fixed="right">
           <template #default="{ row }">
             <el-button type="text" @click="handleEdit(row)">编辑</el-button>
             <el-button type="text" @click="handleDelete(row)">删除</el-button>
@@ -159,6 +173,7 @@ export default {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
+  margin-bottom: 20px;
 }
 
 .left {

src/views/stationConfiguration/company/index.vue

@@ -27,10 +27,24 @@
     <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="name" align="center" sortable></el-table-column>
-      <el-table-column show-overflow-tooltip label="rid" prop="rid" align="center" sortable></el-table-column>
-      <el-table-column show-overflow-tooltip label="操作" width="180px">
+      <el-table-column show-overflow-tooltip label="id" prop="id" align="center" sortable fixed="left"></el-table-column>
+      <el-table-column width="120" show-overflow-tooltip label="公司名称" prop="name" align="center" sortable fixed="left"></el-table-column>
+      <el-table-column width="120" show-overflow-tooltip label="别名" prop="aname" align="center" sortable></el-table-column>
+      <el-table-column width="130" show-overflow-tooltip label="风电装机容量" prop="windcapacity" align="center" sortable></el-table-column>
+      <el-table-column width="130" show-overflow-tooltip label="风电容量单位" prop="windcapacityUnit" align="center" sortable></el-table-column>
+      <el-table-column width="130" show-overflow-tooltip label="风电装机数量" prop="windquantity" align="center" sortable></el-table-column>
+      <el-table-column width="130" show-overflow-tooltip label="光伏装机容量" prop="capacity" align="center" sortable></el-table-column>
+      <el-table-column width="130" show-overflow-tooltip label="光伏容量单位" prop="capacityUnit" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="光伏装机数量集中" prop="quantityjz" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="光伏装机数量组串" prop="quantityzc" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="接入风电装机容量2" prop="jrwindcapacity" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位2" prop="jrwindcapacityUnit" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="接入风电装机数量2" prop="jrwindquantity" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="接入光伏装机容量2" prop="jrcapacity" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位2" prop="jrcapacityUnit" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="接入光伏装机数量集中" prop="jrquantityjz" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="接入光伏装机数量组串" prop="jrquantityzc" align="center" sortable></el-table-column>
+      <el-table-column show-overflow-tooltip label="操作" width="100px" fixed="right">
         <template #default="{ row }">
           <el-button type="text" @click="handleEdit(row)">编辑</el-button>
           <el-button type="text" @click="handleDelete(row)">删除</el-button>

src/views/stationConfiguration/line/index.vue

@@ -34,7 +34,7 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip label="装机数量" prop="quantity" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="顺序" prop="ordernum" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip label="操作" width="100px">
+        <el-table-column show-overflow-tooltip label="操作" width="100px" fixed="right">
           <template #default="{ row }">
             <el-button type="text" @click="handleEdit(row)">编辑</el-button>
             <el-button type="text" @click="handleDelete(row)">删除</el-button>
@@ -147,6 +147,7 @@ export default {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
+  margin-bottom: 20px;
 }
 
 .left {

src/views/stationConfiguration/period/index.vue

@@ -32,24 +32,24 @@
         <el-table-column show-overflow-tooltip type="selection" width="40"></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 width="120" show-overflow-tooltip label="工程名称" prop="name" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="别称" prop="aname" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip label="装机容量" prop="capacity" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip label="容量单位" prop="capacityunit" align="center" sortable>
+        <el-table-column width="120" show-overflow-tooltip label="装机容量" prop="capacity" align="center" sortable></el-table-column>
+        <el-table-column width="120" show-overflow-tooltip label="容量单位" prop="capacityunit" align="center" sortable>
         </el-table-column>
-        <el-table-column show-overflow-tooltip label="投产日期" prop="commissiondate" align="center" sortable>
+        <el-table-column width="120" show-overflow-tooltip label="投产日期" prop="commissiondate" align="center" sortable>
         </el-table-column>
-        <el-table-column show-overflow-tooltip label="主控电话" prop="masterphone" align="center" sortable>
+        <el-table-column width="120" show-overflow-tooltip label="主控电话" prop="masterphone" 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="ordernum" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip label="装机数量" prop="quantity" align="center" sortable></el-table-column>
+        <el-table-column width="120" show-overflow-tooltip label="装机数量" prop="quantity" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="值长" prop="shiftforeman" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip label="值长电话" prop="shiftforemanphone" align="center" sortable>
+        <el-table-column width="120" show-overflow-tooltip label="值长电话" prop="shiftforemanphone" align="center" sortable>
         </el-table-column>
-        <el-table-column show-overflow-tooltip label="风场编号" prop="windpowerstationid" align="center" sortable>
+        <el-table-column width="120" show-overflow-tooltip label="风场编号" prop="windpowerstationid" align="center" sortable>
         </el-table-column>
-        <el-table-column show-overflow-tooltip label="操作" width="100px">
+        <el-table-column show-overflow-tooltip label="操作" width="100px" fixed="right">
           <template #default="{ row }">
             <el-button type="text" @click="handleEdit(row)">编辑</el-button>
             <el-button type="text" @click="handleDelete(row)">删除</el-button>
@@ -176,6 +176,7 @@ export default {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
+  margin-bottom: 20px;
 }
 
 .left {

src/views/stationConfiguration/station/index.vue

@@ -192,6 +192,7 @@ export default {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
+  margin-bottom: 20px;
 }
 
 .left {

src/views/stationConfiguration/windterbin/index.vue

@@ -40,7 +40,7 @@
         <el-table-column show-overflow-tooltip label="机型" prop="modelid" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="图片" prop="photo" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="标杆风机" prop="standardid" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip label="操作" width="100px">
+        <el-table-column show-overflow-tooltip label="操作" width="100px" fixed="right">
           <template #default="{ row }">
             <el-button type="text" @click="handleEdit(row)">编辑</el-button>
             <el-button type="text" @click="handleDelete(row)">删除</el-button>
@@ -166,6 +166,7 @@ export default {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
+  margin-bottom: 20px;
 }
 
 .left {