Browse Source

BUGxiugai

rui.jiang 1 year ago
parent
commit
c632cbfd72

+ 133 - 126
src/views/ledger/anemometer copy.vue

@@ -68,7 +68,7 @@
           prop="longitude"
           align="center"
           label="经度"
-          width="200"
+          min-width="200"
         >
         </el-table-column>
 
@@ -76,12 +76,17 @@
           prop="latitude"
           align="center"
           label="纬度"
-          width="200"
+          min-width="200"
         >
         </el-table-column>
-        <el-table-column prop="state" align="center" label="状态" width="100">
+        <el-table-column
+          prop="state"
+          align="center"
+          label="状态"
+          min-width="100"
+        >
           <template slot-scope="{ row }">
-            {{ row.state == 1 ? '启用' : '停用' }}
+            {{ row.state == 1 ? "启用" : "停用" }}
           </template>
         </el-table-column>
         <el-table-column prop="createTime" align="center" label="创建时间">
@@ -91,7 +96,7 @@
           align="center"
           fixed="right"
           label="操作"
-          width="200"
+          min-width="200"
         >
           <template slot-scope="scope">
             <el-button @click="compile(scope.row)" type="text" size="small"
@@ -180,7 +185,7 @@
         </div>
         <div
           v-for="(tower, index) in anemometerTowerHeightDtoList || [
-            { anemometerHeight: '' }
+            { anemometerHeight: '' },
           ]"
           :key="index"
           class="condition"
@@ -205,7 +210,7 @@
       <p>测风塔编号:{{ hightower.anemometerCode }}</p>
       <p>经度:{{ hightower.longitude }}</p>
       <p>维度:{{ hightower.latitude }}</p>
-      <p>状态: {{ hightower.state === 1 ? '启用' : '停用' }}</p>
+      <p>状态: {{ hightower.state === 1 ? "启用" : "停用" }}</p>
       <p v-for="(item, index) in cftList" :key="index">
         测风塔高度:{{ item.anemometerHeight }}米
       </p>
