update 上传

src/components/base-dialog/addOrUpdate/index.vue

@@ -5,6 +5,7 @@
 				<!-- 如果需要更精细一点的布局，可以根据配置项实现地再复杂一点，但此处暂时全部采用一行两列布局  -->
 				<el-row v-for="n in rows" :key="n" :gutter="20">
 					<el-col v-for="c in COLUMN_PER_ROW" :key="`${n}+'col'+${c}`" :span="24 / COLUMN_PER_ROW">
+						<!-- :class="{ 'hidden-input': configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].hidden }" -->
 						<el-form-item
 							v-if="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]"
 							:prop="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name"
@@ -29,7 +30,12 @@
 								<el-option v-for="opt in configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].options" :key="opt.label" :label="opt.label" :value="opt.value" />
 							</el-select>
 							<el-switch v-if="getType(n, c) === 'switch'" v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]"></el-switch>
-							<el-cascader v-if="getType(n, c) === 'tree'" v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]"></el-cascader>
+							<el-cascader
+								v-if="getType(n, c) === 'cascader'"
+								v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]"
+								:options="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].options"
+								:props="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].props"
+							></el-cascader>
 							<el-time-select v-if="getType(n, c) === 'time'" v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]"></el-time-select>
 							<el-date-picker v-if="getType(n, c) === 'date'" v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]"></el-date-picker>
 						</el-form-item>
@@ -39,7 +45,8 @@
 				<!-- extra components , like Markdown or RichEdit -->
 				<template v-if="configs.extraComponents && configs.extraComponents.length > 0">
 					<el-form-item v-for="ec in configs.extraComponents" :key="ec.name" :label="ec.label">
-						<component :is="ec.component" v-model="dataForm[ec.name]"></component>
+						<!-- <component :is="ec.component" v-model="dataForm[ec.name]"></component> -->
+						<component :is="ec.component" v-bind="ec.props" />
 					</el-form-item>
 				</template>
 			</el-form>
