Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-ui

src/config/componentsMap.js

@@ -131,8 +131,6 @@ export default {
         import ('@/views/report/worklocationCount'),
 
 
-
-
     // 报表分析 => 概览 => 数据统计
     dataCount: () =>
         import ('@/views/report/dataCount'),

src/views/report/maintainCount/index.vue

@@ -6,7 +6,7 @@
               <el-cascader
                 class="filter-item fl form-search-input"
                 @change="handleSearch"
-                placeholder="请选择所属单位"
+                placeholder="请选择所属风场"
                 :options="departments"
                 v-model="queryParam.depart_id"
                 :props="departProps"
@@ -46,7 +46,7 @@
 
     <!-- 表格 -->
     <div class="datatable">
-      <div class="table-title">设备告警统计表</div>
+      <div class="table-title">维保设备</div> 
       <el-table :data="tableData" :span-method="objectSpanMethod" row-key="id" fit border width="100%" >
           <el-table-column label="设备类型" prop="type" align="center" fixed="left"/>
           <el-table-column label="状态" prop="name" align="center" fixed="left"/>

src/views/wind/maintenancemapper/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="queryParam.name" placeholder="型号名称" clearable class="filter-item form-search-input fl" />
+      <el-input v-model="queryParam.name" placeholder="名称" clearable class="filter-item form-search-input fl" />
        <el-select  v-model="queryParam.device_type"  clearable class="filter-item form-search-input fl"  placeholder="请选择设备类型" >
               <el-option
                 v-for="item in deviceTypes"
@@ -27,7 +27,7 @@
     <el-table ref="multipleTable" :data="data" tooltip-effect="dark" style="width: 100%" border fit @selection-change="handleSelectMulti">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="设备类型" prop="device_type_name" align="center"/>
-      <el-table-column label="型号名称" prop="name" align="center"/>
+      <el-table-column label="名称" prop="name" align="center"/>
        <el-table-column label="唯一标识" prop="value" align="center"/>
       <el-table-column prop="created_at" label="创建时间" align="center"/>
       <el-table-column prop="updated_at" label="更新时间" align="center"/>
@@ -79,7 +79,7 @@
         </el-form-item>
       </el-form>
       <el-form :ref="formName" :model="formFieldsData" :rules="rules">
-      <el-form-item label="型号名称" :label-width="formLabelWidth" prop="name">
+      <el-form-item label="名称" :label-width="formLabelWidth" prop="name">
           <el-input v-model="formFieldsData.name" placeholder="请输入名称" style="width: 250px" autocomplete="off" clearable />
         </el-form-item>
         <el-form-item label="唯一标识" :label-width="formLabelWidth" prop="value">

src/views/wind/worklocation/detail.vue

@@ -69,6 +69,10 @@
                 <pre style="display: inline">压   力：</pre>
                 <span class="item">{{ data.pressure }}</span>
               </div>
+              <div class="detail-item">
+                <pre style="display: inline">工作人员：</pre>
+                <span class="item">{{ data.work_name }}</span>
+              </div>
             </el-col>
             <el-col :span="6"></el-col>
           </div>

src/views/wind/worklocation/index.vue

@@ -49,6 +49,15 @@
             @keyup.enter.native="handleSearch"
           />
         </div>
+         <div class="search-item">
+          <el-input  
+            v-model="queryParam.work_name"
+            placeholder="操作人员名称"
+            clearable
+             class="filter-item form-search-input fl"
+            @keyup.enter.native="handleSearch"
+          />
+        </div>
         <div class="search-item"> 
                <el-select
                   v-model="queryParam.work_local"
@@ -261,6 +270,13 @@
         v-if="showColumn.external_diameter"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        prop="work_name"
+        label="工作人员"
+        align="center"
+        v-if="showColumn.work_name"
+        :show-overflow-tooltip="true"
+      />
        <el-table-column
         prop="created_at"
         label="维保时间"
@@ -306,7 +322,9 @@
             <el-checkbox v-model="checkList.torque">扭矩</el-checkbox>
             <el-checkbox v-model="checkList.pressure">压力</el-checkbox>
             <el-checkbox v-model="checkList.external_diameter">外径</el-checkbox>
+            <el-checkbox v-model="checkList.work_name">操作人员</el-checkbox>
             <el-checkbox v-model="checkList.created_at">创建时间</el-checkbox>
+            
           </div>
           <div class="footer">
             <el-button size="small" type="primary" plain @click="saveColumn"
@@ -393,6 +411,7 @@ export default {
         bolt_type:'',
         //时间
         time: "",
+        work_name:"",
       
       },
       defaultQueryParam:['type'],
@@ -428,7 +447,8 @@ export default {
         torque:true,
         pressure:true,
         external_diameter:true,
-        created_at:true
+        created_at:true,
+        work_name:true
       }
     };
   },
@@ -544,7 +564,8 @@ export default {
         torque:true,
         pressure:true,
         external_diameter:true,
-        created_at:true
+        created_at:true,
+        work_name:true
       };
     }
   },