gtz217/hf-pda
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
gtz217 2022-08-04 15:21:48 +08:00
parent 03cfa65525
commit 4d2049fca7
15 changed files with 126 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/assets/css/all.scss
View File

@ -40,3 +40,69 @@
flex: 0 0 20% !important;
padding: 0 !important;
}
// picker
.van-picker {
.van-picker-column__item{
.van-ellipsis {
height: 44px;
line-height: 44px;
font-size: .4rem;
}
}
.van-picker__toolbar {
.van-picker__cancel, .van-picker__title, .van-picker__confirm {
font-size: .4rem;
}
.van-ellipsis {
line-height: .88rem;
height: .88rem;
}
}
}
// 输入框
.van-field {
.van-field__body {
input, textarea {
font-size: .4rem;
color: #131415;
}
input::-webkit-input-placeholder {
font-size: .4rem;
}
input:-moz-placeholder {
font-size: .4rem;
}
input::-moz-placeholder {
font-size: .4rem;
}
input:-ms-input-placeholder {
font-size: .4rem;
}
}
}
.canInput {
.van-cell__value {
.van-field__body {
.van-field__control:disabled {
font-size: .4rem;
color: #131415;
-webkit-text-fill-color: #131415;
}
input::-webkit-input-placeholder {
-webkit-text-fill-color: #c8c9cc;
}
input:-moz-placeholder {
-webkit-text-fill-color: #c8c9cc;
}
input::-moz-placeholder {
-webkit-text-fill-color: #c8c9cc;
}
input:-ms-input-placeholder {
-webkit-text-fill-color: #c8c9cc;
}
}
}
}

10
src/pages/eqInspection/components/eqItem.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 13:52:32
* @LastEditTime: 2022-08-04 14:54:50
* @Description: file content
* @FilePath: \hf-pda\src\pages\eqInspection\components\eqItem.vue
-->
@ -20,12 +20,12 @@
<div class="eqItem-main">
<div class="eqItem-main-left">
<div class="eqItem-main-left-item">
添加时间：
<span>{{ injectData.createTime ? moment(injectData.createTime).format('YYYY-MM-DD HH:mm:ss') : '暂无' }}</span>
开始时间：
<span>{{ injectData.inspectionStartTime ? moment(injectData.inspectionStartTime).format('YYYY-MM-DD HH:mm:ss') : '暂无' }}</span>
</div>
<div class="eqItem-main-left-item">
巡检时间：
<span>{{ injectData.inspectionStartTime ? moment(injectData.inspectionStartTime).format('YYYY-MM-DD HH:mm:ss') : '暂无' }}</span>
结束时间：
<span>{{ injectData.inspectionEndTime ? moment(injectData.inspectionEndTime).format('YYYY-MM-DD HH:mm:ss') : '暂无' }}</span>
</div>
</div>
<div class="eqItem-main-right" @click="toDetail">

2
src/pages/eqInspection/components/eqPopup.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 10:08:25
* @LastEditTime: 2022-08-04 14:55:18
* @Description: file content
* @FilePath: \hf-pda\src\pages\eqInspection\components\eqPopup.vue
-->

2
src/pages/eqInspection/components/timePopup.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-07-28 17:26:08
* @LastEditTime: 2022-08-04 14:55:24
* @Description: file content
* @FilePath: \hf-pda\src\pages\eqInspection\components\timePopup.vue
-->

