add equipment assets
3
.env.dev
@ -5,8 +5,9 @@ ENV = 'development'
|
||||
VUE_APP_TITLE = 芋道管理系统
|
||||
|
||||
# 芋道管理系统/开发环境
|
||||
VUE_APP_BASE_API = 'http://192.168.1.49:48080'
|
||||
# VUE_APP_BASE_API = 'http://192.168.0.33:48080'
|
||||
VUE_APP_BASE_API = 'http://192.168.1.188:48080'
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.188:48080'
|
||||
|
||||
# 路由懒加载
|
||||
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||
|
@ -57,6 +57,11 @@
|
||||
{{ col.uploadTips || '只能上传jpg/png文件,大小不超过2MB' }}
|
||||
</div>
|
||||
</el-upload>
|
||||
<component
|
||||
v-if="col.subcomponent"
|
||||
:key="col.key"
|
||||
:is="col.subcomponent"
|
||||
:style="col.style"></component>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -222,7 +227,7 @@ export default {
|
||||
|
||||
getFileName(fileUrl) {
|
||||
return fileUrl.split('/').pop();
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
BIN
src/views/core/base/equipment/assets/eq1.jpg
Normal file
After Width: | Height: | Size: 42 KiB |
BIN
src/views/core/base/equipment/assets/eq10.jpg
Normal file
After Width: | Height: | Size: 50 KiB |
BIN
src/views/core/base/equipment/assets/eq2.jpg
Normal file
After Width: | Height: | Size: 78 KiB |
BIN
src/views/core/base/equipment/assets/eq3.jpg
Normal file
After Width: | Height: | Size: 71 KiB |
BIN
src/views/core/base/equipment/assets/eq4.jpg
Normal file
After Width: | Height: | Size: 41 KiB |
BIN
src/views/core/base/equipment/assets/eq5.jpg
Normal file
After Width: | Height: | Size: 61 KiB |
BIN
src/views/core/base/equipment/assets/eq6.jpg
Normal file
After Width: | Height: | Size: 37 KiB |
BIN
src/views/core/base/equipment/assets/eq7.jpg
Normal file
After Width: | Height: | Size: 69 KiB |
BIN
src/views/core/base/equipment/assets/eq8.jpg
Normal file
After Width: | Height: | Size: 54 KiB |
BIN
src/views/core/base/equipment/assets/eq9.jpg
Normal file
After Width: | Height: | Size: 45 KiB |
33
src/views/core/base/equipment/components/EquipmentPics.vue
Normal file
@ -0,0 +1,33 @@
|
||||
<!--
|
||||
filename: EquipmentPics.vue
|
||||
author: liubin
|
||||
date: 2023-08-18 16:29:39
|
||||
description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div class="equipment-pics">
|
||||
hhh
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "EquipmentPics",
|
||||
components: {},
|
||||
props: {},
|
||||
data() {
|
||||
return {}
|
||||
},
|
||||
computed: {},
|
||||
methods: {},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.equipment-pics {
|
||||
background: #fcfcfc;
|
||||
padding: 12px;
|
||||
margin: 8px;
|
||||
}
|
||||
</style>
|
@ -38,85 +38,6 @@
|
||||
@confirm="submitForm">
|
||||
<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
|
||||
</base-dialog>
|
||||
|
||||
<!-- 对话框(添加 / 修改) -->
|
||||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
width="500px"
|
||||
v-dialogDrag
|
||||
append-to-body>
|
||||
<el-form ref="form" :model="form" label-width="80px">
|
||||
<el-form-item label="编码" prop="code">
|
||||
<el-input v-model="form.code" placeholder="请输入编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入设备名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="英文名称" prop="enName">
|
||||
<el-input v-model="form.enName" placeholder="请输入英文名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="缩写" prop="abbr">
|
||||
<el-input v-model="form.abbr" placeholder="请输入缩写" />
|
||||
</el-form-item>
|
||||
<el-form-item label="进厂日期" prop="enterTime">
|
||||
<el-date-picker
|
||||
clearable
|
||||
v-model="form.enterTime"
|
||||
type="date"
|
||||
value-format="timestamp"
|
||||
placeholder="选择进厂日期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="生产日期" prop="productionTime">
|
||||
<el-date-picker
|
||||
clearable
|
||||
v-model="form.productionTime"
|
||||
type="date"
|
||||
value-format="timestamp"
|
||||
placeholder="选择生产日期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型,关联设备类型表" prop="equipmentTypeId">
|
||||
<el-select
|
||||
v-model="form.equipmentTypeId"
|
||||
placeholder="请选择设备类型,关联设备类型表">
|
||||
<el-option label="请选择字典生成" value="" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="分组id (关联 base_equipment_GROUP)"
|
||||
prop="groupId">
|
||||
<el-select
|
||||
v-model="form.groupId"
|
||||
placeholder="请选择分组id (关联 base_equipment_GROUP)">
|
||||
<el-option label="请选择字典生成" value="" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="每小时生产数量" prop="tvalue">
|
||||
<el-input v-model="form.tvalue" placeholder="请输入每小时生产数量" />
|
||||
</el-form-item>
|
||||
<el-form-item label="单件加工时间 s/件" prop="processingTime">
|
||||
<el-input
|
||||
v-model="form.processingTime"
|
||||
placeholder="请输入单件加工时间 s/件" />
|
||||
</el-form-item>
|
||||
<el-form-item label="制造商" prop="manufacturer">
|
||||
<el-input v-model="form.manufacturer" placeholder="请输入制造商" />
|
||||
</el-form-item>
|
||||
<el-form-item label="规格" prop="spec">
|
||||
<el-input v-model="form.spec" placeholder="请输入规格" />
|
||||
</el-form-item>
|
||||
<el-form-item label="功能描述">
|
||||
<editor v-model="form.description" :min-height="192" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -124,6 +45,7 @@
|
||||
import moment from 'moment';
|
||||
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
import { getAccessToken } from '@/utils/auth';
|
||||
import EquipmentPics from './components/EquipmentPics';
|
||||
|
||||
import {
|
||||
createEquipment,
|
||||
@ -281,12 +203,13 @@ export default {
|
||||
prop: 'equipmentTypeId',
|
||||
url: '/base/equipment-type/page?pageNo=1&pageSize=100',
|
||||
},
|
||||
{
|
||||
select: true,
|
||||
label: '设备分组',
|
||||
prop: 'groupId',
|
||||
url: '/base/equipment-group/page?pageNo=1&pageSize=100',
|
||||
},
|
||||
// {
|
||||
// select: true,
|
||||
// label: '设备分组',
|
||||
// prop: 'groupId',
|
||||
// url: '/base/equipment-group/page?pageNo=1&pageSize=100',
|
||||
// },
|
||||
{ input: true, label: '备注', prop: 'remark' },
|
||||
],
|
||||
[
|
||||
{
|
||||
@ -303,6 +226,7 @@ export default {
|
||||
[
|
||||
{
|
||||
select: true,
|
||||
prop: 'tvalue',
|
||||
label: '设备TT值',
|
||||
rules: [
|
||||
{ required: true, message: '不能为空', trigger: 'blur' },
|
||||
@ -313,11 +237,10 @@ export default {
|
||||
transform: (val) => Number(val),
|
||||
},
|
||||
],
|
||||
prop: 'tvalue',
|
||||
},
|
||||
{
|
||||
select: true,
|
||||
label: '单件产品加工时间',
|
||||
label: '产品加工时间',
|
||||
prop: 'processingTime',
|
||||
rules: [
|
||||
{
|
||||
@ -365,16 +288,19 @@ export default {
|
||||
[
|
||||
{
|
||||
diy: true,
|
||||
key: 'eq-assets',
|
||||
label: '设备资料',
|
||||
prop: 'fileNames',
|
||||
},
|
||||
],
|
||||
[{ input: true, label: '备注', prop: 'remark' }],
|
||||
[
|
||||
{
|
||||
diy: true,
|
||||
key: 'eq-pics',
|
||||
label: '设备图片',
|
||||
prop: 'fileUrls',
|
||||
subcomponent: EquipmentPics,
|
||||
style: 'overflow-x: auto;'
|
||||
},
|
||||
],
|
||||
],
|
||||
@ -384,9 +310,8 @@ export default {
|
||||
queryParams: {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
code: null,
|
||||
name: null,
|
||||
createTime: [],
|
||||
code: '',
|
||||
name: '',
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
|
@ -167,7 +167,7 @@ export default {
|
||||
queryParams: {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
name: '',
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
|