update

src/api/eqInspection.js

@@ -2,13 +2,13 @@
  * @Author: gtz
  * @Date: 2022-07-25 14:18:00
  * @LastEditors: gtz
- * @LastEditTime: 2022-07-26 17:02:01
+ * @LastEditTime: 2022-07-29 13:31:29
  * @Description: file content
- * @FilePath: \xbapp\src\api\eqInspection.js
+ * @FilePath: \hf-pda\src\api\eqInspection.js
  */
 import request from '@/util/request'
 
-// 获取在线库存列表
+// 获取巡检记录列表
 export const list = data => {
   return request({
     url: '/api/equipment/inspectionLog/page',
@@ -17,6 +17,15 @@ export const list = data => {
   })
 }
 
+// 获取巡检记录详情
+export const detail = data => {
+  return request({
+    url: '/api/equipment/inspectionLog/get',
+    method: 'POST',
+    data
+  })
+}
+
 // 获取设备列表
 export const eqList = data => {
   return request({
@@ -25,3 +34,22 @@ export const eqList = data => {
     data
   })
 }
+
+// 获取设备信息
+export const getEqInfo = data => {
+  return request({
+    url: '/api/basic/equipment/PDAget',
+    method: 'POST',
+    formState: true,
+    data
+  })
+}
+
+// 获取巡检记录下巡检项目列表
+export const getEqInsItemList = data => {
+  return request({
+    url: '/api/equipment/equipmentinspection-inspectionitem/list',
+    method: 'POST',
+    data
+  })
+}

src/main.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-07-25 14:18:00
  * @LastEditors: gtz
- * @LastEditTime: 2022-07-28 10:26:05
+ * @LastEditTime: 2022-07-29 16:55:08
  * @Description: file content
  * @FilePath: \hf-pda\src\main.js
  */
@@ -19,9 +19,9 @@ import './assets/css/iconfont.css'
 import './components/'
 import store from '@/store'
 
-import { Button, Field, Icon, Dialog, Grid, GridItem, NavBar, Popup, Row, Col, Stepper, Picker, DatetimePicker, PullRefresh, Cell, CellGroup, Tag, Checkbox, CheckboxGroup, Tab, Tabs, Sticky, Calendar } from 'vant'
+import { Button, Field, Icon, Dialog, Grid, GridItem, NavBar, Popup, Row, Col, Stepper, Picker, DatetimePicker, PullRefresh, Cell, CellGroup, Tag, Checkbox, CheckboxGroup, Tab, Tabs, Sticky, Calendar, Uploader } from 'vant'
 
-Vue.use(Button).use(Field).use(Icon).use(Dialog).use(Grid).use(GridItem).use(NavBar).use(Popup).use(Row).use(Col).use(Stepper).use(Picker).use(DatetimePicker).use(PullRefresh).use(Cell).use(CellGroup).use(Tag).use(Checkbox).use(CheckboxGroup).use(Tab).use(Tabs).use(Sticky).use(Calendar)
+Vue.use(Button).use(Field).use(Icon).use(Dialog).use(Grid).use(GridItem).use(NavBar).use(Popup).use(Row).use(Col).use(Stepper).use(Picker).use(DatetimePicker).use(PullRefresh).use(Cell).use(CellGroup).use(Tag).use(Checkbox).use(CheckboxGroup).use(Tab).use(Tabs).use(Sticky).use(Calendar).use(Uploader)
 
 Vue.config.productionTip = false
 fastClick.attach(document.body)

src/pages/eqInspection/components/eqItem.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-07-28 10:22:30
  * @LastEditors: gtz
- * @LastEditTime: 2022-07-28 17:22:14
+ * @LastEditTime: 2022-07-29 13:26:58
  * @Description: file content
  * @FilePath: \hf-pda\src\pages\eqInspection\components\eqItem.vue
 -->
@@ -59,7 +59,15 @@ export default {
     }
   },
   methods: {
-    toDetail () {}
+    toDetail () {
+      this.$router.push({
+        name: 'eqInspectionEdit',
+        query: {
+          equipmentId: this.injectData.equipmentId,
+          id: this.injectData.id
+        }
+      })
+    }
   }
 }
 </script>

src/pages/eqInspection/eqInspection-add.vue

