预警分析模块BUG修复

src/components/coms/table/table2.vue

@@ -13,6 +13,7 @@
       :prop="col.field"
       :label="col.name"
       :width="col.width"
+      :min-width="col.minWidth"
       :sortable="col.sortable"
       :show-overflow-tooltip="!col.slot"
       :fixed="col.fixed"

src/views/NewPages/alarm-center-1.vue

@@ -6,8 +6,18 @@
           <div class="query-item">
             <div class="lable">风场：</div>
             <div class="search-input">
-              <el-select v-model="wpvalue" clearable placeholder="请选择" popper-class="select">
-                <el-option v-for="item in wpoptions" :key="item.id" :label="item.name" :value="item.id">
+              <el-select
+                v-model="wpvalue"
+                clearable
+                placeholder="请选择"
+                popper-class="select"
+              >
+                <el-option
+                  v-for="item in wpoptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
                 </el-option>
               </el-select>
             </div>
@@ -15,53 +25,76 @@
           <div class="query-item">
             <div class="lable">开始日期：</div>
             <div class="search-input">
-              <el-date-picker v-model="startdate" type="date" placeholder="选择日期" popper-class="date-select">
+              <el-date-picker
+                v-model="startdate"
+                type="date"
+                placeholder="选择日期"
+                popper-class="date-select"
+              >
               </el-date-picker>
             </div>
           </div>
           <div class="query-item">
             <div class="lable">结束日期：</div>
             <div class="search-input">
-              <el-date-picker v-model="enddate" type="date" placeholder="选择日期" popper-class="date-select">
+              <el-date-picker
+                v-model="enddate"
+                type="date"
+                placeholder="选择日期"
+                popper-class="date-select"
+              >
               </el-date-picker>
             </div>
           </div>
           <div class="query-item">
             <div class="lable">规则：</div>
-            <el-cascader style="width: 240px" size="mini" popper-class="search-select" :options="cascaderOptions"
-              :props="cascaderProps" v-model="cascaderSel" collapse-tags :clearable='true'></el-cascader>
+            <el-cascader
+              style="width: 240px"
+              size="mini"
+              popper-class="search-select"
+              :options="cascaderOptions"
+              :props="cascaderProps"
+              v-model="cascaderSel"
+              collapse-tags
+              :clearable="true"
+            ></el-cascader>
           </div>
         </div>
         <div class="query-actions">
           <button class="btn green" @click="searchData">搜索</button>
           <button class="btn green" @click="searchTree">筛选</button>
-          <button class="btn green">导出</button>
         </div>
       </div>
     </div>
     <panel-3 class="table-panel">
-      <table-2 :data="tableData" :height="'88vh'">
+      <table-2 :data="tableData" :height="'85vh'">
         <template v-for="(item, i) in column" :key="i" #[item]="scope">
           <div class="bar">
-            <div class="bar-percent" :style="{
+            <div
+              class="bar-percent"
+              :style="{
                 width:
                   (scope.data.count &&
                     scope.data.count / (scope.data.count + scope.data.time)) *
                     100 +
                   'px',
-              }"></div>
+              }"
+            ></div>
             <span class="value">{{
               scope.data.count && scope.data.count
-              }}</span>
+            }}</span>
           </div>
           <div class="bar">
-            <div class="bar-percent" :style="{
+            <div
+              class="bar-percent"
+              :style="{
                 width:
                   (scope.data.count &&
                     scope.data.time / (scope.data.count + scope.data.time)) *
                     100 +
                   'px',
-              }"></div>
+              }"
+            ></div>
             <span class="value">{{ scope.data.count && scope.data.time }}</span>
           </div>
         </template>
@@ -75,7 +108,7 @@ import Panel3 from "../../components/coms/panel/panel3.vue";
 import Table2 from "../../components/coms/table/table2.vue";
 export default {
   components: { Panel3, Table2 },
-  data () {
+  data() {
     return {
       wpvalue: "",
       wpoptions: "",
@@ -94,36 +127,48 @@ export default {
         {
           name: "风机编号",
           field: "name",
+          width: "100px",
+          minWidth: "100px",
         },
         {
           name: "风机偏航过程震动",
           field: "风机偏航过程震动",
           align: "left",
           slot: true,
+          sortable: true,
+          minWidth: "200px",
         },
         {
           name: "齿轮箱轴承温升超过40度",
           field: "齿轮箱轴承温升超过40度",
           align: "left",
           slot: true,
+          sortable: true,
+          minWidth: "200px",
         },
         {
           name: "三相电流不平衡",
           field: "三相电流不平衡",
           align: "left",
           slot: true,
+          sortable: true,
+          minWidth: "200px",
         },
         {
           name: "断轴或联轴器打滑",
           field: "断轴或联轴器打滑",
           align: "left",
           slot: true,
+          sortable: true,
+          minWidth: "200px",
         },
         {
           name: "风速突变",
           align: "left",
           field: "风速突变",
           slot: true,
+          sortable: true,
+          minWidth: "200px",
         },
       ],
       startdate: new Date(
@@ -161,27 +206,26 @@ export default {
       },
     };
   },
-  created () {
+  created() {
     this.search();
   },
   methods: {
-    tabSelect (tab) { },
-    async search () {
+    tabSelect(tab) {},
+    async search() {
       const { data } = await this.API.requestData({
         subUrl: "powercompare/windfarmAjax",
       });
-      console.warn(data);
       this.wpoptions = data.data;
       this.wpvalue = data.data[0].id;
       this.searchData();
     },
-    async searchTree () {
-      console.warn(this.cascaderSel);
+    async searchTree() {
       let arr = [];
       let columnObj = [
         {
           name: "风机编号",
           field: "name",
+          minWidth: "100px",
         },
       ];
       this.cascaderSel.forEach((e) => {
@@ -190,6 +234,8 @@ export default {
           field: e[1],
           align: "left",
           slot: true,
+          sortable: true,
+          minWidth: "200px",
         };
         columnObj.push(obj);
 
@@ -197,10 +243,9 @@ export default {
       });
       this.columnObj = columnObj;
       this.column = arr;
-      this.searchData()
-      console.warn(arr);
+      this.searchData();
     },
-    async searchData () {
+    async searchData() {
       const { data } = await this.API.requestData({
         baseURL: "http://192.168.1.18:8075/",
         subUrl: "alarm/count/query/new",
@@ -210,7 +255,6 @@ export default {
           enddate: new Date(this.enddate).formatDate("yyyy-MM-dd"),
         },
       });
-      console.warn(data);
       ////////
       const resData = data.data;
       // const resData =this.resdata;
@@ -234,7 +278,6 @@ export default {
         });
         dataAll.push(obj);
       });
-      console.info(dataAll);
       this.tableData.column = column;
       this.tableData.data = dataAll;
       ///////////////////// 获取规则list
@@ -261,7 +304,6 @@ export default {
       var cascaderOptions = [];
       var root = {}; // 原始根节点
       var clumnsOnes = nmap[windNum[0]];
-      console.warn(clumnsOnes);
       for (let k in clumnsOnes) {
         let f = clumnsOnes[k].relatePartsText
           ? clumnsOnes[k].relatePartsText
@@ -297,7 +339,7 @@ export default {
         }
       }
       this.cascaderOptions = cascaderOptions;
-      console.warn(cascaderOptions);
+      console.log(123123, dataAll);
     },
   },
 };