likang

src/views/wind/worklocation/index.vue

@@ -3,7 +3,6 @@
     <div class="filter-container" style="padding-bottom: 0px">
       <div class="search-box-area" id="searchBox">
         <div class="search-item">
-          
           <el-cascader
             class="filter-item form-search-input fl"
             v-model="queryParam.department_id"
@@ -19,26 +18,36 @@
         </div>
         <div class="search-item">
           <el-input
-            v-model="queryParam.number"
-            placeholder="编号"
+            v-model="queryParam.fan_id"
+            placeholder="风场"
             clearable
             class="filter-item form-search-input fl"
             @keyup.enter.native="handleSearch"
           />
         </div>
+         <div class="search-item">
+          <el-input  
+            v-model="queryParam.fan_number"
+            placeholder="风机机位号"
+            clearable
+             class="filter-item form-search-input fl"
+            @keyup.enter.native="handleSearch"
+          />
+        </div>
+
         <div class="search-item">
-          <el-input
-            v-model="queryParam.name"
-            placeholder="名称"
+          <el-input  
+            v-model="queryParam.number"
+            placeholder="编号"
             clearable
-            class="filter-item form-search-input fl"
+             class="filter-item form-search-input fl"
             @keyup.enter.native="handleSearch"
           />
         </div>
         <div class="search-item"> 
                <el-select
-                  v-model="queryParam.model"
-                  placeholder="模型"
+                  v-model="queryParam.work_local"
+                  placeholder="工作位置"
                   class="filter-item form-search-input fl"
                   clearable
                 >
@@ -48,14 +57,58 @@
              :value="item.value"></el-option>
           </el-select>
         </div>
+
+          <div class="search-item"> 
+               <el-select
+                  v-model="queryParam.parts"
+                  placeholder="所属部件"
+                  class="filter-item form-search-input fl"
+                  clearable
+                >
+             <el-option v-for="item in deviceModels" 
+             :key="item.value" 
+             :label="item.text" 
+             :value="item.value"></el-option>
+          </el-select>
+          </div>
+
+           <div class="search-item"> 
+               <el-select
+                  v-model="queryParam.bolt_style"
+                  placeholder="螺栓样式"
+                  class="filter-item form-search-input fl"
+                  clearable
+                >
+             <el-option v-for="item in deviceModels" 
+             :key="item.value" 
+             :label="item.text" 
+             :value="item.value"></el-option>
+          </el-select>
+          </div>
+
+             <div class="search-item"> 
+               <el-select
+                  v-model="queryParam.bolt_type"
+                  placeholder="螺栓型号"
+                  class="filter-item form-search-input fl"
+                  clearable
+                >
+             <el-option v-for="item in deviceModels" 
+             :key="item.value" 
+             :label="item.text" 
+             :value="item.value"></el-option>
+          </el-select>
+          </div>
+        
+
         <div class="search-item">
           <el-select
             v-model="queryParam.is_used"
-            placeholder="使用状态"
+            placeholder="时间段"
             class="filter-item form-search-input fl"
             clearable
           >
-             <el-option value="-2" label="未使用">已报废</el-option>
+             <el-option value="-2" label="未使用">顺序</el-option>
             <el-option value="-1" label="未使用">未使用</el-option>
             <el-option value="1" label="已使用">已使用</el-option>
           </el-select>
@@ -115,7 +168,14 @@
         fixed="left"
         width="55"
       ></el-table-column>
-
+       <el-table-column
+        prop="department_name"
+        label="所属地区"
+        align="center"
+        v-if="showColumn.department_name"
+        :show-overflow-tooltip="true"
+       
+      />
        <el-table-column
         prop="wind_name"
         label="风场名称"
@@ -215,18 +275,7 @@
               @click="handleView(record.row)"
             ></el-button>
           </el-tooltip>
-          <!-- <el-tooltip
-            content="查看"
-            placement="top"
-            :enterable="false"
-          >
-            <el-button
-              type="primary"
-              size="mini"
-              icon="el-icon-view"
-              @click="handleDetail(record.row)"
-            ></el-button>
-          </el-tooltip> -->
+         
         </template>
       </el-table-column>
     </el-table>
@@ -235,6 +284,7 @@
         <div class="content">
           <div class="head">选择显示字段</div>
           <div class="body">
+            <el-checkbox v-model="checkList.department_name">所属地区</el-checkbox>
             <el-checkbox v-model="checkList.wind_name" disabled>风场名称</el-checkbox>
             <el-checkbox v-model="checkList.fan_number" disabled>风机机位号</el-checkbox>
             <el-checkbox v-model="checkList.number">编号</el-checkbox>
@@ -254,14 +304,7 @@
         </div>
       </div>
     </transition>
-    <el-button
-      type="primary"
-      icon="el-icon-plus"
-      :loading="downloadLoading"
-      style="margin-top: 15px"
-      @click="handleCreate"
-      >添加</el-button
-    >
+    
     <el-button
       type="danger"
       icon="el-icon-delete"
@@ -307,6 +350,8 @@ export default {
       queryParam: {
         number: "",
         department_id: [],
+        //风场的id
+        fan_id:"",
         name: "",
         model: "",
         is_used: "",
@@ -331,6 +376,7 @@ export default {
       // 列的配置化对象，存储配置信息
       checkList: {},
       showColumn: {
+        department_name:false,
         wind_name:true,
         fan_number:true,
         number: true,
@@ -427,6 +473,7 @@ export default {
       this.checkList = JSON.parse(localStorage.getItem("WorklocalSet"));
     } else {
       this.checkList = {
+        department_name:false,
          wind_name:true,
         fan_number:true,
         number: true,