@@ -0,0 +1,155 @@
+<!--
+ * @Author: gtz
+ * @Date: 2022-07-28 10:22:30
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-07-29 16:02:15
+ * @Description: file content
+ * @FilePath: \hf-pda\src\pages\eqInspection\eqInspection-add.vue
+-->
+<template>
+  <div class="eqInspectionAdd">
+    <!-- @keypress.enter="submitEqCode" -->
+    <!-- navbar -->
+    <van-sticky :offset-top="0">
+      <van-nav-bar
+        title="PDA巡检扫描设备信息"
+        left-arrow
+        sticky
+        class="eq-header"
+        @click-left="onClickLeft"
+      />
+      <!-- @click-right="onClickRight" -->
+    </van-sticky>
+    <div class="eq-add-main">
+      <van-row class="eq-field-item">
+        <van-col :span="7" class="eq-field-item-lable">
+          <short-line />
+          设备编码
+        </van-col>
+        <van-col :span="15" :offset="1" class="eq-field-item-input">
+          <van-field
+            v-model="eqCode"
+            ref="eqCodeInput"
+            clearable
+            autofocus
+            placeholder="扫描或手动获取"
+          >
+            <template #button>
+              <van-button size="small" type="primary" @click="submitEqCode">确定</van-button>
+            </template>
+          </van-field>
+        </van-col>
+      </van-row>
+      <div class="eq-main-img">
+        <img src="../../assets/img/back.png" alt="">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import shortLine from '@/components/shortLine.vue'
+import { getEqInfo } from '@/api/eqInspection'
+
+export default {
+  name: 'eqInspectionAdd',
+  components: { shortLine },
+  data () {
+    return {
+      eqCode: null
+    }
+  },
+  methods: {
+    // 返回上一页
+    onClickLeft () {
+      this.$router.goBack()
+    },
+    // 提交设备CODE
+    async submitEqCode () {
+      const result = await getEqInfo({
+        key: this.eqCode
+      })
+      if (result.success) {
+        this.$router.push({
+          name: 'eqInspectionEdit',
+          query: {
+            equipmentId: result.data.id
+          }
+        })
+      }
+      console.log(result)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.eqInspectionAdd {
+  width: 100%;
+  .eq-header {
+    background: #4271FF;
+    .van-icon {
+      color: #fff;
+      font-size: .4375rem;
+    }
+    .van-nav-bar__content {
+      height: 1.5rem;
+      line-height: 1.5rem;
+      .van-nav-bar__title {
+        color: #fff;
+        font-size: .4375rem;
+      }
+    }
+  }
+  .eq-add-main {
+    width: 100%;
+    position: absolute;
+    top: 1.5rem;
+    bottom: 0;
+    overflow: scroll;
+    input::-webkit-input-placeholder {
+      font-size: .375rem;
+    }
+    input:-moz-placeholder {
+      font-size: .375rem;
+    }
+    input::-moz-placeholder {
+      font-size: .375rem;
+    }
+    input:-ms-input-placeholder {
+      font-size: .375rem;
+    }
+    .eq-field-item {
+      padding-top: .25rem;
+      line-height: .875rem;
+      .eq-field-item-lable {
+        text-align: right;
+        font-size: .375rem;
+      }
+      .van-cell {
+        padding: 0 .25rem;
+        height: .875rem;
+        background: #F6F6F6;
+        border-radius: .1875rem;
+        .van-field__body {
+          height: .875rem;
+          .van-field__control {
+            height: .875rem;
+          }
+        }
+      }
+    }
+    .eq-main-img {
+      width: 100%;
+      min-height: 70vh;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      img {
+        width: 4.4rem;
+        height: 3.6rem;
+      }
+    }
+  }
+}
+</style>

src/pages/eqInspection/eqInspection-edit.vue

@@ -0,0 +1,252 @@
+<!--
+ * @Author: gtz
+ * @Date: 2022-07-28 10:22:30
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-07-29 17:06:04
+ * @Description: file content
+ * @FilePath: \hf-pda\src\pages\eqInspection\eqInspection-edit.vue
+-->
+<template>
+  <div class="eqInspectionEdit">
+    <!-- navbar -->
+    <van-sticky :offset-top="0">
+      <van-nav-bar
+        title="PDA巡检信息"
+        left-arrow
+        sticky
+        class="eq-header"
+        @click-left="onClickLeft"
+      />
+      <!-- @click-right="onClickRight" -->
+    </van-sticky>
+    <div class="eq-edit-main">
+      <div class="eq-main-item">
+        <van-row class="eq-field-item">
+          <van-col :span="7" class="eq-field-item-lable">
+            <short-line />
+            设备名称
+          </van-col>
+          <van-col :span="15" :offset="1" class="eq-field-item-input">
+            <van-field
+              v-model="dataForm.equipmentId"
+              ref="eqCodeInput"
+              disabled
+            />
+          </van-col>
+        </van-row>
+        <van-row class="eq-field-item">
+          <van-col :span="7" class="eq-field-item-lable">
+            <short-line />
+            巡检人员
+          </van-col>
+          <van-col :span="15" :offset="1" class="eq-field-item-input">
+            <van-field
+              v-model="dataForm.inspectionWorker"
+              ref="eqCodeInput"
+              clearable
+              placeholder="填写巡检人员以逗号隔开"
+            />
+          </van-col>
+        </van-row>
+        <van-row class="eq-field-item">
+          <van-col :span="7" class="eq-field-item-lable">
+            <short-line />
+            巡检时间
+          </van-col>
+          <van-col :span="15" :offset="1" class="eq-field-item-input">
+            <van-field
+              v-model="insTime"
+              ref="eqCodeInput"
+              clearable
+              clear-trigger="always"
+              disabled
+              placeholder="选择巡检时间"
+            />
+          </van-col>
+        </van-row>
+      </div>
+      <div class="eq-main-edit-item">
+        <van-row class="eq-field-item">
+          <van-col :span="7" class="eq-field-item-lable">
+            <short-line />
+            巡检详情
+          </van-col>
+          <van-col :span="15" :offset="1" />
+          <van-field
+            v-model="dataForm.inspectionDesc"
+            type="textarea"
+            rows="5"
+            autosize
+          />
+        </van-row>
+      </div>
+      <div class="eq-main-edit-item">
+        <van-row class="eq-field-item">
+          <van-col :span="7" class="eq-field-item-lable">
+            <short-line />
+            附件
+          </van-col>
+          <van-col :span="15" :offset="1" />
+          <van-col :span="24" style="padding-left: .25rem">
+            <van-uploader
+              v-model="fileList"
+              :max-count="1"
+              accept=".doc,.docx,.xls,.xlsx,.pdf,image/*"
+              :after-read="uploadFile"
+            />
+          </van-col>
+        </van-row>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { detail, eqList } from '@/api/eqInspection'
+// , getEqInsItemList
+import shortLine from '@/components/shortLine.vue'
+
+export default {
+  name: 'eqInspectionEdit',
+  components: { shortLine },
+  data () {
+    return {
+      eqList: [],
+      dataForm: {
+        id: null,
+        annexUrl: null,
+        equipmentId: null,
+        inspectionDesc: null,
+        inspectionWorker: null,
+        inspectionEndTime: null,
+        inspectionStartTime: null
+      },
+      insTime: null,
+      fileList: []
+    }
+  },
+  mounted () {
+    this.getEqList()
+  },
+  methods: {
+    // 返回上一页
+    onClickLeft () {
+      this.$router.goBack()
+    },
+    async getEqList () {
+      const result = await eqList({
+        current: 1,
+        size: 999
+      })
+      if (result.success) {
+        this.eqList = result.data.records
+        if (this.$route.query.id) {
+          this.getDetail()
+        } else {
+          this.dataForm.equipmentId = this.$route.query.equipmentId
+        }
+      }
+    },
+    // 获取详情
+    async getDetail () {
+      const result = await detail({
+        id: this.$route.query.id
+      })
+      if (result.success) {
+        this.dataForm = result.data
+        console.log(result)
+      }
+    },
+    // 文件上传
+    uploadFile (file) {
+      console.log(file)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.eqInspectionEdit {
+  width: 100%;
+  background: #F6F6F6;
+  .eq-header {
+    background: #4271FF;
+    .van-icon {
+      color: #fff;
+      font-size: .4375rem;
+    }
+    .van-nav-bar__content {
+      height: 1.5rem;
+      line-height: 1.5rem;
+      .van-nav-bar__title {
+        color: #fff;
+        font-size: .4375rem;
+      }
+    }
+  }
+  .eq-edit-main {
+    width: 100%;
+    position: absolute;
+    top: 1.5rem;
+    bottom: 0;
+    overflow: scroll;
+    input::-webkit-input-placeholder {
+      font-size: .375rem;
+    }
+    input:-moz-placeholder {
+      font-size: .375rem;
+    }
+    input::-moz-placeholder {
+      font-size: .375rem;
+    }
+    input:-ms-input-placeholder {
+      font-size: .375rem;
+    }
+    .eq-main-item {
+      background: #fff;
+      padding-bottom: .25rem;
+      margin-bottom: .25rem;
+      .eq-field-item {
+        padding-top: .25rem;
+        line-height: .875rem;
+        .eq-field-item-lable {
+          text-indent: .375rem;
+          font-size: .375rem;
+        }
+        .van-cell {
+          padding: 0 .25rem;
+          height: .875rem;
+          background: #F6F6F6;
+          border-radius: .1875rem;
+          .van-field__body {
+            height: .875rem;
+            .van-field__control {
+              height: .875rem;
+            }
+          }
+        }
+      }
+    }
+    .eq-main-edit-item {
+      background: #fff;
+      padding-bottom: .25rem;
+      margin-bottom: .25rem;
+      .eq-field-item {
+        padding-top: .25rem;
+        line-height: .875rem;
+        .eq-field-item-lable {
+          text-indent: .375rem;
+          font-size: .375rem;
+        }
+        .van-cell {
+          width: calc(100% - .75rem);
+          margin: 0 .375rem;
+          padding: 0 .25rem;
+          background: #F6F6F6;
+          border-radius: .125rem;
+        }
+      }
+    }
+  }
+}
+</style>

src/pages/eqInspection/eqInspection.vue

@@ -44,7 +44,7 @@
           </van-row>
           <van-row class="eq-search-btn">
             <van-col :span="9" :offset="1">
-              <van-button class="eq-search-btn-item eq-search-btn-left" round>扫描新增</van-button>
+              <van-button class="eq-search-btn-item eq-search-btn-left" round @click="toAdd">扫描新增</van-button>
             </van-col>
             <van-col :span="12" :offset="1">
               <van-button class="eq-search-btn-item eq-search-btn-right" round @click="getDataList">查 询</van-button>
@@ -179,6 +179,12 @@ export default {
         name: 'index'
       })
     },
+    // 扫描新增
+    toAdd () {
+      this.$router.push({
+        name: 'eqInspectionAdd'
+      })
+    },
     // 重置筛选项
     resetQuery () {
       this.queryList = {
@@ -245,14 +251,14 @@ export default {
       background: #4271FF;
       .van-icon {
         color: #fff;
-        font-size: .5rem;
+        font-size: .4375rem;
       }
       .van-nav-bar__content {
         height: 1.5rem;
         line-height: 1.5rem;
         .van-nav-bar__title {
           color: #fff;
-          font-size: .5rem;
+          font-size: .4375rem;
         }
       }
     }
@@ -288,19 +294,15 @@ export default {
         background: #fff;
         box-shadow: .02rem .02rem .1rem rgba($color: #000000, $alpha: .2);
         input::-webkit-input-placeholder {
-          color: #131415;
           font-size: .375rem;
         }
         input:-moz-placeholder {
-          color: #131415;
           font-size: .375rem;
         }
         input::-moz-placeholder {
-          color: #131415;
           font-size: .375rem;
         }
         input:-ms-input-placeholder {
-          color: #131415;
           font-size: .375rem;
         }
       }

src/router/index.js

@@ -2,9 +2,9 @@
  * @Author: gtz
  * @Date: 2022-07-25 14:18:00
  * @LastEditors: gtz
- * @LastEditTime: 2022-07-25 15:12:22
+ * @LastEditTime: 2022-07-29 13:24:07
  * @Description: file content
- * @FilePath: \xbapp\src\router\index.js
+ * @FilePath: \hf-pda\src\router\index.js
  */
 import Vue from 'vue'
 import Router from 'vue-router'
@@ -12,6 +12,8 @@ import login from '@/pages/common/login'
 import notFound from '@/pages/common/404'
 import index from '@/pages/index/index'
 import eqInspection from '@/pages/eqInspection/eqInspection'
+import eqInspectionAdd from '@/pages/eqInspection/eqInspection-add'
+import eqInspectionEdit from '@/pages/eqInspection/eqInspection-edit'
 import material from '@/pages/material/material'
 
 Vue.use(Router)
@@ -35,6 +37,18 @@ const router = new Router({
       meta: {requireAuth: true},
       component: eqInspection
     },
+    {
+      path: '/eqInspection-add',
+      name: 'eqInspectionAdd',
+      meta: {requireAuth: true},
+      component: eqInspectionAdd
+    },
+    {
+      path: '/eqInspection-edit',
+      name: 'eqInspectionEdit',
+      meta: {requireAuth: true},
+      component: eqInspectionEdit
+    },
     {
       path: '/material',
       name: 'material',

src/util/request.js

@@ -2,9 +2,9 @@
  * @Author: gtz
  * @Date: 2022-07-25 14:18:00
  * @LastEditors: gtz
- * @LastEditTime: 2022-07-25 14:31:03
+ * @LastEditTime: 2022-07-29 13:18:34
  * @Description: file content
- * @FilePath: \xbapp\src\util\request.js
+ * @FilePath: \hf-pda\src\util\request.js
  */
 import axios from 'axios'
 import { Toast, Notify } from 'vant'
@@ -59,11 +59,11 @@ service.interceptors.response.use(
         pagetotal: response.data.pagetotal
       }
     } else {
-      Notify(response.data.message)
+      Notify(response.data.msg)
       return {
         success: false,
         data: response.data,
-        msg: response.data.message
+        msg: response.data.msg
       }
     }
     // return response