diff --git a/.env.dev b/.env.dev
index 9b0643f4..90b1efeb 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,12 +12,12 @@ ENV = 'development'
VUE_APP_TITLE = MES系统
# 芋道管理系统/开发环境
-
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
# VUE_APP_BASE_API = 'http://192.168.1.8:48080'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.56:48080'
# VUE_APP_BASE_API = 'http://192.168.1.188:48080'
diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index 75c11b41..f0c324ea 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -21,11 +21,13 @@
v-model="form[col.prop]"
@change="$emit('update', form)"
:placeholder="`请输入${col.label}`"
+ :disabled="disabled"
v-bind="col.bind" />
@@ -33,6 +35,7 @@
v-if="col.select"
v-model="form[col.prop]"
:placeholder="`请选择${col.label}`"
+ :disabled="disabled"
@change="$emit('update', form)"
v-bind="col.bind">
@@ -81,6 +87,7 @@
:headers="uploadHeaders"
:show-file-list="false"
icon="el-icon-upload2"
+ :disabled="disabled"
:before-upload="beforeUpload"
:on-success="handleUploadSuccess"
v-bind="col.bind">
@@ -100,7 +107,7 @@
v-for="file in form[col.prop] || []"
:file="file"
:key="file.fileUrl"
- @delete="handleDeleteFile(file)" />
+ @delete="!disabled && handleDeleteFile(file)" />
diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js
index c131407b..61d46432 100644
--- a/src/mixins/lb/basicPageMixin.js
+++ b/src/mixins/lb/basicPageMixin.js
@@ -76,6 +76,9 @@ export default {
info(payload) {
return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
},
+ del(payload) {
+ return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
+ },
// 过滤后端传回的详情数据
diff --git a/src/utils/dict.js b/src/utils/dict.js
index f90ec7c2..ecaafb16 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -99,7 +99,11 @@ export const DICT_TYPE = {
ORDER_STATUS: 'order_status',
ORDER_ORIGIN: 'order_Origin',
ORDER_PRIORITY: 'order_priority',
- PACK_SPEC: 'pack_spec'
+ PACK_SPEC: 'pack_spec',
+
+ // ============== EQUIPMENT - 设备模块 =============
+ MAINTAIN_TYPE: 'maintain_type',
+ FAULT_LEVEL: 'fault-level',
}
/**
diff --git a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
index af60c6ee..700cbb94 100644
--- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
@@ -6,24 +6,517 @@
-->
-
- collection config
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ section.name }}
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+ 编辑
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+