@@ -220,29 +225,29 @@ import {
   getAnemometerTower,
   getAnemometerTowerPage,
   updateAnemometerTower,
-  updateAnemometerTowerState
-} from '@/api/ledger.js'
+  updateAnemometerTowerState,
+} from "@/api/ledger.js";
 export default {
   data() {
     return {
       tableData: [],
       formInline: {
-        anemometerName: '',
+        anemometerName: "",
         timeQuantum: [],
         pageNum: 1,
         pageSize: 10,
-        totalSize: 0
+        totalSize: 0,
       },
-      startDate: '',
-      endDate: '',
+      startDate: "",
+      endDate: "",
       // 新增测风塔信息
-      anemometerName: '',
-      latitude: '',
-      longitude: '',
+      anemometerName: "",
+      latitude: "",
+      longitude: "",
       anemometerTowerHeightDtoList: [
         {
-          anemometerHeight: ''
-        }
+          anemometerHeight: "",
+        },
       ],
       errors: [],
       hightower: [],
@@ -250,28 +255,28 @@ export default {
       // 新增信息
       nuedialog: false,
       unusualdialog: false,
-      title: '',
+      title: "",
       isEdit: false,
-      detail: {}
-    }
+      detail: {},
+    };
   },
   created() {
-    this.onSubmit()
+    this.onSubmit();
   },
   methods: {
     rowStyle() {
-      return 'text-align:center'
+      return "text-align:center";
     },
     onDateChange(date) {
       if (Array.isArray(date)) {
-        this.startDate = this.$formatDate(date[0])
-        this.endDate = this.$formatDate(date[1])
+        this.startDate = this.$formatDate(date[0]);
+        this.endDate = this.$formatDate(date[1]);
         if (this.endDate < this.startDate) {
-          this.endDate = this.startDate
+          this.endDate = this.startDate;
         }
       } else {
-        this.startDate = null
-        this.endDate = null
+        this.startDate = null;
+        this.endDate = null;
       }
     },
 
@@ -282,194 +287,196 @@ export default {
         beginTime: this.startDate || undefined,
         endTime: this.endDate || undefined,
         pageNum: this.formInline.pageNum,
-        pageSize: this.formInline.pageSize
-      }
+        pageSize: this.formInline.pageSize,
+      };
       getAnemometerTowerPage(paramsData).then((res) => {
-        this.tableData = res.data.list
-        this.formInline.totalSize = res.data.totalSize
-      })
+        this.tableData = res.data.list;
+        this.formInline.totalSize = res.data.totalSize;
+      });
     },
     // 重置
     reset() {
-      this.formInline.anemometerName = ''
-      this.formInline.timeQuantum = []
-      this.endDate = ''
-      this.startDate = ''
+      this.formInline.anemometerName = "";
+      this.formInline.timeQuantum = [];
+      this.endDate = "";
+      this.startDate = "";
     },
     // 重置
     resetForm() {
-      this.anemometerName = ''
-      this.latitude = ''
-      this.longitude = ''
+      this.anemometerName = "";
+      this.latitude = "";
+      this.longitude = "";
       this.anemometerTowerHeightDtoList = [
         {
-          anemometerHeight: ''
-        }
-      ]
+          anemometerHeight: "",
+        },
+      ];
     },
     //打开新增
     newnuedialog() {
-      this.nuedialog = true
-      this.title = '新增'
+      this.nuedialog = true;
+      this.title = "新增";
     },
     // 新增提交
     newly() {
       const isEmptyAnemometerHeight = this.anemometerTowerHeightDtoList.some(
         (tower) =>
           !tower.anemometerHeight || !tower.anemometerHeight.toString().trim()
-      )
+      );
 
       if (isEmptyAnemometerHeight) {
         this.$message({
-          message: '测风塔高度不能为空',
-          type: 'warning'
-        })
-        return
+          message: "测风塔高度不能为空",
+          type: "warning",
+        });
+        return;
       }
 
       // Other validation checks
       if (!this.anemometerName) {
         this.$message({
-          message: '请填写测风塔名称',
-          type: 'warning'
-        })
-        return
+          message: "请填写测风塔名称",
+          type: "warning",
+        });
+        return;
       }
       if (!this.latitude) {
         this.$message({
-          message: '请填写纬度',
-          type: 'warning'
-        })
-        return
+          message: "请填写纬度",
+          type: "warning",
+        });
+        return;
       }
       if (!this.longitude) {
         this.$message({
-          message: '请填写经度',
-          type: 'warning'
-        })
-        return
+          message: "请填写经度",
+          type: "warning",
+        });
+        return;
       }
       let paramsData = {
         anemometerName: this.anemometerName,
         latitude: this.latitude,
         longitude: this.longitude,
-      }
+      };
       if (!this.isEdit) {
-        paramsData.anemometerTowerHeightDtoList=this.anemometerTowerHeightDtoList
+        paramsData.anemometerTowerHeightDtoList =
+          this.anemometerTowerHeightDtoList;
         createAnemometerTower(paramsData).then((res) => {
-          this.nuedialog = false
-          this.$message.success('新增成功')
-          this.onSubmit()
-        })
+          this.nuedialog = false;
+          this.$message.success("新增成功");
+          this.onSubmit();
+        });
       } else {
-        paramsData.anemometerTowerHeightListDtos=this.anemometerTowerHeightDtoList
-        paramsData.anemometerCode = this.detail.anemometerCode
+        paramsData.anemometerTowerHeightListDtos =
+          this.anemometerTowerHeightDtoList;
+        paramsData.anemometerCode = this.detail.anemometerCode;
         // delete objectval.parentCode
         updateAnemometerTower(paramsData).then((res) => {
-          this.isEdit = false
-          this.nuedialog = false
-          this.onSubmit()
-          this.$message.success('编辑成功')
-        })
+          this.isEdit = false;
+          this.nuedialog = false;
+          this.onSubmit();
+          this.$message.success("编辑成功");
+        });
       }