@@ -274,6 +281,8 @@ export default {
 					return 'input'
 				} else if (['select' /** add more.. */].includes(opt.type)) {
 					return 'select'
+				} else if (['cascader'].includes(opt.type)) {
+					return 'cascader'
 				}
 				// add more...
 			} else {
@@ -314,7 +323,9 @@ export default {
 			/** 提取url */
 			const urls = {}
 			this.configs.operations.map(item => {
-				urls[item.name] = item.url
+				urls[item.name] = {}
+				urls[item.name].url = item.url
+				urls[item.name].extraFields = item.extraFields || {}
 			})
 			/** 操作 */
 			switch (btn.name) {
@@ -324,9 +335,9 @@ export default {
 					this.$refs['dataForm'].validate(valid => {
 						if (valid) {
 							this.$http({
-								url: this.$http.adornUrl(urls[btn.name]),
+								url: this.$http.adornUrl(urls[btn.name].url),
 								method: btn.name === 'save' ? 'POST' : 'PUT',
-								data: this.dataForm
+								data: { ...this.dataForm, ...urls[btn.name].extraFields }
 							})
 								.then(({ data: res }) => {
 									if (res && res.code === 0) {
@@ -379,7 +390,8 @@ export default {
 </script>
 
 <style scoped>
-.super-flexible-dialog >>> .el-select {
+.super-flexible-dialog >>> .el-select,
+.super-flexible-dialog >>> .el-cascader {
 	width: 100%;
 }
 
@@ -394,4 +406,8 @@ export default {
 	border-radius: 4px;
 	background: #ccc;
 }
+
+.super-flexible-dialog >>> .hidden-input {
+	display: none;
+}
 </style>

src/components/base-table/components/detailComponent.js

@@ -22,13 +22,15 @@ export default {
   },
   methods: {
     emitClick() {
-      this.$emit('emitData', {
+      console.log('inject data:' ,this.injectData)
-        action: this.injectData.actionName || 'view-detail-action',
+      this.$emit('emit-data', {
-        data: this.injectData.emitFullData ? this.injectData : { id: this.injectData.id }
+        type: this.injectData.head?.actionName || 'view-detail-action',
+        data: this.injectData.head?.emitFullData ? this.injectData : this.injectData.id
       })
     }
   },
   render: function (h) {
-    return h('span', null, [h('el-button', { props: { type: 'text' }, style: { paddingLeft: 0 } }, this.injectData.buttonContent || this.defaultText)])
+    // console.log(this)
+    return h('span', null, [h('el-button', { props: { type: 'text' }, style: { paddingLeft: 0 }, on: { click: this.emitClick } }, this.injectData.buttonContent || this.defaultText)])
   }
 }

src/components/base-upload/index.vue

@@ -0,0 +1,79 @@
+<template>
+	<div class="base-upload" style="border-radius: 8px; margin-top: 38px; padding: 0; max-height: 500px;">
+		<el-upload class="yd-upload" action="#" :http-request="handleUpload" multiple :file-list="fileList" :on-remove="handleRemove" :before-remove="beforeRemove">
+			<!-- <el-upload class="yd-upload" :action="$http.adornUrl(url)" multiple name="files" :data="extraParams" :file-list="fileList" :on-remove="handleRemove" :before-remove="beforeRemove"> -->
+			<el-button size="small" type="primary">{{ buttonContent }}</el-button>
+			<div v-if="tip" slot="tip" class="el-upload__tip">{{ tip }}</div>
+		</el-upload>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'BaseUpload',
+	props: {
+		url: String,
+		buttonContent: String,
+		tip: {
+			type: String,
+			default: null
+		},
+		extraParams: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			fileList: []
+		}
+	},
+	methods: {
+		/** 自定义上传行为 */
+		handleUpload(file) {
+			const formData = new FormData()
+			let files = file.file
+			formData.append('files', files)
+
+			this.$http({
+				url: this.$http.adornUrl(this.url),
+				method: 'POST',
+				data: formData,
+				params: {
+					typeCode: this.extraParams.typeCode
+				}
+			}).then(({ data: res }) => {
+				if (res && res.code === 0) {
+          console.log(this.fileList)
+          this.fileList.splice(0)
+          res.data.forEach(item => {
+            this.fileList.push(item) // <== 此处的数据结构可能要调整
+          })
+          // TODO: 在新增和更新阶段，带入 files[] 数组给后端，就可完成文件和设备类型的绑定、删除操作
+        }
+			})
+		},
+		beforeRemove(file, filelist) {
+			return this.$confirm(`确定移除 ${file.name}?`)
+		},
+		handleRemove(file, filelist) {}
+	}
+}
+</script>
+
+<style scoped>
+.base-upload >>> .yd-upload {
+	margin-bottom: 20px;
+}
+
+.base-upload >>> .el-upload--text {
+	width: 100px;
+	position: relative;
+	left: -72px;
+}
+
+.base-upload >>> .el-upload__tip {
+	margin-top: 0;
+	margin-left: 5px;
+}
+</style>

src/views/modules/monitoring/equipmentGroup.vue

@@ -60,11 +60,20 @@ const tableConfigs = [
 	{ prop: 'name', name: '分组名称' },
 	{ prop: 'code', name: '分组编码' },
 	{ prop: 'remark', name: '备注' },
-	{ prop: 'alarm', name: '报警', buttonContent: '查看报警', subcomponent: TableTextComponent },
+	{ prop: 'alarm', name: '报警', buttonContent: '查看报警', subcomponent: TableTextComponent, actionName: 'view-alarm' },
 	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
-const addOrUpdateConfigs = {}
+const addOrUpdateConfigs = {
+	type: 'dialog',
+	infoUrl: '/monitoring/equipmentGroup',
+	fields: [{ name: 'name', label: '分组名称' }, { name: 'code', label: '分组编码' }, 'remark'],
+	operations: [
+		{ name: 'cancel', showAlways: true },
+		{ name: 'save', url: '/monitoring/equipmentGroup', permission: '', showOnEdit: false },
+		{ name: 'update', url: '/monitoring/equipmentGroup', permission: '', showOnEdit: true }
+	]
+}
 
 export default {
 	data() {
@@ -131,6 +140,17 @@ export default {
 		},
 		handleOperations({ type, data: id }) {
 			switch (type) {
+				case 'view-alarm':
+					const { name, code } = this.dataList.find(item => item.id === id)
+					this.$router.push({
+						name: 'monitoring-equipmentGroupAlarm',
+						params: {
+							groupName: name,
+							groupCode: code,
+							id
+						}
+					})
+					break
 				case 'edit':
 					return this.addOrUpdateHandle(id)
 				case 'delete':

src/views/modules/monitoring/equipmentGroupAlarm.vue

@@ -1,21 +1,24 @@
 <template>
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-			<el-form-item label="设备分组名称"> <strong>111</strong></el-form-item>
+			<el-form-item label="设备分组名称">
+				<strong>{{ $route.params.groupName }}</strong></el-form-item
+			>
 
 			<el-form-item label="设备分组编码">
-				<strong>111</strong>
+				<strong>{{ $route.params.groupCode }}</strong>
 			</el-form-item>
 			<!-- <el-form-item>
 				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
-			</el-form-item>
-			<el-form-item>
-				<el-button @click="getDataList()">查询</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipmengroupalarm:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipmengroupalarm:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">
-					批量删除
-				</el-button>
 			</el-form-item> -->
+			<br />
+			<el-form-item>
+				<!-- <el-button @click="getDataList()">查询</el-button> -->
+				<el-button v-if="$hasPermission('monitoring:equipmentgroupalarm:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:equipmentgroupalarm:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">
+					批量删除
+				</el-button> -->
+			</el-form-item>
 		</el-form>
 		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
 			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
@@ -45,7 +48,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -56,23 +59,32 @@
 			layout="total, sizes, prev, pager, next, jumper"
 		></el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
 <script>
-import AddOrUpdate from './equipmentGroupAlarm-add-or-update'
+// import AddOrUpdate from './equipmentGroupAlarm-add-or-update'
-
+import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'
+import dictListMixin from '@/mixins/dictlist-module'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
-import TableTextComponent from '@/components/base-table/components/detailComponent'
+// import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+// const alarmTypeDictId = '1557925215454814210'
+// const alarmLevelDictId = '1557925289517834242'
+const dictEntries = {
+	alarmType: { value: '1557925215454814210', field: 'typeDictValue' }, // field 和下面 addOrUpdateConfigs 里对应
+	alarmLevel: { value: '1557925289517834242', field: 'gradeDictValue' }
+}
 
 const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
 	{ prop: 'code', name: '报警编码' },
 	{ prop: 'typeDictValue', name: '报警类型' },
 	{ prop: 'gradeDictValue', name: '报警级别' },
-	{ prop: 'alarmContent', name: '报警内容' }
+	{ prop: 'alarmContent', name: '报警内容' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 	// { prop: 'typeDictValue', name: '报警类型 字典表关联label_value' },
 	// { prop: 'gradeDictValue', name: '报警级别 字典表关联label_value' },
 	// { "prop": "id", "name": "ID" },
@@ -92,9 +104,27 @@ const tableConfigs = [
 	// { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
+const addOrUpdateConfigs = {
+	type: 'dialog',
+	infoUrl: '/monitoring/equipmentGroupAlarm',
+	fields: [
+		{ name: 'code', label: '报警编码', required: true },
+		{ name: 'typeDictValue', label: '报警类型', type: 'select', options: [] },
+		{ name: 'gradeDictValue', label: '报警级别', type: 'select', options: [] },
+		{ name: 'alarmContent', label: '报警内容', required: true }
+	],
+	operations: [
+		{ name: 'cancel', showAlways: true },
+		{ name: 'save', url: '/monitoring/equipmentGroupAlarm', extraFields: { equipmentGroupId: null }, permission: '', showOnEdit: false },
+		{ name: 'update', url: '/monitoring/equipmentGroupAlarm', extraFields: { equipmentGroupId: null }, permission: '', showOnEdit: true }
+	]
+}
+
 export default {
+	mixins: [dictListMixin],
 	data() {
 		return {
+			addOrUpdateConfigs,
 			tableConfigs,
 			dataForm: {
 				key: ''
@@ -113,9 +143,25 @@ export default {
 		BaseTable
 	},
 	activated() {
+		this.getDictData()
 		this.getDataList()
 	},
 	methods: {
+		// 获取字典数据
+		getDictData() {
+			this.initDictList(Object.entries(dictEntries).map(([_, item]) => item.value))
+			this.addOrUpdateConfigs.fields.forEach(item => {
+				if (item.options && Array.isArray(item.options)) {
+					let id
+					Object.entries(dictEntries).forEach(([_, d]) => {
+						if (d.field === item.name) {
+							id = d.value
+						}
+					})
+					item.options = this.dictList[id]
+				}
+			})
+		},
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true
@@ -125,7 +171,7 @@ export default {
 				params: this.$http.adornParams({
 					page: this.pageIndex,
 					limit: this.pageSize,
-					key: this.dataForm.key
+					groupId: this.$route.params.id
 				})
 			}).then(({ data }) => {
 				if (data && data.code === 0) {
@@ -153,8 +199,21 @@ export default {
 		selectionChangeHandle(val) {
 			this.dataListSelections = val
 		},
+		handleOperations({ type, data: id }) {
+			switch (type) {
+				case 'edit':
+					return this.addOrUpdateHandle(id)
+				case 'delete': 
+					return this.deleteHandle(id)
+			}
+		},
 		// 新增 / 修改
 		addOrUpdateHandle(id) {
+			this.addOrUpdateConfigs.operations.forEach(item => {
+				if (item.extraFields) {
+					item.extraFields.equipmentGroupId = this.$route.params.id || null
+				}
+			})
 			this.addOrUpdateVisible = true
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id)

src/views/modules/monitoring/equipmentType.vue

@@ -55,7 +55,7 @@ import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 // import AddOrUpdate from './equipmentType-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
-import TableTextComponent from '@/components/base-table/components/detailComponent'
+// import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
@@ -65,7 +65,34 @@ const tableConfigs = [
 	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
-const addOrUpdateConfigs = {}
+const addOrUpdateConfigs = {
+	type: 'dialog',
+	infoUrl: '/monitoring/equipmentType',
+	fields: [
+		{ name: 'name', label: '设备类型名称' },
+		{ name: 'code', label: '设备类型编码', api: '/monitoring/equipmentType/getCode' },
+		{ name: 'parentId', label: '父类', type: 'cascader', props: { label: 'name', value: 'id', checkStrictly: true, emitPath: false }, options: [] },
+		'remark'
+	],
+	operations: [
+		{ name: 'cancel', showAlways: true },
+		{ name: 'save', url: '/monitoring/equipmentType', permission: '', showOnEdit: false },
+		{ name: 'update', url: '/monitoring/equipmentType', permission: '', showOnEdit: true }
+	],
+	extraComponents: [
+		{
+			name: 'file-upload-key',
+			label: '上传资料',
+			component: () => import('@/components/base-upload'),
+			props: { // 上传组件需要的 props
+				url: "/monitoring/attachment/uploadFileFormData",
+				extraParams: { typeCode: 123 },
+				buttonContent: '点击上传',
+				tip: '上传文件大小不要超过 2mb (2048kb)'
+			}
+		}
+	]
+}
 
 export default {
 	data() {
@@ -89,9 +116,23 @@ export default {
 		BaseTable
 	},
 	activated() {
+		this.getTreeEquipmentType()
 		this.getDataList()
 	},
 	methods: {
+		// 获取设备类型树形数据
+		getTreeEquipmentType() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentType/getTree'),
+				method: 'post'
+			}).then(({ data: res }) => {
+				if (res && res.code === 0 && res.data.length) {
+					this.addOrUpdateConfigs.fields.find(item => item.name === 'parentId').options = res.data
+				} else {
+					this.addOrUpdateConfigs.fields.find(item => item.name === 'parentId').options.splice(0)
+				}
+			})
+		},
 		// 获取数据列表
 		getDataList() {
 			this.addOrUpdateVisible = false
@@ -140,6 +181,8 @@ export default {
 		},
 		// 新增 / 修改
 		addOrUpdateHandle(id) {
+			// 更新树形结构
+			this.getTreeEquipmentType()
 			this.addOrUpdateVisible = true
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id)

src/views/modules/monitoring/product.vue

@@ -105,8 +105,6 @@ const addOrUpdateConfigs = {
 				}
 			]
 		},
-		'remark',
-		'specifications',
 		{
 			name: 'typeDictValue',
 			label: '产品类型', // 对于非常见属性，最好自己指定label
@@ -123,7 +121,15 @@ const addOrUpdateConfigs = {
 			options: [
 				// 动态获取
 			]
-		}
+		},
+		{
+			name: 'area',
+			label: '单位平方数',
+			type: 'number',
+			rules: [{ type: 'number', transform: val => Number(val), message: '请输入数字', trigger: 'blur' }]
+		},
+		'specifications',
+		'remark'
 	],
 	operations: [
 		{ name: 'cancel', url: true, showAlways: true },

src/views/modules/monitoring/productionLine.vue

@@ -60,7 +60,7 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 
 const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
-	{ prop: 'factoryId', name: '工厂ID' },
+	{ prop: 'factoryName', name: '工厂' },
 	{ prop: 'name', name: '产线名称' },
 	{ prop: 'code', name: '产线编码' },
 	{ prop: 'status', name: '产线状态' },

src/views/modules/monitoring/qualityInspectionRecord.vue

@@ -57,7 +57,7 @@ import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 // import AddOrUpdate from './qualityInspectionRecord-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
-import TableTextComponent from '@/components/base-table/components/detailComponent'
+// import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
@@ -78,7 +78,13 @@ const tableConfigs = [
 	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
-const addOrUpdateConfigs = {}
+const addOrUpdateConfigs = {
+	type: 'dialog',
+	infoUrl: '/monitoring/qualityInspectionRecord',
+	fields: [
+		{name: '', label: '检测类型', type: 'select', options: []}
+	]
+}
 
 export default {
 	data() {