likang

.env.development

@@ -3,5 +3,6 @@ ENV = 'development'
 
 # base api
 #VUE_APP_BASE_API = 'http://wxt.rltest.cn:8102'
-VUE_APP_BASE_API = 'http://192.168.1.77/'
+#VUE_APP_BASE_API = 'http://192.168.1.77/'
+VUE_APP_BASE_API = 'http://192.168.1.91/'
 #VUE_APP_BASE_API = 'http://192.168.1.63:8000'

src/config/componentsMap.js

@@ -62,7 +62,7 @@ export default {
     maintenance: () => import ('@/views/device/maintenance'),
     wind: () =>  import ('@/views/wind/wind'),
     fan: () =>  import ('@/views/wind/fan'),
-    worklocation: () => import ('@/views/work_record/worklocation'),
+    work_record: () => import ('@/views/work_record/work_record'),
     //作业记录参数 映射表
     maintenancemapper: () => import ('@/views/work_record/maintenancemapper'),
     //作业位置管理表

src/views/work_record/maintenancemapper/index.vue

@@ -2,14 +2,11 @@
   <div class="app-container">
     <div class="filter-container">
       <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"
-                :key="item.value"
-                :label="item.text"
-                :value="item.value">
-              </el-option>
-        </el-select>
+      <el-select v-model="queryParam.device_type" clearable class="filter-item form-search-input fl"
+        placeholder="请选择设备类型">
+        <el-option v-for="item in deviceTypes" :key="item.value" :label="item.text" :value="item.value">
+        </el-option>
+      </el-select>
       <el-button class="filter-item search fl" icon="el-icon-search" @click="handleSearch">
         搜索
       </el-button>
@@ -24,20 +21,21 @@
         批量删除
       </el-button> -->
     </div>
-    <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 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="风机型号" align="center">
-          <template slot-scope="scope">
-              <p  v-if="scope.row.fan_model_name">{{scope.row.fan_model_name}}</p>
-              <p  v-else>无</p>
-            </template>
+        <template slot-scope="scope">
+          <p v-if="scope.row.fan_model_name">{{scope.row.fan_model_name}}</p>
+          <p v-else>无</p>
+        </template>
       </el-table-column>>
-      <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"/>
+      <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" />
       <el-table-column label="操作" width="200px" align="center">
         <template slot-scope="word">
           <el-button type="primary" icon="el-icon-edit" @click="handleUpdate(word.row)" />
@@ -45,63 +43,47 @@
         </template>
       </el-table-column>
     </el-table>
-        <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"
-      v-if="selectedIds.length > 0"
-      style="margin-top: 15px"
-      @click="handleMultiDelete()"
-      >删除</el-button
-    >
-    <el-pagination
-      background
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="paginate.current"
-       class="pagination-container"
-      :page-sizes="paginate.sizes"
-      :page-size="paginate.limit"
-      :layout="paginate.layout"
-      :total="paginate.total"/>
+    <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" v-if="selectedIds.length > 0" style="margin-top: 15px"
+      @click="handleMultiDelete()">删除</el-button>
+    <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+      :current-page="paginate.current" class="pagination-container" :page-sizes="paginate.sizes"
+      :page-size="paginate.limit" :layout="paginate.layout" :total="paginate.total" />
     <!----------------------------------- 部门 ---------------------------------------------->
     <el-dialog :title="title" @open="open" :visible.sync="formVisible" @close="handleCancel" width="500px">
       <el-form :ref="formName" :model="formFieldsData" :rules="rules">
         <el-form-item label="设备类型" :label-width="formLabelWidth" prop="device_type">
-          <el-select  v-model="formFieldsData.device_type"  clearable  style="width: 250px"  placeholder="请选择设备类型" @change="change_type">
-              <el-option
-                v-for="item in deviceTypes"
-                :key="item.value"
-                :label="item.text"
-                :value="item.value">
-              </el-option>
+          <el-select v-model="formFieldsData.device_type" clearable style="width: 250px" placeholder="请选择设备类型"
+            @change="change_type">
+            <el-option v-for="item in deviceTypes" :key="item.value" :label="item.text" :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
       </el-form>
       <el-form :ref="formName" :model="formFieldsData" :rules="rules">
-      
-      <el-form-item label="风机型号" :label-width="formLabelWidth"  prop="fan_model" v-if="isShow"  :required="isShow" >
-          <el-select  v-model.number="formFieldsData.fan_model"  clearable  style="width: 250px"  placeholder="请选择风机类型" >
-              <el-option
-                v-for="item in fan_models"
-                :key="item.value"
-                :label="item.text"
-                :value="item.value">
-              </el-option>
+
+        <el-form-item label="风机型号" :label-width="formLabelWidth" prop="fan_model" v-if="isShow" :required="isShow">
+          <el-select v-model.number="formFieldsData.fan_model" clearable style="width: 250px" placeholder="请选择风机类型">
+            <el-option v-for="item in fan_models" :key="item.value" :label="item.text" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="部件" :label-width="formLabelWidth" prop="parts" v-if="isShow" :required="isShow">
+          <el-select v-model="formFieldsData.parts" clearable style="width: 250px" placeholder="请选择部件">
+            <el-option v-for="item in partlist" :key="item.name" :label="item.name" :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
-      <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 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">
-          <el-input v-model="formFieldsData.value" placeholder="请输入唯一标识" style="width: 250px" autocomplete="off" clearable />
+          <el-input v-model="formFieldsData.value" placeholder="请输入唯一标识" style="width: 250px" autocomplete="off"
+            clearable />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -126,14 +108,16 @@ export default {
         name: '',
       },
       deviceTypes:[],
-      fan_models:[],
+      fan_models: [],
+      partlist: [],
       formVisible: false,
       isShow:false,
       formFieldsData: {
         name: '',
         device_type:'',
         value:'',
-        fan_model:''
+        fan_model: '',
+        parts:''
       },
       url: 'maintenance_mapper',
       // 表单验证
@@ -153,7 +137,10 @@ export default {
      });
       this.$http.get("get_device_mold?type=4").then(resp => {
         this.fan_models = resp.data
-     });
+      });
+    this.$http.get("get_mainten_option?type=1").then(resp => {
+      this.partlist = resp.data
+    });
 
   },
   methods:{
@@ -165,7 +152,8 @@ export default {
       }
       else
       {
-        this.formFieldsData.fan_model=null;
+        this.formFieldsData.fan_model = null;
+        this.formFieldsData.parts = null;
         this.isShow=false;
       }
     },