-      this.resetForm()
+      this.resetForm();
     },
 
     // 查看详情
     particulars(row) {
       getAnemometerTower({ anemometerCode: row.anemometerCode }).then((res) => {
-        this.hightower = res.data
-        this.cftList = res.data.list
-      })
-      this.unusualdialog = true
+        this.hightower = res.data;
+        this.cftList = res.data.list;
+      });
+      this.unusualdialog = true;
     },
     // 启用/停用
     start(row, type) {
       let objectval = {
         anemometerCode: row.anemometerCode,
-        state: type === 0 ? 0 : 1
-      }
+        state: type === 0 ? 0 : 1,
+      };
       updateAnemometerTowerState(objectval).then((res) => {
         this.$message({
-          message: '状态已更新成功',
-          type: 'success'
-        })
+          message: "状态已更新成功",
+          type: "success",
+        });
         // this.$message(`${type === 1 ? '状态已更新成功' : '状态已更新成功'}`);
-        row.state = type === 1 ? 0 : 1
-        this.onSubmit()
-      })
+        row.state = type === 1 ? 0 : 1;
+        this.onSubmit();
+      });
     },
     // 删除
     deleted(row) {
-      console.log(row, 'row')
-      if (row.state == '1') {
+      console.log(row, "row");
+      if (row.state == "1") {
         this.$message({
-          type: 'error',
-          message: '该项处于启用状态,无法删除!'
-        })
-        return
+          type: "error",
+          message: "该项处于启用状态,无法删除!",
+        });
+        return;
       }
-      this.$confirm('此操作将永久删除该文件,是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("此操作将永久删除该文件,是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
           delAnemometerTower({ anemometerCode: row.anemometerCode }).then(
             (res) => {
-              this.onSubmit()
+              this.onSubmit();
               // 执行删除操作
               this.$message({
-                type: 'success',
-                message: '删除成功!'
-              })
+                type: "success",
+                message: "删除成功!",
+              });
             }
