chrislee 5 місяців тому
батько
коміт
98e2af05ed

+ 1 - 0
src/utils/date-util.js

@@ -38,5 +38,6 @@ export function formatBeijingTime (date) {
 }
 
 export function getDate (dataTime) {
+  if (!dataTime) return ''
   return dataTime.slice(0, 10)
 }

+ 5 - 2
src/views/modules/device/device-inspection.vue

@@ -12,11 +12,14 @@
         <el-date-picker
           v-model="dataForm.rowRersion"
           disabled
-          type="datetime"
+          type="date"
           placeholder="点检时间"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd"
           style="width: 100%;" />
       </el-form-item>
+      <el-form-item label="设备名称" prop="equipmentName">
+        <el-input v-model="dataForm.equipmentName" placeholder="设备名称" disabled></el-input>
+      </el-form-item>
       <el-form-item label="设备编号" prop="codeNumber">
         <el-input v-model="dataForm.codeNumber" placeholder="设备编号" disabled></el-input>
       </el-form-item>

+ 82 - 0
src/views/modules/device/inspection-detail.vue

@@ -0,0 +1,82 @@
+<template>
+  <div>
+    <div class="my-title">查看</div>
+    <div style="margin-left: 20px;margin-right: 20px">
+      <e-desc title="基本信息" column="1" labelWidth="160px">
+        <e-desc-item label="点检时间">{{getDate(dataForm.rowRersion)}}</e-desc-item>
+        <e-desc-item label="设备名称">{{dataForm.equipmentName}}</e-desc-item>
+        <e-desc-item label="设备编号">{{dataForm.codeNumber}}</e-desc-item>
+        <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
+      </e-desc>
+      <e-desc title="点检项目" column="1" labelWidth="500px">
+        <e-desc-item label="1. 设备外观清洁;内部打扫干净,无残留。">
+          {{Number(dataForm.one) === 1 ? "✅": "❌"}}
+        </e-desc-item>
+        <e-desc-item label="2. 各滑动面及导轨丝杆等传动部位,润滑充足,无损坏,运转无杂音。">
+          {{Number(dataForm.two) === 1 ? "✅": "❌"}}
+        </e-desc-item>
+        <e-desc-item label="3. 油路畅通,油量充足;冷却液无变质。">
+          {{Number(dataForm.three) === 1 ? "✅": "❌"}}
+        </e-desc-item>
+        <e-desc-item label="4. 系统运转正常,无报警,无异常。">
+          {{Number(dataForm.four) === 1 ? "✅": "❌"}}
+        </e-desc-item>
+        <e-desc-item label="5. 做好交接班工作,记录清晰完整。">
+          {{Number(dataForm.five) === 1 ? "✅": "❌"}}
+        </e-desc-item>
+      </e-desc>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="onChose">返回</el-button>
+    </span>
+  </div>
+</template>
+
+<script>
+  import EDesc from '../common/e-desc'
+  import EDescItem from '../common/e-desc-item'
+  import {getInspectionDetail} from '@/api/device'
+  import {getDate} from '@/utils/date-util'
+export default {
+    name: 'inspection-detail',
+    components: {
+      EDesc, EDescItem
+    },
+    data () {
+      return {
+        visible: false,
+        id: 0,
+        dataForm: {}
+      }
+    },
+    methods: {
+      getDate,
+      onChose () {
+        this.$emit('onChose')
+      },
+      async init (id) {
+        this.visible = true
+        this.id = id || 0
+        this.dataForm = {}
+        this.getDetails()
+      },
+      getDetails () {
+        getInspectionDetail(this.id).then(({data}) => {
+          if (data && data.code === '200') {
+            this.dataForm = data.data
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.my-line{
+  border-bottom: 1px solid #c0c4cc;
+  margin-bottom: 10px;
+}
+.title{
+  padding: 10px 0 ;
+}
+</style>

+ 2 - 5
src/views/modules/device/inspection-list.vue

@@ -159,9 +159,7 @@
 
 <script>
 import AddOrUpdate from './device-add-or-update'
-import Detail from './temp-detail'
-import History from './temp-history'
-import OrgComponent from '../common/org-component'
+import Detail from './inspection-detail'
 import UserComponent from '../common/user-component'
 import {optionsEquipmentCheckState} from '@/utils/enums'
 import {isAuth} from '@/utils'
@@ -182,8 +180,7 @@ export default {
     Detail,
     History,
     AddOrUpdate,
-    UserComponent,
-    OrgComponent
+    UserComponent
   },
   data () {
     return {