14
src/pages/eqInspection/eqInspection-add.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 10:12:31
* @LastEditTime: 2022-08-04 14:27:41
* @Description: file content
* @FilePath: \hf-pda\src\pages\eqInspection\eqInspection-add.vue
-->
@ -137,18 +137,6 @@ export default {
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;

14
src/pages/eqInspection/eqInspection-detail.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 09:13:02
* @LastEditTime: 2022-08-04 14:27:45
* @Description: file content
* @FilePath: \hf-pda\src\pages\eqInspection\eqInspection-detail.vue
-->
@ -190,18 +190,6 @@ export default {
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;

56
src/pages/eqInspection/eqInspection-edit.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 09:06:45
* @LastEditTime: 2022-08-04 15:19:28
* @Description: file content
* @FilePath: \hf-pda\src\pages\eqInspection\eqInspection-edit.vue
-->
@ -30,6 +30,7 @@
<van-field
v-model="dataForm.equipmentName"
ref="eqCodeInput"
class="canInput"
disabled
/>
</van-col>
@ -60,6 +61,7 @@
clearable
clear-trigger="always"
disabled
class="canInput"
placeholder="选择巡检时间"
@click="handleDate"
/>
@ -73,21 +75,25 @@
巡检内容
</van-col>
<van-col :span="15" :offset="1" />
<van-col :span="24" v-for="item in insList" :key="item.id" class="eq-main-edit-neirong-item-item">
<van-swipe-cell>
<van-cell :border="false" :title="item.inspectionItem" :label="item.inspectionContent">
<template #right-icon>
<van-checkbox v-model="item.statusBoolean" @change="updateStatus(item)" />
<template v-if="insList && insList.length">
<van-col :span="24" v-for="item in insList" :key="item.id" class="eq-main-edit-neirong-item-item">
<van-swipe-cell>
<van-cell :border="false" :title="item.inspectionItem" :label="item.inspectionContent">
<template #right-icon>
<span style="display: flex; align-items: center; -webkit-box-align: center; margin-right: .1rem; font-size: .3125rem; position: relative; top: .032rem;">是否完成</span>
<van-checkbox v-model="item.statusBoolean" @change="updateStatus(item)" />
</template>
</van-cell>
<template #right>
<van-button square @click="toInsDetail(item)">
<van-icon name="add-o" />
<div>编辑详情</div>
</van-button>
</template>
</van-cell>
<template #right>
<van-button square @click="toInsDetail(item)">
<van-icon name="add-o" />
<div>编辑详情</div>
</van-button>
</template>
</van-swipe-cell>
</van-col>
</van-swipe-cell>
</van-col>
</template>
<van-col :span="22" :offset="1" style="font-size: .4rem">暂无</van-col>
</van-row>
</div>
<div class="eq-main-edit-item">
@ -135,7 +141,7 @@
:title="dateType ? '选择结束时间' : '选择开始时间'"
:min-date="minDate"
@confirm="setDate"
@cancel="show = false"
@cancel="show = false; dateType = 0"
/>
</van-popup>
</div>
@ -163,7 +169,8 @@ export default {
inspectionDesc: null,
inspectionWorker: null,
inspectionEndTime: null,
inspectionStartTime: null
inspectionStartTime: null,
source: 3
},
insList: [],
insTime: null,
@ -208,6 +215,9 @@ export default {
})
if (result.success) {
this.dataForm = result.data
if (this.dataForm.inspectionStartTime && this.dataForm.inspectionEndTime) {
this.insTime = moment(this.dataForm.inspectionStartTime).format('YYYY-MM-DD HH:mm:ss') + '-' + moment(this.dataForm.inspectionEndTime).format('YYYY-MM-DD HH:mm:ss')
}
const result1 = await getInsList({
equipmentInspectionId: this.$route.query.id
})
@ -338,18 +348,6 @@ export default {
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;

14
src/pages/eqInspection/eqInspection.vue
View File

@ -22,6 +22,7 @@
<van-col :span="15" :offset="1" class="eq-search-item-input">
<van-field
v-model="eqName"
class="canInput"
right-icon="arrow-down"
disabled
placeholder="请选择设备"
@ -34,6 +35,7 @@
<van-col :span="15" :offset="1" class="eq-search-item-input">
<van-field
v-model="timeStr"
class="canInput"
right-icon="rili"
icon-prefix="iconfont"
disabled
@ -300,18 +302,6 @@ export default {
border-radius: .25rem;
background: #fff;
box-shadow: .02rem .02rem .1rem rgba($color: #000000, $alpha: .2);
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-search-item {
padding-top: .25rem;

4
src/pages/material/components/materialPopup-batch.vue
View File

@ -2,14 +2,14 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 20:27:20
* @LastEditTime: 2022-08-04 14:12:38
* @Description: file content
* @FilePath: \hf-pda\src\pages\material\components\materialPopup-batch.vue
-->
<template>
<van-popup v-model="show" position="bottom" class="eqPopup">
<van-picker
title="选择设备"
title="选择批次"
show-toolbar
:columns="showList"
@confirm="onConfirm"

4
src/pages/material/components/materialPopup-source.vue
View File

@ -2,14 +2,14 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 20:27:07
* @LastEditTime: 2022-08-04 14:12:43
* @Description: file content
* @FilePath: \hf-pda\src\pages\material\components\materialPopup-source.vue
-->
<template>
<van-popup v-model="show" position="bottom" class="eqPopup">
<van-picker
title="选择设备"
title="选择来源"
show-toolbar
:columns="showList"
:default-index="1"

4
src/pages/material/components/materialPopup-worker.vue
View File

@ -2,14 +2,14 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 20:16:41
* @LastEditTime: 2022-08-04 14:12:49
* @Description: file content
* @FilePath: \hf-pda\src\pages\material\components\materialPopup-worker.vue
-->
<template>
<van-popup v-model="show" position="bottom" class="eqPopup">
<van-field-check-box
title="选择设备"
title="选择操作员"
show-toolbar
ref="worker-picker"
:columns="showList"

14
src/pages/material/material-add.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 13:50:15
* @LastEditTime: 2022-08-04 14:27:54
* @Description: file content
* @FilePath: \hf-pda\src\pages\material\material-add.vue
-->
@ -137,18 +137,6 @@ export default {
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;

29
src/pages/material/material-edit.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-07-28 10:22:30
* @LastEditors: gtz
* @LastEditTime: 2022-08-03 20:39:43
* @LastEditTime: 2022-08-04 14:56:10
* @Description: file content
* @FilePath: \hf-pda\src\pages\material\material-edit.vue
-->
@ -30,6 +30,7 @@
<van-field
v-model="dataForm.materialDateName"
disabled
class="canInput"
placeholder="请选择批次"
@click="handleSelectBatch"
right-icon="arrow-down"
@ -45,6 +46,7 @@
<van-field
v-model="dataForm.replaceTime"
disabled
class="canInput"
placeholder="请选择换料时间"
@click="handleDate"
right-icon="arrow-down"
@ -86,6 +88,7 @@
<van-field
v-model="dataForm.equipmentName"
disabled
class="canInput"
placeholder="请选择设备"
@click="handleSelectEq"
right-icon="arrow-down"
@ -101,6 +104,7 @@
<van-field
v-model="dataForm.source"
disabled
class="canInput"
placeholder="请选择数据来源"
right-icon="arrow-down"
@click="handleSelectSource"
@ -116,6 +120,7 @@
<van-field
v-model="dataForm.operator"
disabled
class="canInput"
placeholder="请选择操作员"
right-icon="arrow-down"
@click="handleSelectWorker"
@ -189,13 +194,14 @@ export default {
id: null,
equipmentId: null,
equipmentName: null,
materialDateId: null,
materialDateName: null,
materialDateCode: null,
materialName: null,
materialCode: null,
replaceTime: null,
operator: null,
source: null,
source: 'PDA',
remark: null
},
minDate: new Date(2020, 0, 1),
@ -271,6 +277,7 @@ export default {
externalCode: this.batchList[index].code
})
if (result.success) {
this.dataForm.materialDateId = result.data.id
this.dataForm.materialDateName = result.data.name
this.dataForm.materialDateCode = result.data.code
this.dataForm.materialName = result.data.materialName
@ -321,17 +328,19 @@ export default {
},
// 重置表单
resetForm () {
const id = this.dataForm.id
this.dataForm = {
id: null,
id,
equipmentId: null,
equipmentName: null,
materialDateId: null,
materialDateName: null,
materialDateCode: null,
materialName: null,
materialCode: null,
replaceTime: null,
operator: null,
source: null,
source: 'PDA',
remark: null
}
}
@ -364,18 +373,6 @@ export default {
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;

12
src/pages/material/material.vue
View File

@ -213,18 +213,6 @@ export default {
border-radius: .25rem;
background: #fff;
box-shadow: .02rem .02rem .1rem rgba($color: #000000, $alpha: .2);
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-search-item {
padding-top: .25rem;

4
src/util/request.js
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-07-25 14:18:00
* @LastEditors: gtz
* @LastEditTime: 2022-08-04 08:35:07
* @LastEditTime: 2022-08-04 10:16:05
* @Description: file content
* @FilePath: \hf-pda\src\util\request.js
*/
@ -27,7 +27,7 @@ service.interceptors.request.use((config) => {
// config.headers['token'] = JSON.parse(sessionStorage.getItem('userInfo')).token
// }
// 输出到安卓版本的时候开启下面的配置项
config.url = 'http://hfxny.mes.picaiba.com' + config.url
// config.url = 'http://hfxny.mes.picaiba.com' + config.url
// ***************
if (config.formState) {