likang

src/config/componentsMap.js

@@ -109,6 +109,7 @@ export default {
         import ('@/views/device/synscheme'),
     device_mold: () =>
         import ('@/views/device/mold'),
+
     // stolenVehicles: () => import('@/views/yunying/vehicle/stolen'),
     // 短信平台
     sms: () =>
@@ -182,5 +183,8 @@ export default {
     // 围栏列表
     fence: () =>
         import ('@/views/fence/index'),
+    //设备类型
+    equipmentType: () =>
+        import ('@/views/equipment/equipment_type')
 
 }

src/views/device/wrench/checkDetail.vue

@@ -0,0 +1,132 @@
+<template>
+    <el-dialog :modal="false" title="校验记录详情" :visible.sync="drowDetailVisible">
+        <el-row>
+          <div style="margin-bottom: 30px; margin-left: 50px ">
+            <el-col
+              :span="6"
+              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
+            >
+              <div class="detail-item">
+                <pre style="display: inline">扳手编号:</pre>
+                <span class="item">{{ record.wrenchNumber}}</span>
+              </div>
+              <div class="detail-item">
+                <pre style="display: inline">外观检查：</pre>
+                <span class="item">{{ record.inspectionVisual==1?'合格':'不合格' }}</span>
+              </div>
+             
+              <div class="detail-item">
+                <span>检测结果：</span>
+                <span class="item">{{ record.preload_three_results==1?'合格':'不合格' }}</span>
+              </div>
+            </el-col>
+            <el-col
+              :span="6"
+             style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
+            >
+               <div class="detail-item">
+                <pre style="display: inline">校准人：</pre>
+                <span class="item">{{ record.CalibratorName }}</span>
+              </div>
+              <div class="detail-item">
+                <span>校验人：</span>
+                <span class="item">{{ record.CheckName}}</span>
+              </div>
+              <div class="detail-item">
+                <span>签发人: </span>
+                <span class="item">{{ record.IssueName }}</span>
+              </div>
+            </el-col>
+            <el-col
+              :span="6"
+              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
+            >
+              <div class="detail-item">
+                <pre style="display: inline">校准日期：</pre>
+                <span class="item">{{ record.CalibratorDate}}</span>
+              </div>
+              <div class="detail-item">
+                <pre style="display: inline">校验日期：</pre>
+                <span class="item">{{ record.CheckDate }}</span>
+              </div>
+              <div class="detail-item">
+                <span>签发日期：</span>
+                <span class="item">{{ record.IssueDate }}</span>
+              </div>
+              
+            </el-col>
+            <el-col :span="6"></el-col>
+          </div>
+        </el-row>
+
+        <el-table :data="gridData" style="width: 100%">
+            <el-table-column property="stress" label="压力" ></el-table-column>
+            <el-table-column property="torque" label="扭矩" ></el-table-column>
+        </el-table>
+        
+    </el-dialog>
+</template>
+<script>
+
+  export default {
+    props: ["checkDetailVisible", "record"],
+    data() {
+      return {
+        gridData:[],
+        form: {
+          name: '',
+          region: '',
+          date1: '',
+          date2: '',
+          delivery: false,
+          type: [],
+          resource: '',
+          desc: ''
+        },
+        formLabelWidth: '160px'
+      };
+    },
+    computed:{
+        drowDetailVisible:{
+            set(val) {
+                this.$emit("sendVal", val); // 表示将子组件改变的值传递给父组件
+            },
+            get() {
+               this.$http.get("wrenchCheckRecordData?id="+this.record.id).then((response) => {
+                  this.gridData = response.data;
+                });
+                return this.checkDetailVisible; // 表示获取父组件的值
+            }
+        }
+        
+    },
+
+
+  };
+</script>
+<style scoped>
+.table {
+  margin: 0 auto;
+}
+.detail-item {
+  width: 100%;
+  padding: 15px 0px;
+  list-style-type: none;
+}
+.item {
+  font-size: 14px;
+  color: black;
+  margin-top: 5px;
+}
+.el-table .warning-row {
+  background: oldlace !important;
+}
+
+.el-table .success-row {
+  background: #f0f9eb !important;
+}
+.pagination-container{
+  padding-left:25px;
+  padding-right:25px;
+}
+</style>

src/views/device/wrench/detail.vue

@@ -72,17 +72,44 @@
       </el-tab-pane>
       <el-tab-pane label="校验记录" name="fourth">
         <el-table :data="data" style="width: 100%; margin-left: 20px">
-          <el-table-column prop="max_pressure" label="最大压力" align="center"></el-table-column>
-          <el-table-column prop="min_pressure" label="最小压力" align="center"></el-table-column>
-          <el-table-column prop="max_torque" label="最大扭矩" align="center"></el-table-column>
-          <el-table-column prop="min_torque" label="最小扭矩" align="center"></el-table-column>
-          <el-table-column prop="check_state" label="检测是否合格" align="center"></el-table-column>
-          <el-table-column prop="exterior_state" label="外观是否合格" align="center"></el-table-column>
-          <el-table-column prop="hydraulic_number" label="泵编号" align="center"></el-table-column>
-          <el-table-column prop="checked_user" label="检验员" align="center"></el-table-column>
-          <el-table-column prop="check_time" label="检验时间" align="center" min-width="160"></el-table-column>
-
-
+          <el-table-column prop="CalibratorName" label="校准人名称" align="center"></el-table-column>
+          <el-table-column prop="CheckName" label="校验人名称" align="center"></el-table-column>
+          <el-table-column prop="IssueName" label="签发人名称" align="center"></el-table-column>
+          <el-table-column  label="检测是否合格" align="center">
+           <template slot-scope="scope">
+              <p  v-if="scope.row.preload_three_results==1">合格</p>
+              <p  v-else style="color:red">不合格</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="外观是否合格" align="center">
+            <template slot-scope="scope">
+                <p  v-if="scope.row.inspectionVisual==1">合格</p>
+                <p  v-else style="color:red">不合格</p>
+              </template>
+          </el-table-column>
+          <el-table-column prop="CheckDate" label="检验时间" align="center" min-width="160"></el-table-column>
+          <el-table-column
+        label="操作"
+        width="180"
+        align="center"
+        fixed="right"
+      >
+        <template slot-scope="record">
+          <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>
         <el-pagination
       background
@@ -98,26 +125,41 @@
       </el-tab-pane>
      
     </el-tabs>
+    <checkdetail :checkDetailVisible="checkDetailVisible" :record="detail"  @sendVal="closeDrawer"></checkdetail>
   </el-drawer>
+
 </template>
 <script>
 import rlListOperate from "@/layout/rl-list-operate/rlListOperate";
+import checkdetail from './checkDetail.vue';
 export default {
+  components: { checkdetail },
   props: ["detailVisible", "record"],
    mixins: [rlListOperate],
   data() {
     return {
-      url:'wrenchCheckLog',
+      url:'wrenchCheckRecord',
       drawer: false,
       data:[],
       direction: "rtl",
       activeName: "first",
+      detail:'',
+      checkDetailVisible:false
     };
   },
   methods: {
+
     handleClick(tab, event) {
       // console.log(tab, event);
     },
+    closeDrawer(){
+      this.checkDetailVisible = false
+    },
+    handleDetail(row){
+
+      this.detail = row;
+      this.checkDetailVisible=true;
+    },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex === 1) {
         return "warning-row";
@@ -135,7 +177,7 @@ export default {
       get() {
         if(this.detailVisible){
           //获取维护记录
-          this.queryParam.device_number=this.record.number
+          this.queryParam.wrench_id=this.record.id;
           this.getList()
         }
         return this.detailVisible; // 表示获取父组件的值

src/views/device/wrench/index.vue

@@ -465,7 +465,7 @@
 import rlListOperate from "@/layout/rl-list-operate/rlListOperate";
 import { action } from "@/directive/permission/index.js";
 import { getToken } from "../../../utils/auth";
-import detail from "./detail.vue"
+import detail from "./detail.vue";
 import formModel from './formModel.vue'
 export default {
   name: "wrench",