-          )
+          );
         })
         .catch(() => {
           // 取消删除
           this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
+            type: "info",
+            message: "已取消删除",
+          });
+        });
     },
 
     // 编辑
     compile(row) {
-      this.title = '编辑'
-      this.isEdit = true
+      this.title = "编辑";
+      this.isEdit = true;
       getAnemometerTower({ anemometerCode: row.anemometerCode }).then((res) => {
-        this.hightower = res.data
-        this.cftList = res.data.list
-        const item = JSON.parse(JSON.stringify(res.data))
-        this.detail = item
-        this.anemometerName = item.anemometerName
-        this.latitude = item.latitude
-        this.longitude = item.longitude
-        this.anemometerTowerHeightDtoList = this.cftList
-        this.nuedialog = true
-      })
+        this.hightower = res.data;
+        this.cftList = res.data.list;
+        const item = JSON.parse(JSON.stringify(res.data));
+        this.detail = item;
+        this.anemometerName = item.anemometerName;
+        this.latitude = item.latitude;
+        this.longitude = item.longitude;
+        this.anemometerTowerHeightDtoList = this.cftList;
+        this.nuedialog = true;
+      });
     },
 
     //分页数据切换
     handleCurrentChange(val) {
-      this.formInline.pageNum = val
-      this.onSubmit()
+      this.formInline.pageNum = val;
+      this.onSubmit();
     },
 
     // 测风塔高度
     addition() {
-      this.anemometerTowerHeightDtoList.push({ anemometerHeight: '' })
+      this.anemometerTowerHeightDtoList.push({ anemometerHeight: "" });
     },
     subtraction() {
       if (this.anemometerTowerHeightDtoList.length > 1) {
         // Ensure at least one input remains
-        this.anemometerTowerHeightDtoList.pop()
+        this.anemometerTowerHeightDtoList.pop();
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

+ 10 - 5
src/views/ledger/anemometer.vue

@@ -68,7 +68,7 @@
           prop="longitude"
           align="center"
           label="经度"
-          width="200"
+          min-width="200"
         >
         </el-table-column>
 
@@ -76,10 +76,15 @@
           prop="latitude"
           align="center"
           label="纬度"
-          width="200"
+          min-width="200"
         >
         </el-table-column>
-        <el-table-column prop="state" align="center" label="状态" width="80">
+        <el-table-column
+          prop="state"
+          align="center"
+          label="状态"
+          min-width="80"
+        >
           <template slot-scope="{ row }">
             {{ row.state == 1 ? "启用" : "停用" }}
           </template>
@@ -88,7 +93,7 @@
           prop="createTime"
           align="center"
           label="创建时间"
-          width="160"
+          min-width="160"
         >
         </el-table-column>
         <el-table-column
@@ -96,7 +101,7 @@
           align="center"
           fixed="right"
           label="操作"
-          width="150"
+          min-width="150"
         >
           <template slot-scope="scope">
             <el-button @click="compile(scope.row)" type="text" size="small"

+ 7 - 5
src/views/ledger/component/windsiteMessage.vue

@@ -57,10 +57,12 @@
         :data="unusualdialogdata.windFieldResourceVos"
         style="width: 100%"
       >
-        <el-table-column prop="fileName" label="文件名"> </el-table-column>
-        <el-table-column prop="type" label="文件类型"> </el-table-column>
+        <el-table-column prop="fileName" label="文件名" min-width="100">
+        </el-table-column>
+        <el-table-column prop="type" label="文件类型" min-width="100">
+        </el-table-column>
 
-        <el-table-column fixed="right" label="操作" width="120">
+        <el-table-column fixed="right" label="操作" min-width="120">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="resource(scope.row)"
@@ -145,7 +147,7 @@ export default {
     },
     // 测试玩
     resource(row) {
-        console.log(row,'row');
+      console.log(row, "row");
       if (row.resourceUrl) {
         const link = document.createElement("a");
         link.href = row.resourceUrl;
@@ -205,4 +207,4 @@ export default {
     font-size: 14px;
   }
 }
-</style>
+</style>

+ 24 - 6
src/views/ledger/component/windsitetower.vue

@@ -18,19 +18,36 @@
           prop="engineName"
           align="center"
           label="风机名称"
+          min-width="100"
         >
         </el-table-column>
-        <el-table-column prop="fieldCode" align="center" label="风机编号">
+        <el-table-column
+          prop="fieldCode"
+          align="center"
+          label="风机编号"
+          min-width="150"
+        >
         </el-table-column>
-        <el-table-column prop="machineTypeCode" align="center" label="风机机型">
+        <el-table-column
+          prop="machineTypeCode"
+          align="center"
+          label="风机机型"
+          min-width="100"
+        >
         </el-table-column>
         <el-table-column
           prop="manufacturerName"
           align="center"
           label="主机厂商"
+          min-width="100"
         >
         </el-table-column>
-        <el-table-column prop="sightcing" align="center" label="是否标杆">
+        <el-table-column
+          prop="sightcing"
+          align="center"
+          label="是否标杆"
+          min-width="100"
+        >
           <template slot-scope="scope">
             <span
               v-if="scope.row.sightcing === 1 || scope.row.sightcing === '是'"
@@ -48,27 +65,28 @@
           prop="elevationHeight"
           align="center"
           label="海拔高度/米"
-          width="120"
+          min-width="120"
         >
         </el-table-column>
         <el-table-column
           prop="longitude"
           align="center"
           label="经度"
-          width="80"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="latitude"
           align="center"
           label="纬度"
-          width="80"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="ratedCapacity"
           align="center"
           label="额定容量(kW)"
+          min-width="100"
         >
         </el-table-column>
       </el-table>

+ 15 - 11
src/views/ledger/draught.vue

@@ -67,14 +67,14 @@
           prop="longitude"
           align="center"
           label="经度"
-          width="100"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="latitude"
           align="center"
           label="纬度"
-          width="100"
+          min-width="100"
         >
         </el-table-column>
 
@@ -82,20 +82,25 @@
           prop="elevationHeight"
           align="center"
           label="海拔高度/米"
-          width="100"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="sightcing"
           align="center"
           label="是否标杆"
-          width="80"
+          min-width="80"
         >
           <template slot-scope="{ row }">
             {{ row.sightcing == 1 ? "是" : "否" }}
           </template>
         </el-table-column>
-        <el-table-column prop="state" align="center" label="状态" width="80">
+        <el-table-column
+          prop="state"
+          align="center"
+          label="状态"
+          min-width="80"
+        >
           <template slot-scope="{ row }">
             {{ row.state == 1 ? "启用" : "停用" }}
           </template>
@@ -104,7 +109,7 @@
           prop="createTime"
           align="center"
           label="创建时间"
-          width="140"
+          min-width="140"
         >
         </el-table-column>
 
@@ -113,7 +118,7 @@
           align="center"
           fixed="right"
           label="操作"
-          width="160"
+          min-width="160"
         >
           <template slot-scope="scope">
             <el-button @click="compile(scope.row)" type="text" size="small"
@@ -301,9 +306,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-
         </div>
-    
       </el-form>
       <div class="form-buttons">
         <el-button type="primary" @click="submitForm('ruleForm')"
@@ -351,7 +354,6 @@
           <p>纬度:</p>
           <span>{{ particularsdata.latitude }}°</span>
         </div>
-  
 
         <div class="condition">
           <p>轮毂高度:</p>
@@ -409,7 +411,6 @@ export default {
         latitude: "",
         hubHeight: "",
         sightcing: "",
-   
       },
       fieldCodeOptions: [],
       millTypeCodeOptions: [],
@@ -607,7 +608,10 @@ thisrow:"",
           latitude: this.ruleForm.latitude,
           hubHeight: this.ruleForm.hubHeight,
           sightcing: this.ruleForm.sightcing,
+<<<<<<< HEAD
           engineCode:this.thisrow
+=======
+>>>>>>> 3bd7185b7f7775a80db9fefcddb4d0905ab712bc
         };
 
         if (valid) {

+ 41 - 10
src/views/ledger/enterprise.vue

@@ -57,7 +57,7 @@
           prop="fieldCount"
           align="center"
           label="风场数量"
-          width="200"
+          min-width="200"
         >
           <template slot-scope="scope">
             <el-button @click="particulars(scope.row)" type="text" size="small">
@@ -66,7 +66,12 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="state" align="center" label="状态" width="200">
+        <el-table-column
+          prop="state"
+          align="center"
+          label="状态"
+          min-width="200"
+        >
           <template slot-scope="{ row }">
             {{ row.state == 1 ? "启用" : "停用" }}
           </template>
@@ -81,7 +86,7 @@
           align="center"
           fixed="right"
           label="操作"
-          width="200"
+          min-width="200"
         >
           <template slot-scope="scope">
             <el-button @click="compile(scope.row)" type="text" size="small"
@@ -197,28 +202,54 @@
         max-height="500"
       >
         <!-- Table Columns -->
-        <el-table-column fixed prop="fieldName" align="center" label="风场名称">
+        <el-table-column
+          fixed
+          prop="fieldName"
+          align="center"
+          label="风场名称"
+          min-width="150"
+        >
         </el-table-column>
-        <el-table-column prop="provinceName" align="center" label="所在省">
+        <el-table-column
+          prop="provinceName"
+          align="center"
+          label="所在省"
+          min-width="100"
+        >
         </el-table-column>
-        <el-table-column prop="cityName" align="center" label="所在市">
+        <el-table-column
+          prop="cityName"
+          align="center"
+          label="所在市"
+          min-width="100"
+        >
         </el-table-column>
         <el-table-column
           prop="elevationHeight"
           align="center"
           label="海拔高度/米"
-          width="80"
+          min-width="100"
         >
         </el-table-column>
-        <el-table-column prop="longitude" align="center" label="经度">
+        <el-table-column
+          prop="longitude"
+          align="center"
+          label="经度"
+          min-width="100"
+        >
         </el-table-column>
-        <el-table-column prop="latitude" align="center" label="纬度">
+        <el-table-column
+          prop="latitude"
+          align="center"
+          label="纬度"
+          min-width="100"
+        >
         </el-table-column>
         <el-table-column
           prop="ratedCapacityNumber"
           align="center"
           label="额定容量/kW"
-          width="80"
+          min-width="100"
         >
         </el-table-column>
       </el-table>

+ 17 - 10
src/views/ledger/milltype.vue

@@ -74,7 +74,7 @@
           prop="curvedMotionType"
           align="center"
           label="机型类型"
-          width="120"
+          min-width="120"
         >
           <template v-slot="scope">
             <!-- 假设 type 为 123 时显示特殊内容 -->
@@ -87,7 +87,7 @@
           prop="manufacturerName"
           align="center"
           label="厂商名称"
-          width="200"
+          min-width="200"
         >
         </el-table-column>
 
@@ -95,22 +95,32 @@
           prop="brand"
           align="center"
           label="品牌名称"
-          width="200"
+          min-width="200"
         >
         </el-table-column>
-        <el-table-column prop="state" align="center" label="状态" width="100">
+        <el-table-column
+          prop="state"
+          align="center"
+          label="状态"
+          min-width="100"
+        >
           <template slot-scope="{ row }">
             {{ row.state == 1 ? "启用" : "停用" }}
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" align="center" label="创建时间">
+        <el-table-column
+          prop="createTime"
+          align="center"
+          label="创建时间"
+          min-width="150"
+        >
         </el-table-column>
         <el-table-column
           prop="transition"
           align="center"
           fixed="right"
           label="操作"
-          width="200"
+          min-width="200"
         >
           <template slot-scope="scope">
             <el-button @click="compile(scope.row)" type="text" size="small"
@@ -232,10 +242,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="额定风速:" prop="ratedWindSpeed">
-            <el-input
-              v-model="ruleForm.ratedWindSpeed"
-              size="small"
-            ></el-input>
+            <el-input v-model="ruleForm.ratedWindSpeed" size="small"></el-input>
           </el-form-item>
         </div>
         <div class="form-row">

+ 22 - 7
src/views/ledger/windsite copy.vue

@@ -59,7 +59,7 @@
           prop="windCompany"
           align="center"
           label="风机数量"
-          width="80"
+          min-width="100"
         >
           <template slot-scope="scope">
             <el-button @click="ONdraught(scope.row)" type="text" size="small">{{
@@ -72,7 +72,7 @@
           align="center"
           prop="abnormal"
           label="测风塔"
-          width="70"
+          min-width="70"
         >
           <template slot-scope="scope">
             <el-button
@@ -84,20 +84,35 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="provinceName" align="center" label="所在省">
+        <el-table-column
+          prop="provinceName"
+          align="center"
+          min-width="100"
+          label="所在省"
+        >
         </el-table-column>
-        <el-table-column prop="cityName" align="center" label="所在市">
+        <el-table-column
+          prop="cityName"
+          align="center"
+          min-width="100"
+          label="所在市"
+        >
         </el-table-column>
 
         <el-table-column
           prop="createTime"
           align="center"
           label="创建时间"
-          width="160"
+          min-width="160"
         >
         </el-table-column>
 
-        <el-table-column prop="state" align="center" label="状态" width="80">
+        <el-table-column
+          prop="state"
+          align="center"
+          label="状态"
+          min-width="80"
+        >
           <template slot-scope="{ row }">
             {{ row.state == 1 ? "启用" : "停用" }}
           </template>
@@ -107,7 +122,7 @@
           align="center"
           fixed="right"
           label="操作"
-          width="200"
+          min-width="200"
         >
           <template slot-scope="scope">
             <el-button @click="compile(scope.row)" type="text" size="small"

+ 21 - 6
src/views/ledger/windsite.vue

@@ -59,7 +59,7 @@
           prop="windCompany"
           align="center"
           label="风机数量"
-          width="80"
+          min-width="80"
         >
           <template slot-scope="scope">
             <el-button @click="ONdraught(scope.row)" type="text" size="small">{{
@@ -72,7 +72,7 @@
           align="center"
           prop="abnormal"
           label="测风塔"
-          width="70"
+          min-width="70"
         >
           <template slot-scope="scope">
             <el-button
@@ -84,20 +84,35 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="provinceName" align="center" label="所在省">
+        <el-table-column
+          prop="provinceName"
+          align="center"
+          min-width="100"
+          label="所在省"
+        >
         </el-table-column>
-        <el-table-column prop="cityName" align="center" label="所在市">
+        <el-table-column
+          prop="cityName"
+          align="center"
+          min-width="100"
+          label="所在市"
+        >
         </el-table-column>
 
         <el-table-column
           prop="createTime"
           align="center"
           label="创建时间"
-          width="160"
+          min-width="160"
         >
         </el-table-column>
 
-        <el-table-column prop="state" align="center" label="状态" width="80">
+        <el-table-column
+          prop="state"
+          align="center"
+          label="状态"
+          min-width="80"
+        >
           <template slot-scope="{ row }">
             {{ row.state == 1 ? "启用" : "停用" }}
           </template>

+ 21 - 6
src/views/performance/batchMag.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:23:37
- * @LastEditTime: 2024-07-05 16:03:11
+ * @LastEditTime: 2024-07-10 10:26:17
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/batchMag.vue
@@ -66,17 +66,27 @@
         border
         :cell-style="rowStyle"
       >
-        <el-table-column align="center" label="批次名称" prop="batchName">
+        <el-table-column
+          align="center"
+          min-width="100"
+          label="批次名称"
+          prop="batchName"
+        >
         </el-table-column>
         <!-- <el-table-column align="center" label="批次编号" prop="batchCode">
         </el-table-column> -->
-        <el-table-column prop="fieldName" align="center" label="关联风场">
+        <el-table-column
+          prop="fieldName"
+          align="center"
+          min-width="100"
+          label="关联风场"
+        >
         </el-table-column>
         <el-table-column
           prop="batchState"
           align="center"
           label="状态"
-          width="100"
+          min-width="100"
         >
           <template slot-scope="scope">
             <span>
@@ -90,14 +100,19 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" align="center" label="创建时间">
+        <el-table-column
+          prop="createTime"
+          align="center"
+          min-width="150"
+          label="创建时间"
+        >
         </el-table-column>
         <el-table-column
           prop="transition"
           align="center"
           fixed="right"
           label="操作"
-          width="200"
+          min-width="200"
         >
           <template slot-scope="scope">
             <el-button

+ 1 - 1
src/views/performance/components/abnormalDetail.vue

@@ -98,7 +98,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="150" align="center">
+      <el-table-column label="操作" min-width="150" align="center">
         <template slot-scope="scope">
           <el-button
             v-if="!scope.row.isEditing"

+ 1 - 1
src/views/system/menuMag/index.vue

@@ -84,7 +84,7 @@
           prop="permissionState"
           label="状态"
           align="center"
-          width="80"
+          min-width="80"
         >
           <template slot-scope="scope">
             <span>{{ scope.row.permissionState === 1 ? "启用" : "停用" }}</span>