src/views/work_record/worklocation/formModel.vue

@@ -33,7 +33,7 @@ export default {
         info: "",
 
       }, 
-      url: "workLocation",
+      url: "workRecord",
       formConfig: {
         readonly:true,
         isShowSubmitBtn:false,

src/views/work_record/worklocation/index.vue

@@ -186,7 +186,6 @@
         align="center"
         v-if="showColumn.id"
         :show-overflow-tooltip="true"
-       
       />
 
        <el-table-column
@@ -214,20 +213,14 @@
         
       />
       <el-table-column
-        prop="number"
-        label="编号"
+        prop="fan_model"
+        label="风机模型"
         align="center"
-        v-if="showColumn.number"
+        v-if="showColumn.fan_model"
         :show-overflow-tooltip="true"
         
       />
-      <el-table-column
-        prop="work_local_name"
-        label="工作位置"
-        align="center"
-        v-if="showColumn.work_local"
-        :show-overflow-tooltip="true"
-      />
+  
       <el-table-column
         prop="parts_name"
         label="所属部件"
@@ -236,38 +229,24 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        prop="bolt_style_name"
-        label="螺栓样式"
-        align="center"
-        v-if="showColumn.bolt_style"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
         prop="boit_type_name"
         label="螺栓型号"
         align="center"
         v-if="showColumn.boit_type"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
-        prop="torque"
-        label="扭矩"
-        align="center"
-        v-if="showColumn.torque"
-        :show-overflow-tooltip="true"
-      />
-       <el-table-column
-        prop="pressure"
-        label="压力"
+        <el-table-column
+        prop="work_local_name"
+        label="工作位置"
         align="center"
-        v-if="showColumn.pressure"
+        v-if="showColumn.work_local"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        prop="external_diameter"
-        label="外径"
+        prop="imei"
+        label="imei号"
         align="center"
-        v-if="showColumn.external_diameter"
+        v-if="showColumn.imei"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -279,9 +258,9 @@
       />
        <el-table-column
         prop="created_at"
-        label="维保时间"
+        label="紧固时间"
         align="center"
-        v-if="showColumn.external_diameter"
+        v-if="showColumn.fastening_time"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -385,7 +364,7 @@ export default {
   },
   data() {
     return {
-      url: "worklocation",
+      url: "workRecord",
       loading:false,
       windoptions:[],
       //工作位置