From 3999e4e589be3f05ca38b292098e95ccf1d2141f Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Tue, 20 Sep 2022 15:59:45 +0800
Subject: [PATCH 01/14] =?UTF-8?q?init=20=E6=95=B0=E6=8D=AE=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.js                                |   4 +
 src/i18n/zh-CN.js                             |   4 +
 .../monitoring/equipmentEfficiency.vue        | 445 ++++++++++++++++++
 .../modules/monitoring/equipmentException.vue | 445 ++++++++++++++++++
 .../monitoring/equipmentTimesequence.vue      | 445 ++++++++++++++++++
 5 files changed, 1343 insertions(+)
 create mode 100644 src/views/modules/monitoring/equipmentEfficiency.vue
 create mode 100644 src/views/modules/monitoring/equipmentException.vue
 create mode 100644 src/views/modules/monitoring/equipmentTimesequence.vue

diff --git a/src/i18n/en.js b/src/i18n/en.js
index 5be8b88..fdd4cb4 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -17,6 +17,7 @@ t.routes['质量管理'] = 'Quality Management'
 t.routes['权限管理'] = 'Permission Management'
 t.routes['系统设置'] = 'System Settings'
 t.routes['日志管理'] = 'Log Management'
+t.routes['数据分析'] = 'Data Analysis'
 
 // 二级
 t.routes['厂务'] = 'Factory Affair'
@@ -42,6 +43,9 @@ t.routes['定时任务'] = 'Timed Tasks'
 t.routes['文件上传'] = 'File Upload'
 t.routes['登录日志'] = 'Login Records'
 t.routes['操作日志'] = 'Oprations Records'
+t.routes['设备效率分析'] = 'Equipment Efficiency Analysis'
+t.routes['设备异常分析'] = 'Equipment Exceptions Analysis'
+t.routes['设备状态时序图'] = 'Equipment Status Timesequence'
 
 // 三级
 t.routes['工厂'] = 'Factory'
diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 6acd25b..9657383 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -18,6 +18,7 @@ t.routes['质量管理'] = '质量管理'
 t.routes['权限管理'] = '权限管理'
 t.routes['系统设置'] = '系统设置'
 t.routes['日志管理'] = '日志管理'
+t.routes['数据分析'] = '数据分析'
 
 // 二级
 t.routes['厂务'] = '厂务'
@@ -43,6 +44,9 @@ t.routes['定时任务'] = '定时任务'
 t.routes['文件上传'] = '文件上传'
 t.routes['登录日志'] = '登录日志'
 t.routes['操作日志'] = '操作日志'
+t.routes['设备效率分析'] = '设备效率分析'
+t.routes['设备异常分析'] = '设备异常分析'
+t.routes['设备状态时序图'] = '设备状态时序图'
 
 // 三级
 t.routes['工厂'] = '工厂'
diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue
new file mode 100644
index 0000000..87b398b
--- /dev/null
+++ b/src/views/modules/monitoring/equipmentEfficiency.vue
@@ -0,0 +1,445 @@
+<template>
+	<!-- 设备效率分析 -->
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">{{ $t('search') }}</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipment:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">{{ $t('export') }}</el-button>
+			</el-form-item>
+		</el-form>
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		></el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+	</div>
+</template>
+
+<script>
+import i18n from '@/i18n'
+import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
+// import AddOrUpdate from './equipment-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 CKEditor from 'ckeditor4-vue'
+import { calcMaxHeight } from '@/utils'
+import { timeFilter } from '@/utils/filters'
+import Cookies from 'js-cookie'
+
+const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
+	{
+		prop: 'createTime',
+		name: i18n.t('createTime'),
+		filter: timeFilter
+	},
+	{ prop: 'name', name: i18n.t('eq.name') },
+	{ prop: 'code', name: i18n.t('eq.code') },
+	{ prop: 'equipmentTypeName', name: i18n.t('eq.type') },
+	{ prop: 'groupName', name: i18n.t('eq.group') },
+	{ prop: 'enName', name: i18n.t('enname') },
+	{ prop: 'abbr', name: i18n.t('abbr') },
+	{
+		prop: 'details',
+		name: i18n.t('detail'),
+		subcomponent: TableTextComponent,
+		actionName: 'view-detail'
+	},
+	{
+		prop: 'operations',
+		name: i18n.t('handle'),
+		fixed: 'right',
+		width: 180,
+		subcomponent: TableOperateComponent,
+		options: ['edit', 'delete']
+	}
+]
+
+const addOrUpdateConfigs = {
+	type: 'dialog',
+	infoUrl: '/monitoring/equipment',
+	fields: [
+		{ name: 'name', label: i18n.t('eq.name'), required: true },
+		{ name: 'code', label: i18n.t('eq.code') },
+		{ name: 'enName', label: i18n.t('enname') },
+		{ name: 'abbr', label: i18n.t('abbr') },
+		{
+			name: 'equipmentTypeId',
+			label: i18n.t('eq.type'),
+			required: true,
+			type: 'select',
+			options: []
+		},
+		{
+			name: 'groupId',
+			label: i18n.t('eq.group'),
+			required: true,
+			type: 'select',
+			options: []
+		},
+		{
+			name: 'productionTime',
+			label: i18n.t('produceTime'),
+			type: 'date',
+			props: {
+				'type': 'date', // element-ui 的配置
+				'placeholder': i18n.t('hints.date'),
+				'value-format': 'yyyy-MM-ddTHH:mm:ss',
+				'style': {
+					width: '100%'
+				}
+			}
+		},
+		{
+			name: 'enterTime',
+			label: i18n.t('enterTime'),
+			type: 'date',
+			props: {
+				'type': 'date', // element-ui 的配置
+				'placeholder': i18n.t('hints.date'),
+				'value-format': 'yyyy-MM-ddTHH:mm:ss',
+				'style': {
+					width: '100%'
+				}
+			}
+		},
+		{
+			name: 'tvalue',
+			label: i18n.t('eq.tvalue'),
+			required: true,
+			rules: [
+				{
+					type: 'number',
+					message: i18n.t('hints.number'),
+					trigger: 'blur',
+					transform: val => Number(val)
+				}
+			]
+		},
+		{
+			name: 'processingTime',
+			label: i18n.t('eq.processingTime'),
+			rules: [
+				{
+					type: 'number',
+					message: i18n.t('hints.number'),
+					trigger: 'blur',
+					transform: val => Number(val)
+				}
+			]
+		},
+		{ name: 'manufacturer', label: i18n.t('manufacturer') },
+		{ name: 'spec', label: i18n.t('eq.grade') },
+		{
+			name: 'dataType',
+			label: i18n.t('eq.dtype'),
+			required: true,
+			type: 'select',
+			options: [
+				{ value: 0, label: i18n.t('eq.dtypenone') },
+				{ value: 1, label: i18n.t('eq.dtypeinput') },
+				{ value: 2, label: i18n.t('eq.dtypeoutput') }
+			]
+		},
+		{ name: 'remark', label: i18n.t('remark') }
+	],
+	extraComponents: [
+		{
+			name: 'description',
+			hasModel: true,
+			label: i18n.t('desc'),
+			fieldType: 'string',
+			component: CKEditor.component,
+			props: {
+				// value: 'tests',
+				config: {
+					// ckeditor 的配置: https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
+					// toolbar: [['Bold']]
+					language: Cookies.get('language') || 'en'
+				}
+			}
+		},
+		{
+			name: 'files',
+			label: i18n.t('upload.title'),
+			fieldType: 'array',
+			component: () => import('@/components/base-upload'),
+			props: {
+				// 上传组件需要的 props
+				url: '/monitoring/attachment/uploadFileFormData',
+				extraParams: { typeCode: 'EquipmentInfoFile' },
+				buttonContent: i18n.t('upload.button'),
+				tip: i18n.t('hints.upload2m')
+			}
+		},
+		{
+			name: 'files',
+			label: i18n.t('eq.image'),
+			fieldType: 'array',
+			component: () => import('@/components/base-upload'),
+			props: {
+				// 上传组件需要的 props
+				url: '/monitoring/attachment/uploadFileFormData',
+				extraParams: { typeCode: 'EquipmentInfoImage' },
+				buttonContent: i18n.t('upload.button'),
+				tip: i18n.t('hints.upload2mPic')
+			}
+		}
+	],
+	subtable: {
+		title: i18n.t('eq.viewattr'),
+		url: '/monitoring/equipmentAttr',
+		relatedField: 'equipmentId',
+		tableConfigs: [
+			{ type: 'index', width: 100, name: i18n.t('index') },
+			{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
+			{ prop: 'attrName', name: i18n.t('attrName'), formField: true },
+			{ prop: 'attrValue', name: i18n.t('attrValue'), formField: true },
+			{
+				prop: 'operations',
+				name: i18n.t('handle'),
+				fixed: 'right',
+				width: 180,
+				subcomponent: TableOperateComponent,
+				options: ['edit', 'delete']
+			}
+		]
+	},
+	operations: [
+		{ name: 'cancel', showAlways: true },
+		{
+			name: 'save',
+			url: '/monitoring/equipment',
+			permission: 'monitoring:equipment:save',
+			showOnEdit: false
+		},
+		{
+			name: 'update',
+			url: '/monitoring/equipment',
+			permission: 'monitoring:equipment:update',
+			showOnEdit: true
+		}
+	]
+}
+
+export default {
+	data() {
+		return {
+			calcMaxHeight,
+			tableConfigs,
+			addOrUpdateConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		console.log('activated')
+		this.getDataList()
+		this.getGroupList()
+		this.getTypeList()
+	},
+	methods: {
+		// 获取设备类型列表
+		getTypeList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentType/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					// page: this.pageIndex,
+					// limit: this.pageSize,
+					// key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				const eqTypeConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentTypeId')
+				eqTypeConfig.options =
+					data.data?.list?.map(item => ({
+						value: item.id,
+						label: item.name
+					})) || []
+			})
+		},
+		// 获取设备分组列表
+		getGroupList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentGroup/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					// page: this.pageIndex,
+					// limit: this.pageSize,
+					// key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				const groupConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'groupId')
+				groupConfig.options =
+					data.data?.list?.map(item => ({
+						value: item.id,
+						label: item.name
+					})) || []
+			})
+		},
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipment/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					// this.dataList = new Array(20).fill('1')
+					// console.log('data list', this.dataList)
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		handleOperations({ type, data: id }) {
+			switch (type) {
+				case 'view-detail':
+					// const { name, code } = this.dataList.find(item => item.id === id)
+					// this.$router.push({
+					// 	name: 'monitoring-equipmentAdd',
+					// 	params: {
+					// 		isdetail: true,
+					// 		equipmentId: id
+					// 	}
+					// })
+					// break
+					return this.addOrUpdateHandle(id, true)
+				case 'edit':
+					return this.addOrUpdateHandle(id)
+				case 'delete':
+					return this.deleteHandle(id)
+			}
+		},
+		exportHandle() {
+			// this.$http.get(this.$http.adornUrl('/monitoring/equipment/export')).then(({ data: res }) => {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipment/export'),
+				method: 'get',
+				responseType: 'blob'
+			}).then(res => {
+				let fileName = 'equipment-list.xls'
+				if (res.headers['content-disposition']) {
+					const contentDisposition = res.headers['content-disposition']
+					fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
+				}
+
+				fileName = decodeURIComponent(fileName)
+
+				const blob = new Blob([res.data])
+
+				if ('download' in document.createElement('a')) {
+					const alink = document.createElement('a')
+					alink.download = fileName
+					alink.style.display = 'none'
+					alink.target = '_blank'
+					alink.href = URL.createObjectURL(blob)
+					document.body.appendChild(alink)
+					alink.click()
+					URL.revokeObjectURL(alink.href)
+					document.body.removeChild(alink)
+				} else {
+					navigator.msSaveBlob(blob, fileName)
+				}
+			})
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id, isdetail = false) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, isdetail)
+			})
+			// this.$router.push({
+			// 	name: 'monitoring-equipmentAdd',
+			// 	params: {
+			// 		equipmentId: id
+			// 	}
+			// })
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
+				confirmButtonText: i18n.t('confirm'),
+				cancelButtonText: i18n.t('cancel'),
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipment'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false, 'raw')
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: i18n.t('prompt.success'),
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>
diff --git a/src/views/modules/monitoring/equipmentException.vue b/src/views/modules/monitoring/equipmentException.vue
new file mode 100644
index 0000000..f581385
--- /dev/null
+++ b/src/views/modules/monitoring/equipmentException.vue
@@ -0,0 +1,445 @@
+<template>
+	<!-- 设备异常分析 -->
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">{{ $t('search') }}</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipment:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">{{ $t('export') }}</el-button>
+			</el-form-item>
+		</el-form>
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		></el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+	</div>
+</template>
+
+<script>
+import i18n from '@/i18n'
+import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
+// import AddOrUpdate from './equipment-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 CKEditor from 'ckeditor4-vue'
+import { calcMaxHeight } from '@/utils'
+import { timeFilter } from '@/utils/filters'
+import Cookies from 'js-cookie'
+
+const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
+	{
+		prop: 'createTime',
+		name: i18n.t('createTime'),
+		filter: timeFilter
+	},
+	{ prop: 'name', name: i18n.t('eq.name') },
+	{ prop: 'code', name: i18n.t('eq.code') },
+	{ prop: 'equipmentTypeName', name: i18n.t('eq.type') },
+	{ prop: 'groupName', name: i18n.t('eq.group') },
+	{ prop: 'enName', name: i18n.t('enname') },
+	{ prop: 'abbr', name: i18n.t('abbr') },
+	{
+		prop: 'details',
+		name: i18n.t('detail'),
+		subcomponent: TableTextComponent,
+		actionName: 'view-detail'
+	},
+	{
+		prop: 'operations',
+		name: i18n.t('handle'),
+		fixed: 'right',
+		width: 180,
+		subcomponent: TableOperateComponent,
+		options: ['edit', 'delete']
+	}
+]
+
+const addOrUpdateConfigs = {
+	type: 'dialog',
+	infoUrl: '/monitoring/equipment',
+	fields: [
+		{ name: 'name', label: i18n.t('eq.name'), required: true },
+		{ name: 'code', label: i18n.t('eq.code') },
+		{ name: 'enName', label: i18n.t('enname') },
+		{ name: 'abbr', label: i18n.t('abbr') },
+		{
+			name: 'equipmentTypeId',
+			label: i18n.t('eq.type'),
+			required: true,
+			type: 'select',
+			options: []
+		},
+		{
+			name: 'groupId',
+			label: i18n.t('eq.group'),
+			required: true,
+			type: 'select',
+			options: []
+		},
+		{
+			name: 'productionTime',
+			label: i18n.t('produceTime'),
+			type: 'date',
+			props: {
+				'type': 'date', // element-ui 的配置
+				'placeholder': i18n.t('hints.date'),
+				'value-format': 'yyyy-MM-ddTHH:mm:ss',
+				'style': {
+					width: '100%'
+				}
+			}
+		},
+		{
+			name: 'enterTime',
+			label: i18n.t('enterTime'),
+			type: 'date',
+			props: {
+				'type': 'date', // element-ui 的配置
+				'placeholder': i18n.t('hints.date'),
+				'value-format': 'yyyy-MM-ddTHH:mm:ss',
+				'style': {
+					width: '100%'
+				}
+			}
+		},
+		{
+			name: 'tvalue',
+			label: i18n.t('eq.tvalue'),
+			required: true,
+			rules: [
+				{
+					type: 'number',
+					message: i18n.t('hints.number'),
+					trigger: 'blur',
+					transform: val => Number(val)
+				}
+			]
+		},
+		{
+			name: 'processingTime',
+			label: i18n.t('eq.processingTime'),
+			rules: [
+				{
+					type: 'number',
+					message: i18n.t('hints.number'),
+					trigger: 'blur',
+					transform: val => Number(val)
+				}
+			]
+		},
+		{ name: 'manufacturer', label: i18n.t('manufacturer') },
+		{ name: 'spec', label: i18n.t('eq.grade') },
+		{
+			name: 'dataType',
+			label: i18n.t('eq.dtype'),
+			required: true,
+			type: 'select',
+			options: [
+				{ value: 0, label: i18n.t('eq.dtypenone') },
+				{ value: 1, label: i18n.t('eq.dtypeinput') },
+				{ value: 2, label: i18n.t('eq.dtypeoutput') }
+			]
+		},
+		{ name: 'remark', label: i18n.t('remark') }
+	],
+	extraComponents: [
+		{
+			name: 'description',
+			hasModel: true,
+			label: i18n.t('desc'),
+			fieldType: 'string',
+			component: CKEditor.component,
+			props: {
+				// value: 'tests',
+				config: {
+					// ckeditor 的配置: https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
+					// toolbar: [['Bold']]
+					language: Cookies.get('language') || 'en'
+				}
+			}
+		},
+		{
+			name: 'files',
+			label: i18n.t('upload.title'),
+			fieldType: 'array',
+			component: () => import('@/components/base-upload'),
+			props: {
+				// 上传组件需要的 props
+				url: '/monitoring/attachment/uploadFileFormData',
+				extraParams: { typeCode: 'EquipmentInfoFile' },
+				buttonContent: i18n.t('upload.button'),
+				tip: i18n.t('hints.upload2m')
+			}
+		},
+		{
+			name: 'files',
+			label: i18n.t('eq.image'),
+			fieldType: 'array',
+			component: () => import('@/components/base-upload'),
+			props: {
+				// 上传组件需要的 props
+				url: '/monitoring/attachment/uploadFileFormData',
+				extraParams: { typeCode: 'EquipmentInfoImage' },
+				buttonContent: i18n.t('upload.button'),
+				tip: i18n.t('hints.upload2mPic')
+			}
+		}
+	],
+	subtable: {
+		title: i18n.t('eq.viewattr'),
+		url: '/monitoring/equipmentAttr',
+		relatedField: 'equipmentId',
+		tableConfigs: [
+			{ type: 'index', width: 100, name: i18n.t('index') },
+			{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
+			{ prop: 'attrName', name: i18n.t('attrName'), formField: true },
+			{ prop: 'attrValue', name: i18n.t('attrValue'), formField: true },
+			{
+				prop: 'operations',
+				name: i18n.t('handle'),
+				fixed: 'right',
+				width: 180,
+				subcomponent: TableOperateComponent,
+				options: ['edit', 'delete']
+			}
+		]
+	},
+	operations: [
+		{ name: 'cancel', showAlways: true },
+		{
+			name: 'save',
+			url: '/monitoring/equipment',
+			permission: 'monitoring:equipment:save',
+			showOnEdit: false
+		},
+		{
+			name: 'update',
+			url: '/monitoring/equipment',
+			permission: 'monitoring:equipment:update',
+			showOnEdit: true
+		}
+	]
+}
+
+export default {
+	data() {
+		return {
+			calcMaxHeight,
+			tableConfigs,
+			addOrUpdateConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		console.log('activated')
+		this.getDataList()
+		this.getGroupList()
+		this.getTypeList()
+	},
+	methods: {
+		// 获取设备类型列表
+		getTypeList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentType/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					// page: this.pageIndex,
+					// limit: this.pageSize,
+					// key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				const eqTypeConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentTypeId')
+				eqTypeConfig.options =
+					data.data?.list?.map(item => ({
+						value: item.id,
+						label: item.name
+					})) || []
+			})
+		},
+		// 获取设备分组列表
+		getGroupList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentGroup/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					// page: this.pageIndex,
+					// limit: this.pageSize,
+					// key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				const groupConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'groupId')
+				groupConfig.options =
+					data.data?.list?.map(item => ({
+						value: item.id,
+						label: item.name
+					})) || []
+			})
+		},
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipment/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					// this.dataList = new Array(20).fill('1')
+					// console.log('data list', this.dataList)
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		handleOperations({ type, data: id }) {
+			switch (type) {
+				case 'view-detail':
+					// const { name, code } = this.dataList.find(item => item.id === id)
+					// this.$router.push({
+					// 	name: 'monitoring-equipmentAdd',
+					// 	params: {
+					// 		isdetail: true,
+					// 		equipmentId: id
+					// 	}
+					// })
+					// break
+					return this.addOrUpdateHandle(id, true)
+				case 'edit':
+					return this.addOrUpdateHandle(id)
+				case 'delete':
+					return this.deleteHandle(id)
+			}
+		},
+		exportHandle() {
+			// this.$http.get(this.$http.adornUrl('/monitoring/equipment/export')).then(({ data: res }) => {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipment/export'),
+				method: 'get',
+				responseType: 'blob'
+			}).then(res => {
+				let fileName = 'equipment-list.xls'
+				if (res.headers['content-disposition']) {
+					const contentDisposition = res.headers['content-disposition']
+					fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
+				}
+
+				fileName = decodeURIComponent(fileName)
+
+				const blob = new Blob([res.data])
+
+				if ('download' in document.createElement('a')) {
+					const alink = document.createElement('a')
+					alink.download = fileName
+					alink.style.display = 'none'
+					alink.target = '_blank'
+					alink.href = URL.createObjectURL(blob)
+					document.body.appendChild(alink)
+					alink.click()
+					URL.revokeObjectURL(alink.href)
+					document.body.removeChild(alink)
+				} else {
+					navigator.msSaveBlob(blob, fileName)
+				}
+			})
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id, isdetail = false) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, isdetail)
+			})
+			// this.$router.push({
+			// 	name: 'monitoring-equipmentAdd',
+			// 	params: {
+			// 		equipmentId: id
+			// 	}
+			// })
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
+				confirmButtonText: i18n.t('confirm'),
+				cancelButtonText: i18n.t('cancel'),
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipment'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false, 'raw')
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: i18n.t('prompt.success'),
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>
diff --git a/src/views/modules/monitoring/equipmentTimesequence.vue b/src/views/modules/monitoring/equipmentTimesequence.vue
new file mode 100644
index 0000000..d9ca13b
--- /dev/null
+++ b/src/views/modules/monitoring/equipmentTimesequence.vue
@@ -0,0 +1,445 @@
+<template>
+	<!-- 设备状态时序图 -->
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">{{ $t('search') }}</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipment:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">{{ $t('export') }}</el-button>
+			</el-form-item>
+		</el-form>
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		></el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+	</div>
+</template>
+
+<script>
+import i18n from '@/i18n'
+import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
+// import AddOrUpdate from './equipment-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 CKEditor from 'ckeditor4-vue'
+import { calcMaxHeight } from '@/utils'
+import { timeFilter } from '@/utils/filters'
+import Cookies from 'js-cookie'
+
+const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
+	{
+		prop: 'createTime',
+		name: i18n.t('createTime'),
+		filter: timeFilter
+	},
+	{ prop: 'name', name: i18n.t('eq.name') },
+	{ prop: 'code', name: i18n.t('eq.code') },
+	{ prop: 'equipmentTypeName', name: i18n.t('eq.type') },
+	{ prop: 'groupName', name: i18n.t('eq.group') },
+	{ prop: 'enName', name: i18n.t('enname') },
+	{ prop: 'abbr', name: i18n.t('abbr') },
+	{
+		prop: 'details',
+		name: i18n.t('detail'),
+		subcomponent: TableTextComponent,
+		actionName: 'view-detail'
+	},
+	{
+		prop: 'operations',
+		name: i18n.t('handle'),
+		fixed: 'right',
+		width: 180,
+		subcomponent: TableOperateComponent,
+		options: ['edit', 'delete']
+	}
+]
+
+const addOrUpdateConfigs = {
+	type: 'dialog',
+	infoUrl: '/monitoring/equipment',
+	fields: [
+		{ name: 'name', label: i18n.t('eq.name'), required: true },
+		{ name: 'code', label: i18n.t('eq.code') },
+		{ name: 'enName', label: i18n.t('enname') },
+		{ name: 'abbr', label: i18n.t('abbr') },
+		{
+			name: 'equipmentTypeId',
+			label: i18n.t('eq.type'),
+			required: true,
+			type: 'select',
+			options: []
+		},
+		{
+			name: 'groupId',
+			label: i18n.t('eq.group'),
+			required: true,
+			type: 'select',
+			options: []
+		},
+		{
+			name: 'productionTime',
+			label: i18n.t('produceTime'),
+			type: 'date',
+			props: {
+				'type': 'date', // element-ui 的配置
+				'placeholder': i18n.t('hints.date'),
+				'value-format': 'yyyy-MM-ddTHH:mm:ss',
+				'style': {
+					width: '100%'
+				}
+			}
+		},
+		{
+			name: 'enterTime',
+			label: i18n.t('enterTime'),
+			type: 'date',
+			props: {
+				'type': 'date', // element-ui 的配置
+				'placeholder': i18n.t('hints.date'),
+				'value-format': 'yyyy-MM-ddTHH:mm:ss',
+				'style': {
+					width: '100%'
+				}
+			}
+		},
+		{
+			name: 'tvalue',
+			label: i18n.t('eq.tvalue'),
+			required: true,
+			rules: [
+				{
+					type: 'number',
+					message: i18n.t('hints.number'),
+					trigger: 'blur',
+					transform: val => Number(val)
+				}
+			]
+		},
+		{
+			name: 'processingTime',
+			label: i18n.t('eq.processingTime'),
+			rules: [
+				{
+					type: 'number',
+					message: i18n.t('hints.number'),
+					trigger: 'blur',
+					transform: val => Number(val)
+				}
+			]
+		},
+		{ name: 'manufacturer', label: i18n.t('manufacturer') },
+		{ name: 'spec', label: i18n.t('eq.grade') },
+		{
+			name: 'dataType',
+			label: i18n.t('eq.dtype'),
+			required: true,
+			type: 'select',
+			options: [
+				{ value: 0, label: i18n.t('eq.dtypenone') },
+				{ value: 1, label: i18n.t('eq.dtypeinput') },
+				{ value: 2, label: i18n.t('eq.dtypeoutput') }
+			]
+		},
+		{ name: 'remark', label: i18n.t('remark') }
+	],
+	extraComponents: [
+		{
+			name: 'description',
+			hasModel: true,
+			label: i18n.t('desc'),
+			fieldType: 'string',
+			component: CKEditor.component,
+			props: {
+				// value: 'tests',
+				config: {
+					// ckeditor 的配置: https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
+					// toolbar: [['Bold']]
+					language: Cookies.get('language') || 'en'
+				}
+			}
+		},
+		{
+			name: 'files',
+			label: i18n.t('upload.title'),
+			fieldType: 'array',
+			component: () => import('@/components/base-upload'),
+			props: {
+				// 上传组件需要的 props
+				url: '/monitoring/attachment/uploadFileFormData',
+				extraParams: { typeCode: 'EquipmentInfoFile' },
+				buttonContent: i18n.t('upload.button'),
+				tip: i18n.t('hints.upload2m')
+			}
+		},
+		{
+			name: 'files',
+			label: i18n.t('eq.image'),
+			fieldType: 'array',
+			component: () => import('@/components/base-upload'),
+			props: {
+				// 上传组件需要的 props
+				url: '/monitoring/attachment/uploadFileFormData',
+				extraParams: { typeCode: 'EquipmentInfoImage' },
+				buttonContent: i18n.t('upload.button'),
+				tip: i18n.t('hints.upload2mPic')
+			}
+		}
+	],
+	subtable: {
+		title: i18n.t('eq.viewattr'),
+		url: '/monitoring/equipmentAttr',
+		relatedField: 'equipmentId',
+		tableConfigs: [
+			{ type: 'index', width: 100, name: i18n.t('index') },
+			{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
+			{ prop: 'attrName', name: i18n.t('attrName'), formField: true },
+			{ prop: 'attrValue', name: i18n.t('attrValue'), formField: true },
+			{
+				prop: 'operations',
+				name: i18n.t('handle'),
+				fixed: 'right',
+				width: 180,
+				subcomponent: TableOperateComponent,
+				options: ['edit', 'delete']
+			}
+		]
+	},
+	operations: [
+		{ name: 'cancel', showAlways: true },
+		{
+			name: 'save',
+			url: '/monitoring/equipment',
+			permission: 'monitoring:equipment:save',
+			showOnEdit: false
+		},
+		{
+			name: 'update',
+			url: '/monitoring/equipment',
+			permission: 'monitoring:equipment:update',
+			showOnEdit: true
+		}
+	]
+}
+
+export default {
+	data() {
+		return {
+			calcMaxHeight,
+			tableConfigs,
+			addOrUpdateConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		console.log('activated')
+		this.getDataList()
+		this.getGroupList()
+		this.getTypeList()
+	},
+	methods: {
+		// 获取设备类型列表
+		getTypeList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentType/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					// page: this.pageIndex,
+					// limit: this.pageSize,
+					// key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				const eqTypeConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentTypeId')
+				eqTypeConfig.options =
+					data.data?.list?.map(item => ({
+						value: item.id,
+						label: item.name
+					})) || []
+			})
+		},
+		// 获取设备分组列表
+		getGroupList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentGroup/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					// page: this.pageIndex,
+					// limit: this.pageSize,
+					// key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				const groupConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'groupId')
+				groupConfig.options =
+					data.data?.list?.map(item => ({
+						value: item.id,
+						label: item.name
+					})) || []
+			})
+		},
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipment/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					// this.dataList = new Array(20).fill('1')
+					// console.log('data list', this.dataList)
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		handleOperations({ type, data: id }) {
+			switch (type) {
+				case 'view-detail':
+					// const { name, code } = this.dataList.find(item => item.id === id)
+					// this.$router.push({
+					// 	name: 'monitoring-equipmentAdd',
+					// 	params: {
+					// 		isdetail: true,
+					// 		equipmentId: id
+					// 	}
+					// })
+					// break
+					return this.addOrUpdateHandle(id, true)
+				case 'edit':
+					return this.addOrUpdateHandle(id)
+				case 'delete':
+					return this.deleteHandle(id)
+			}
+		},
+		exportHandle() {
+			// this.$http.get(this.$http.adornUrl('/monitoring/equipment/export')).then(({ data: res }) => {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipment/export'),
+				method: 'get',
+				responseType: 'blob'
+			}).then(res => {
+				let fileName = 'equipment-list.xls'
+				if (res.headers['content-disposition']) {
+					const contentDisposition = res.headers['content-disposition']
+					fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
+				}
+
+				fileName = decodeURIComponent(fileName)
+
+				const blob = new Blob([res.data])
+
+				if ('download' in document.createElement('a')) {
+					const alink = document.createElement('a')
+					alink.download = fileName
+					alink.style.display = 'none'
+					alink.target = '_blank'
+					alink.href = URL.createObjectURL(blob)
+					document.body.appendChild(alink)
+					alink.click()
+					URL.revokeObjectURL(alink.href)
+					document.body.removeChild(alink)
+				} else {
+					navigator.msSaveBlob(blob, fileName)
+				}
+			})
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id, isdetail = false) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, isdetail)
+			})
+			// this.$router.push({
+			// 	name: 'monitoring-equipmentAdd',
+			// 	params: {
+			// 		equipmentId: id
+			// 	}
+			// })
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
+				confirmButtonText: i18n.t('confirm'),
+				cancelButtonText: i18n.t('cancel'),
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipment'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false, 'raw')
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: i18n.t('prompt.success'),
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>
-- 
2.45.2


From a03d1db029e453baaf1baa777656f0cbc9272c8a Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Wed, 21 Sep 2022 10:15:53 +0800
Subject: [PATCH 02/14] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E5=88=86=E6=9E=90=E5=A4=B4=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentEfficiency.vue        | 122 ++++++++++++++++--
 1 file changed, 113 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue
index 87b398b..956cda2 100644
--- a/src/views/modules/monitoring/equipmentEfficiency.vue
+++ b/src/views/modules/monitoring/equipmentEfficiency.vue
@@ -2,13 +2,39 @@
 	<!-- 设备效率分析 -->
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<!-- 工厂 -->
 			<el-form-item>
-				<el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
+				<!-- <el-select v-model="dataForm.factoryId" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-select> -->
+				<el-select v-model="dataForm.ftId" :placeholder="'工厂'" clearable>
+					<el-option v-for="factory in factoryList" :key="factory.id" :value="factory.id" :label="factory.name" />
+				</el-select>
 			</el-form-item>
+			<!-- 产线 -->
+			<el-form-item>
+				<el-select v-model="dataForm.productlines" :placeholder="'产线'" multiple clearable>
+					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
+				</el-select>
+			</el-form-item>
+			<!-- 时间类型 -->
+			<!-- 按时间段 -->
+			<el-form-item>
+				<el-select v-model="timeType" :placeholder="'时间类型'" clearable>
+					<el-option value="range" label="按时间段" />
+					<el-option value="date" label="按日期" />
+				</el-select>
+			</el-form-item>
+			<!-- 日期选择 -->
+			<el-form-item v-if="timeType === 'date'">
+				<el-date-picker key="range-picker" v-model="rawTime" type="date" :placeholder="'请选择日期'" format="yyyy-MM-dd" />
+			</el-form-item>
+			<!-- 时间段选择 -->
+			<el-form-item v-else>
+				<el-date-picker key="time-picker" v-model="rawTime" type="daterange" :range-separator="'至'" :start-placeholder="'开始时间'" :end-placeholder="'结束时间'" format="yyyy-MM-dd" />
+			</el-form-item>
+			<!-- 按钮 -->
 			<el-form-item>
 				<el-button @click="getDataList()">{{ $t('search') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipment:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">{{ $t('export') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:equipmentEffiency:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</el-form-item>
 		</el-form>
 
@@ -38,6 +64,7 @@ import CKEditor from 'ckeditor4-vue'
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
 import Cookies from 'js-cookie'
+import moment from 'moment'
 
 const tableConfigs = [
 	{
@@ -241,11 +268,21 @@ const addOrUpdateConfigs = {
 export default {
 	data() {
 		return {
+			/** hfxny part */
+			factoryList: [],
+			productLineList: [],
+			/** */
 			calcMaxHeight,
 			tableConfigs,
 			addOrUpdateConfigs,
+			timeType: 'range',
+			rawTime: null, // [] or datetime
 			dataForm: {
-				key: ''
+				type: 1,
+				ftId: null,
+				productlines: [],
+				startTime: null,
+				entTime: null
 			},
 			dataList: [],
 			pageIndex: 1,
@@ -260,13 +297,80 @@ export default {
 		AddOrUpdate,
 		BaseTable
 	},
-	activated() {
-		console.log('activated')
-		this.getDataList()
-		this.getGroupList()
-		this.getTypeList()
+	// activated() {
+	// 	console.log('activated')
+	// 	this.getDataList()
+	// 	this.getGroupList()
+	// 	this.getTypeList()
+	// },
+	created() {
+		this.getFactoryList()
+		this.getProductLineList()
+	},
+	watch: {
+		timeType() {
+			// 防止切换日期类型时报错
+			this.rawTime = null
+		}
 	},
 	methods: {
+		// 获取工厂列表
+		getFactoryList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/factory/page'),
+				method: 'get'
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.factoryList = data.data.list
+					/** set default */
+					if (this.factoryList.length) {
+						this.dataForm.ftId = this.factoryList[0].id
+					}
+				} else {
+					this.factoryList = []
+					this.dataForm.ftId = null
+				}
+			})
+		},
+		// 获取产线列表
+		getProductLineList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/productionLine/page'),
+				method: 'get'
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.productLineList = data.data.list
+					/** set default */
+					if (this.productLineList.length) {
+						this.dataForm.productlines = [this.productLineList[0].id]
+					}
+				} else {
+					this.productLineList = []
+				}
+			})
+		},
+		// 时间类型预处理
+		getTimeRange() {
+			let startTime
+			let endTime
+
+			if (this.headFormValue.timeValue instanceof Array) {
+				startTime = this.headFormValue.timeValue[0] ? moment(this.headFormValue.timeValue[0]).format('YYYY-MM-DDTHH:mm:ss') : '' // 强制axios使用北京时间
+				endTime = this.headFormValue.timeValue[1] ? moment(this.headFormValue.timeValue[1]).format('YYYY-MM-DDTHH:mm:ss') : ''
+			} else {
+				if (this.headFormValue.timeValue) {
+					startTime = moment(this.headFormValue.timeValue).format('YYYY-MM-DDTHH:mm:ss')
+					endTime = moment(startTime)
+						.add(1, 'd')
+						.format('YYYY-MM-DDTHH:mm:ss')
+				} else {
+					startTime = ''
+					endTime = ''
+				}
+			}
+
+			return { startTime, endTime }
+		},
 		// 获取设备类型列表
 		getTypeList() {
 			this.$http({
-- 
2.45.2


From cc5aa4d72f177ef00cf5bc7d921fad8890638643 Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Wed, 21 Sep 2022 10:34:40 +0800
Subject: [PATCH 03/14] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E8=A1=A8=E6=A0=BC=E5=A4=B4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentEfficiency.vue        | 387 +++---------------
 1 file changed, 60 insertions(+), 327 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue
index 956cda2..6559606 100644
--- a/src/views/modules/monitoring/equipmentEfficiency.vue
+++ b/src/views/modules/monitoring/equipmentEfficiency.vue
@@ -29,7 +29,15 @@
 			</el-form-item>
 			<!-- 时间段选择 -->
 			<el-form-item v-else>
-				<el-date-picker key="time-picker" v-model="rawTime" type="daterange" :range-separator="'至'" :start-placeholder="'开始时间'" :end-placeholder="'结束时间'" format="yyyy-MM-dd" />
+				<el-date-picker
+					key="time-picker"
+					v-model="rawTime"
+					type="daterange"
+					:range-separator="'至'"
+					:start-placeholder="'开始时间'"
+					:end-placeholder="'结束时间'"
+					format="yyyy-MM-dd"
+				/>
 			</el-form-item>
 			<!-- 按钮 -->
 			<el-form-item>
@@ -48,22 +56,17 @@
 			:total="totalPage"
 			layout="total, sizes, prev, pager, next, jumper"
 		></el-pagination>
-		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
 <script>
 import i18n from '@/i18n'
-import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
-// import AddOrUpdate from './equipment-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 CKEditor from 'ckeditor4-vue'
+
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
-import Cookies from 'js-cookie'
 import moment from 'moment'
 
 const tableConfigs = [
@@ -72,21 +75,52 @@ const tableConfigs = [
 		name: i18n.t('index')
 	},
 	{
-		prop: 'createTime',
-		name: i18n.t('createTime'),
-		filter: timeFilter
+		// name: i18n.t('createTime'),
+		prop: 'factoryName',
+		name: '工厂'
 	},
-	{ prop: 'name', name: i18n.t('eq.name') },
-	{ prop: 'code', name: i18n.t('eq.code') },
-	{ prop: 'equipmentTypeName', name: i18n.t('eq.type') },
-	{ prop: 'groupName', name: i18n.t('eq.group') },
-	{ prop: 'enName', name: i18n.t('enname') },
-	{ prop: 'abbr', name: i18n.t('abbr') },
+	{ prop: 'pdName', name: '产线' },
+	{ prop: 'wsName', name: '工段' },
+	{ prop: 'eqName', name: '设备' },
 	{
-		prop: 'details',
-		name: i18n.t('detail'),
-		subcomponent: TableTextComponent,
-		actionName: 'view-detail'
+		name: '有效时间(h)',
+		children: [
+			{ prop: 'workTime', name: '工作时长(h)', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'workRate', name: '工作时长比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+		]
+	},
+	{
+		name: '关机时间(h)',
+		children: [
+			{ prop: 'stopTime', name: '停机时长(h)', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'stopRate', name: '停机比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+		]
+	},
+	{
+		name: '中断损失',
+		children: [
+			{ prop: 'downTime', name: '故障时长(h)', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'downRate', name: '故障比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' },
+			{ prop: 'timeEfficiency', name: '时间开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+		]
+	},
+	{
+		name: '速度损失',
+		children: [
+			{ prop: 'realYield', name: '实际加工速度', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'designYield', name: '理论加工速度', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'peEfficiency', name: '速度开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+		]
+	},
+	{
+		name: 'OEE',
+		prop: 'oee',
+		filter: val => (val * 100).toFixed(2) + '%'
+	},
+	{
+		name: 'TEEP',
+		prop: 'teep',
+		filter: val => (val * 100).toFixed(2) + '%'
 	},
 	{
 		prop: 'operations',
@@ -94,177 +128,11 @@ const tableConfigs = [
 		fixed: 'right',
 		width: 180,
 		subcomponent: TableOperateComponent,
-		options: ['edit', 'delete']
+		// options: ['edit', 'delete']
+		options: ['view-trend'] // 查看趋势
 	}
 ]
 
-const addOrUpdateConfigs = {
-	type: 'dialog',
-	infoUrl: '/monitoring/equipment',
-	fields: [
-		{ name: 'name', label: i18n.t('eq.name'), required: true },
-		{ name: 'code', label: i18n.t('eq.code') },
-		{ name: 'enName', label: i18n.t('enname') },
-		{ name: 'abbr', label: i18n.t('abbr') },
-		{
-			name: 'equipmentTypeId',
-			label: i18n.t('eq.type'),
-			required: true,
-			type: 'select',
-			options: []
-		},
-		{
-			name: 'groupId',
-			label: i18n.t('eq.group'),
-			required: true,
-			type: 'select',
-			options: []
-		},
-		{
-			name: 'productionTime',
-			label: i18n.t('produceTime'),
-			type: 'date',
-			props: {
-				'type': 'date', // element-ui 的配置
-				'placeholder': i18n.t('hints.date'),
-				'value-format': 'yyyy-MM-ddTHH:mm:ss',
-				'style': {
-					width: '100%'
-				}
-			}
-		},
-		{
-			name: 'enterTime',
-			label: i18n.t('enterTime'),
-			type: 'date',
-			props: {
-				'type': 'date', // element-ui 的配置
-				'placeholder': i18n.t('hints.date'),
-				'value-format': 'yyyy-MM-ddTHH:mm:ss',
-				'style': {
-					width: '100%'
-				}
-			}
-		},
-		{
-			name: 'tvalue',
-			label: i18n.t('eq.tvalue'),
-			required: true,
-			rules: [
-				{
-					type: 'number',
-					message: i18n.t('hints.number'),
-					trigger: 'blur',
-					transform: val => Number(val)
-				}
-			]
-		},
-		{
-			name: 'processingTime',
-			label: i18n.t('eq.processingTime'),
-			rules: [
-				{
-					type: 'number',
-					message: i18n.t('hints.number'),
-					trigger: 'blur',
-					transform: val => Number(val)
-				}
-			]
-		},
-		{ name: 'manufacturer', label: i18n.t('manufacturer') },
-		{ name: 'spec', label: i18n.t('eq.grade') },
-		{
-			name: 'dataType',
-			label: i18n.t('eq.dtype'),
-			required: true,
-			type: 'select',
-			options: [
-				{ value: 0, label: i18n.t('eq.dtypenone') },
-				{ value: 1, label: i18n.t('eq.dtypeinput') },
-				{ value: 2, label: i18n.t('eq.dtypeoutput') }
-			]
-		},
-		{ name: 'remark', label: i18n.t('remark') }
-	],
-	extraComponents: [
-		{
-			name: 'description',
-			hasModel: true,
-			label: i18n.t('desc'),
-			fieldType: 'string',
-			component: CKEditor.component,
-			props: {
-				// value: 'tests',
-				config: {
-					// ckeditor 的配置: https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
-					// toolbar: [['Bold']]
-					language: Cookies.get('language') || 'en'
-				}
-			}
-		},
-		{
-			name: 'files',
-			label: i18n.t('upload.title'),
-			fieldType: 'array',
-			component: () => import('@/components/base-upload'),
-			props: {
-				// 上传组件需要的 props
-				url: '/monitoring/attachment/uploadFileFormData',
-				extraParams: { typeCode: 'EquipmentInfoFile' },
-				buttonContent: i18n.t('upload.button'),
-				tip: i18n.t('hints.upload2m')
-			}
-		},
-		{
-			name: 'files',
-			label: i18n.t('eq.image'),
-			fieldType: 'array',
-			component: () => import('@/components/base-upload'),
-			props: {
-				// 上传组件需要的 props
-				url: '/monitoring/attachment/uploadFileFormData',
-				extraParams: { typeCode: 'EquipmentInfoImage' },
-				buttonContent: i18n.t('upload.button'),
-				tip: i18n.t('hints.upload2mPic')
-			}
-		}
-	],
-	subtable: {
-		title: i18n.t('eq.viewattr'),
-		url: '/monitoring/equipmentAttr',
-		relatedField: 'equipmentId',
-		tableConfigs: [
-			{ type: 'index', width: 100, name: i18n.t('index') },
-			{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
-			{ prop: 'attrName', name: i18n.t('attrName'), formField: true },
-			{ prop: 'attrValue', name: i18n.t('attrValue'), formField: true },
-			{
-				prop: 'operations',
-				name: i18n.t('handle'),
-				fixed: 'right',
-				width: 180,
-				subcomponent: TableOperateComponent,
-				options: ['edit', 'delete']
-			}
-		]
-	},
-	operations: [
-		{ name: 'cancel', showAlways: true },
-		{
-			name: 'save',
-			url: '/monitoring/equipment',
-			permission: 'monitoring:equipment:save',
-			showOnEdit: false
-		},
-		{
-			name: 'update',
-			url: '/monitoring/equipment',
-			permission: 'monitoring:equipment:update',
-			showOnEdit: true
-		}
-	]
-}
-
 export default {
 	data() {
 		return {
@@ -274,7 +142,6 @@ export default {
 			/** */
 			calcMaxHeight,
 			tableConfigs,
-			addOrUpdateConfigs,
 			timeType: 'range',
 			rawTime: null, // [] or datetime
 			dataForm: {
@@ -288,21 +155,13 @@ export default {
 			pageIndex: 1,
 			pageSize: 10,
 			totalPage: 0,
-			dataListLoading: false,
-			dataListSelections: [],
-			addOrUpdateVisible: false
+			dataListLoading: false
 		}
 	},
 	components: {
-		AddOrUpdate,
 		BaseTable
 	},
-	// activated() {
-	// 	console.log('activated')
-	// 	this.getDataList()
-	// 	this.getGroupList()
-	// 	this.getTypeList()
-	// },
+
 	created() {
 		this.getFactoryList()
 		this.getProductLineList()
@@ -349,11 +208,11 @@ export default {
 				}
 			})
 		},
+
 		// 时间类型预处理
 		getTimeRange() {
 			let startTime
 			let endTime
-
 			if (this.headFormValue.timeValue instanceof Array) {
 				startTime = this.headFormValue.timeValue[0] ? moment(this.headFormValue.timeValue[0]).format('YYYY-MM-DDTHH:mm:ss') : '' // 强制axios使用北京时间
 				endTime = this.headFormValue.timeValue[1] ? moment(this.headFormValue.timeValue[1]).format('YYYY-MM-DDTHH:mm:ss') : ''
@@ -368,47 +227,9 @@ export default {
 					endTime = ''
 				}
 			}
-
 			return { startTime, endTime }
 		},
-		// 获取设备类型列表
-		getTypeList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipmentType/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					// page: this.pageIndex,
-					// limit: this.pageSize,
-					// key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				const eqTypeConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentTypeId')
-				eqTypeConfig.options =
-					data.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取设备分组列表
-		getGroupList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipmentGroup/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					// page: this.pageIndex,
-					// limit: this.pageSize,
-					// key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				const groupConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'groupId')
-				groupConfig.options =
-					data.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
+
 		// 获取数据列表
 		getDataList() {
 			this.dataListLoading = true
@@ -423,8 +244,6 @@ export default {
 			}).then(({ data }) => {
 				if (data && data.code === 0) {
 					this.dataList = data.data.list
-					// this.dataList = new Array(20).fill('1')
-					// console.log('data list', this.dataList)
 					this.totalPage = data.data.total
 				} else {
 					this.dataList = []
@@ -451,98 +270,12 @@ export default {
 		handleOperations({ type, data: id }) {
 			switch (type) {
 				case 'view-detail':
-					// const { name, code } = this.dataList.find(item => item.id === id)
-					// this.$router.push({
-					// 	name: 'monitoring-equipmentAdd',
-					// 	params: {
-					// 		isdetail: true,
-					// 		equipmentId: id
-					// 	}
-					// })
-					// break
 					return this.addOrUpdateHandle(id, true)
 				case 'edit':
 					return this.addOrUpdateHandle(id)
 				case 'delete':
 					return this.deleteHandle(id)
 			}
-		},
-		exportHandle() {
-			// this.$http.get(this.$http.adornUrl('/monitoring/equipment/export')).then(({ data: res }) => {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipment/export'),
-				method: 'get',
-				responseType: 'blob'
-			}).then(res => {
-				let fileName = 'equipment-list.xls'
-				if (res.headers['content-disposition']) {
-					const contentDisposition = res.headers['content-disposition']
-					fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
-				}
-
-				fileName = decodeURIComponent(fileName)
-
-				const blob = new Blob([res.data])
-
-				if ('download' in document.createElement('a')) {
-					const alink = document.createElement('a')
-					alink.download = fileName
-					alink.style.display = 'none'
-					alink.target = '_blank'
-					alink.href = URL.createObjectURL(blob)
-					document.body.appendChild(alink)
-					alink.click()
-					URL.revokeObjectURL(alink.href)
-					document.body.removeChild(alink)
-				} else {
-					navigator.msSaveBlob(blob, fileName)
-				}
-			})
-		},
-		// 新增 / 修改
-		addOrUpdateHandle(id, isdetail = false) {
-			this.addOrUpdateVisible = true
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, isdetail)
-			})
-			// this.$router.push({
-			// 	name: 'monitoring-equipmentAdd',
-			// 	params: {
-			// 		equipmentId: id
-			// 	}
-			// })
-		},
-		// 删除
-		deleteHandle(id) {
-			var ids = id
-				? [id]
-				: this.dataListSelections.map(item => {
-						return item.id
-				  })
-			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
-				confirmButtonText: i18n.t('confirm'),
-				cancelButtonText: i18n.t('cancel'),
-				type: 'warning'
-			}).then(() => {
-				this.$http({
-					url: this.$http.adornUrl('/monitoring/equipment'),
-					method: 'delete',
-					data: this.$http.adornData(ids, false, 'raw')
-				}).then(({ data }) => {
-					if (data && data.code === 0) {
-						this.$message({
-							message: i18n.t('prompt.success'),
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getDataList()
-							}
-						})
-					} else {
-						this.$message.error(data.msg)
-					}
-				})
-			})
 		}
 	}
 }
-- 
2.45.2


From 5158d9a315339f99daaad06c5029ef1974f4b4ff Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Wed, 21 Sep 2022 10:59:35 +0800
Subject: [PATCH 04/14] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E5=88=86=E6=9E=90=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentEfficiency.vue        | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue
index 6559606..e7a190b 100644
--- a/src/views/modules/monitoring/equipmentEfficiency.vue
+++ b/src/views/modules/monitoring/equipmentEfficiency.vue
@@ -213,12 +213,12 @@ export default {
 		getTimeRange() {
 			let startTime
 			let endTime
-			if (this.headFormValue.timeValue instanceof Array) {
-				startTime = this.headFormValue.timeValue[0] ? moment(this.headFormValue.timeValue[0]).format('YYYY-MM-DDTHH:mm:ss') : '' // 强制axios使用北京时间
-				endTime = this.headFormValue.timeValue[1] ? moment(this.headFormValue.timeValue[1]).format('YYYY-MM-DDTHH:mm:ss') : ''
+			if (this.rawTime instanceof Array) {
+				startTime = this.rawTime[0] ? moment(this.rawTime[0]).format('YYYY-MM-DDTHH:mm:ss') : '' // 强制axios使用北京时间
+				endTime = this.rawTime[1] ? moment(this.rawTime[1]).format('YYYY-MM-DDTHH:mm:ss') : ''
 			} else {
-				if (this.headFormValue.timeValue) {
-					startTime = moment(this.headFormValue.timeValue).format('YYYY-MM-DDTHH:mm:ss')
+				if (this.rawTime) {
+					startTime = moment(this.rawTime).format('YYYY-MM-DDTHH:mm:ss')
 					endTime = moment(startTime)
 						.add(1, 'd')
 						.format('YYYY-MM-DDTHH:mm:ss')
@@ -232,24 +232,23 @@ export default {
 
 		// 获取数据列表
 		getDataList() {
+			const { startTime, endTime } = this.getTimeRange()
+
 			this.dataListLoading = true
 			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipment/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					page: this.pageIndex,
-					limit: this.pageSize,
-					key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				if (data && data.code === 0) {
-					this.dataList = data.data.list
-					this.totalPage = data.data.total
-				} else {
-					this.dataList = []
-					this.totalPage = 0
+				url: this.$http.adornUrl('/monitoring/eqAnalysis/oee'),
+				method: 'post',
+				data: {
+					startTime,
+					endTime,
+					ftId: this.dataForm.ftId,
+					productlines: this.dataForm.productlines,
+					limit: this.pageIndex,
+					page: this.pageSize,
+					type: 1
 				}
-				this.dataListLoading = false
+			}).then(({ data: res }) => {
+				console.log('oee data:', res)
 			})
 		},
 		// 每页数
-- 
2.45.2


From f590d096715b8f2c9a63cf18230884a119866944 Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Wed, 21 Sep 2022 11:08:44 +0800
Subject: [PATCH 05/14] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=88=86=E6=9E=90=E7=9A=84=E9=A1=B6=E9=83=A8=E5=A4=B4?=
 =?UTF-8?q?=E5=92=8C=E8=A1=A8=E6=A0=BC=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/monitoring/equipmentException.vue | 459 +++++-------------
 1 file changed, 112 insertions(+), 347 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentException.vue b/src/views/modules/monitoring/equipmentException.vue
index f581385..03b3425 100644
--- a/src/views/modules/monitoring/equipmentException.vue
+++ b/src/views/modules/monitoring/equipmentException.vue
@@ -1,14 +1,22 @@
 <template>
-	<!-- 设备异常分析 -->
+	<!-- 设备效率分析 -->
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<!-- 月份 -->
 			<el-form-item>
-				<el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
+				<el-date-picker key="month-picker" v-model="rawTime" type="month" :placeholder="'请选择月份'" format="yyyy-MM" />
 			</el-form-item>
+			<!-- 产线 -->
+			<el-form-item>
+				<el-select v-model="dataForm.productlines" :placeholder="'产线'" multiple clearable>
+					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
+				</el-select>
+			</el-form-item>
+
+			<!-- 按钮 -->
 			<el-form-item>
 				<el-button @click="getDataList()">{{ $t('search') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipment:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">{{ $t('export') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:equipmentEffiency:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</el-form-item>
 		</el-form>
 
@@ -22,311 +30,154 @@
 			:total="totalPage"
 			layout="total, sizes, prev, pager, next, jumper"
 		></el-pagination>
-		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
 <script>
 import i18n from '@/i18n'
-import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
-// import AddOrUpdate from './equipment-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 CKEditor from 'ckeditor4-vue'
+
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
-import Cookies from 'js-cookie'
+import moment from 'moment'
 
 const tableConfigs = [
 	{
 		type: 'index',
 		name: i18n.t('index')
 	},
-	{
-		prop: 'createTime',
-		name: i18n.t('createTime'),
-		filter: timeFilter
-	},
-	{ prop: 'name', name: i18n.t('eq.name') },
-	{ prop: 'code', name: i18n.t('eq.code') },
-	{ prop: 'equipmentTypeName', name: i18n.t('eq.type') },
-	{ prop: 'groupName', name: i18n.t('eq.group') },
-	{ prop: 'enName', name: i18n.t('enname') },
-	{ prop: 'abbr', name: i18n.t('abbr') },
-	{
-		prop: 'details',
-		name: i18n.t('detail'),
-		subcomponent: TableTextComponent,
-		actionName: 'view-detail'
-	},
+	{ prop: 'pdlName', name: '产线名称' },
+	{ prop: 'wsName', name: '工序' },
+	{ prop: 'eqName', name: '设备' },
+	{ prop: 'mtbf', name: '平均故障间隔时间[MTBF] (h)', width: 220 },
+	{ prop: 'mttr', name: '平均维修时间[MTTR] (h)', width: 190 },
+	{ prop: 'workTime', name: '工作时长 (h)' },
+	{ prop: 'downTime', name: '故障时长 (h)' },
+	{ prop: 'downCount', name: '故障次数' },
 	{
 		prop: 'operations',
 		name: i18n.t('handle'),
 		fixed: 'right',
 		width: 180,
 		subcomponent: TableOperateComponent,
-		options: ['edit', 'delete']
+		// options: ['edit', 'delete']
+		options: ['view-trend'] // 查看趋势
 	}
 ]
 
-const addOrUpdateConfigs = {
-	type: 'dialog',
-	infoUrl: '/monitoring/equipment',
-	fields: [
-		{ name: 'name', label: i18n.t('eq.name'), required: true },
-		{ name: 'code', label: i18n.t('eq.code') },
-		{ name: 'enName', label: i18n.t('enname') },
-		{ name: 'abbr', label: i18n.t('abbr') },
-		{
-			name: 'equipmentTypeId',
-			label: i18n.t('eq.type'),
-			required: true,
-			type: 'select',
-			options: []
-		},
-		{
-			name: 'groupId',
-			label: i18n.t('eq.group'),
-			required: true,
-			type: 'select',
-			options: []
-		},
-		{
-			name: 'productionTime',
-			label: i18n.t('produceTime'),
-			type: 'date',
-			props: {
-				'type': 'date', // element-ui 的配置
-				'placeholder': i18n.t('hints.date'),
-				'value-format': 'yyyy-MM-ddTHH:mm:ss',
-				'style': {
-					width: '100%'
-				}
-			}
-		},
-		{
-			name: 'enterTime',
-			label: i18n.t('enterTime'),
-			type: 'date',
-			props: {
-				'type': 'date', // element-ui 的配置
-				'placeholder': i18n.t('hints.date'),
-				'value-format': 'yyyy-MM-ddTHH:mm:ss',
-				'style': {
-					width: '100%'
-				}
-			}
-		},
-		{
-			name: 'tvalue',
-			label: i18n.t('eq.tvalue'),
-			required: true,
-			rules: [
-				{
-					type: 'number',
-					message: i18n.t('hints.number'),
-					trigger: 'blur',
-					transform: val => Number(val)
-				}
-			]
-		},
-		{
-			name: 'processingTime',
-			label: i18n.t('eq.processingTime'),
-			rules: [
-				{
-					type: 'number',
-					message: i18n.t('hints.number'),
-					trigger: 'blur',
-					transform: val => Number(val)
-				}
-			]
-		},
-		{ name: 'manufacturer', label: i18n.t('manufacturer') },
-		{ name: 'spec', label: i18n.t('eq.grade') },
-		{
-			name: 'dataType',
-			label: i18n.t('eq.dtype'),
-			required: true,
-			type: 'select',
-			options: [
-				{ value: 0, label: i18n.t('eq.dtypenone') },
-				{ value: 1, label: i18n.t('eq.dtypeinput') },
-				{ value: 2, label: i18n.t('eq.dtypeoutput') }
-			]
-		},
-		{ name: 'remark', label: i18n.t('remark') }
-	],
-	extraComponents: [
-		{
-			name: 'description',
-			hasModel: true,
-			label: i18n.t('desc'),
-			fieldType: 'string',
-			component: CKEditor.component,
-			props: {
-				// value: 'tests',
-				config: {
-					// ckeditor 的配置: https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
-					// toolbar: [['Bold']]
-					language: Cookies.get('language') || 'en'
-				}
-			}
-		},
-		{
-			name: 'files',
-			label: i18n.t('upload.title'),
-			fieldType: 'array',
-			component: () => import('@/components/base-upload'),
-			props: {
-				// 上传组件需要的 props
-				url: '/monitoring/attachment/uploadFileFormData',
-				extraParams: { typeCode: 'EquipmentInfoFile' },
-				buttonContent: i18n.t('upload.button'),
-				tip: i18n.t('hints.upload2m')
-			}
-		},
-		{
-			name: 'files',
-			label: i18n.t('eq.image'),
-			fieldType: 'array',
-			component: () => import('@/components/base-upload'),
-			props: {
-				// 上传组件需要的 props
-				url: '/monitoring/attachment/uploadFileFormData',
-				extraParams: { typeCode: 'EquipmentInfoImage' },
-				buttonContent: i18n.t('upload.button'),
-				tip: i18n.t('hints.upload2mPic')
-			}
-		}
-	],
-	subtable: {
-		title: i18n.t('eq.viewattr'),
-		url: '/monitoring/equipmentAttr',
-		relatedField: 'equipmentId',
-		tableConfigs: [
-			{ type: 'index', width: 100, name: i18n.t('index') },
-			{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
-			{ prop: 'attrName', name: i18n.t('attrName'), formField: true },
-			{ prop: 'attrValue', name: i18n.t('attrValue'), formField: true },
-			{
-				prop: 'operations',
-				name: i18n.t('handle'),
-				fixed: 'right',
-				width: 180,
-				subcomponent: TableOperateComponent,
-				options: ['edit', 'delete']
-			}
-		]
-	},
-	operations: [
-		{ name: 'cancel', showAlways: true },
-		{
-			name: 'save',
-			url: '/monitoring/equipment',
-			permission: 'monitoring:equipment:save',
-			showOnEdit: false
-		},
-		{
-			name: 'update',
-			url: '/monitoring/equipment',
-			permission: 'monitoring:equipment:update',
-			showOnEdit: true
-		}
-	]
-}
-
 export default {
 	data() {
 		return {
+			/** hfxny part */
+			factoryList: [],
+			productLineList: [],
+			/** */
 			calcMaxHeight,
 			tableConfigs,
-			addOrUpdateConfigs,
+			timeType: 'range',
+			rawTime: null, // [] or datetime
 			dataForm: {
-				key: ''
+				type: 1,
+				ftId: null,
+				productlines: [],
+				startTime: null,
+				entTime: null
 			},
 			dataList: [],
 			pageIndex: 1,
 			pageSize: 10,
 			totalPage: 0,
-			dataListLoading: false,
-			dataListSelections: [],
-			addOrUpdateVisible: false
+			dataListLoading: false
 		}
 	},
 	components: {
-		AddOrUpdate,
 		BaseTable
 	},
-	activated() {
-		console.log('activated')
-		this.getDataList()
-		this.getGroupList()
-		this.getTypeList()
+
+	created() {
+		this.getFactoryList()
+		// this.getProductLineList()
 	},
+	watch: {},
 	methods: {
-		// 获取设备类型列表
-		getTypeList() {
+		// 获取工厂列表
+		getFactoryList() {
 			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipmentType/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					// page: this.pageIndex,
-					// limit: this.pageSize,
-					// key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				const eqTypeConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentTypeId')
-				eqTypeConfig.options =
-					data.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取设备分组列表
-		getGroupList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipmentGroup/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					// page: this.pageIndex,
-					// limit: this.pageSize,
-					// key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				const groupConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'groupId')
-				groupConfig.options =
-					data.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取数据列表
-		getDataList() {
-			this.dataListLoading = true
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipment/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					page: this.pageIndex,
-					limit: this.pageSize,
-					key: this.dataForm.key
-				})
+				url: this.$http.adornUrl('/monitoring/factory/page'),
+				method: 'get'
 			}).then(({ data }) => {
 				if (data && data.code === 0) {
-					this.dataList = data.data.list
-					// this.dataList = new Array(20).fill('1')
-					// console.log('data list', this.dataList)
-					this.totalPage = data.data.total
+					this.factoryList = data.data.list
+					/** set default */
+					if (this.factoryList.length) {
+						this.dataForm.ftId = this.factoryList[0].id
+					}
 				} else {
-					this.dataList = []
-					this.totalPage = 0
+					this.factoryList = []
+					this.dataForm.ftId = null
 				}
-				this.dataListLoading = false
+			})
+		},
+		// 获取产线列表
+		getProductLineList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/productionLine/page'),
+				method: 'get'
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.productLineList = data.data.list
+					/** set default */
+					if (this.productLineList.length) {
+						this.dataForm.productlines = [this.productLineList[0].id]
+					}
+				} else {
+					this.productLineList = []
+				}
+			})
+		},
+
+		// 时间类型预处理
+		getTimeRange() {
+			let startTime
+			let endTime
+			if (this.rawTime instanceof Array) {
+				startTime = this.rawTime[0] ? moment(this.rawTime[0]).format('YYYY-MM-DDTHH:mm:ss') : '' // 强制axios使用北京时间
+				endTime = this.rawTime[1] ? moment(this.rawTime[1]).format('YYYY-MM-DDTHH:mm:ss') : ''
+			} else {
+				if (this.rawTime) {
+					startTime = moment(this.rawTime).format('YYYY-MM-DDTHH:mm:ss')
+					endTime = moment(startTime)
+						.add(1, 'd')
+						.format('YYYY-MM-DDTHH:mm:ss')
+				} else {
+					startTime = ''
+					endTime = ''
+				}
+			}
+			return { startTime, endTime }
+		},
+
+		// 获取数据列表
+		getDataList() {
+			const { startTime, endTime } = this.getTimeRange()
+
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/eqAnalysis/oee'),
+				method: 'post',
+				data: {
+					startTime,
+					endTime,
+					ftId: this.dataForm.ftId,
+					productlines: this.dataForm.productlines,
+					limit: this.pageIndex,
+					page: this.pageSize,
+					type: 1
+				}
+			}).then(({ data: res }) => {
+				console.log('oee data:', res)
 			})
 		},
 		// 每页数
@@ -347,98 +198,12 @@ export default {
 		handleOperations({ type, data: id }) {
 			switch (type) {
 				case 'view-detail':
-					// const { name, code } = this.dataList.find(item => item.id === id)
-					// this.$router.push({
-					// 	name: 'monitoring-equipmentAdd',
-					// 	params: {
-					// 		isdetail: true,
-					// 		equipmentId: id
-					// 	}
-					// })
-					// break
 					return this.addOrUpdateHandle(id, true)
 				case 'edit':
 					return this.addOrUpdateHandle(id)
 				case 'delete':
 					return this.deleteHandle(id)
 			}
-		},
-		exportHandle() {
-			// this.$http.get(this.$http.adornUrl('/monitoring/equipment/export')).then(({ data: res }) => {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipment/export'),
-				method: 'get',
-				responseType: 'blob'
-			}).then(res => {
-				let fileName = 'equipment-list.xls'
-				if (res.headers['content-disposition']) {
-					const contentDisposition = res.headers['content-disposition']
-					fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
-				}
-
-				fileName = decodeURIComponent(fileName)
-
-				const blob = new Blob([res.data])
-
-				if ('download' in document.createElement('a')) {
-					const alink = document.createElement('a')
-					alink.download = fileName
-					alink.style.display = 'none'
-					alink.target = '_blank'
-					alink.href = URL.createObjectURL(blob)
-					document.body.appendChild(alink)
-					alink.click()
-					URL.revokeObjectURL(alink.href)
-					document.body.removeChild(alink)
-				} else {
-					navigator.msSaveBlob(blob, fileName)
-				}
-			})
-		},
-		// 新增 / 修改
-		addOrUpdateHandle(id, isdetail = false) {
-			this.addOrUpdateVisible = true
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, isdetail)
-			})
-			// this.$router.push({
-			// 	name: 'monitoring-equipmentAdd',
-			// 	params: {
-			// 		equipmentId: id
-			// 	}
-			// })
-		},
-		// 删除
-		deleteHandle(id) {
-			var ids = id
-				? [id]
-				: this.dataListSelections.map(item => {
-						return item.id
-				  })
-			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
-				confirmButtonText: i18n.t('confirm'),
-				cancelButtonText: i18n.t('cancel'),
-				type: 'warning'
-			}).then(() => {
-				this.$http({
-					url: this.$http.adornUrl('/monitoring/equipment'),
-					method: 'delete',
-					data: this.$http.adornData(ids, false, 'raw')
-				}).then(({ data }) => {
-					if (data && data.code === 0) {
-						this.$message({
-							message: i18n.t('prompt.success'),
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getDataList()
-							}
-						})
-					} else {
-						this.$message.error(data.msg)
-					}
-				})
-			})
 		}
 	}
 }
-- 
2.45.2


From 41cd01ecb0aaa399d73901e14cb4ab4b33da6e1c Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Wed, 21 Sep 2022 13:25:36 +0800
Subject: [PATCH 06/14] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E5=BA=8F=E5=9B=BE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentEfficiency.vue        |   7 +
 .../monitoring/equipmentTimesequence.vue      | 505 ++++++------------
 2 files changed, 170 insertions(+), 342 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue
index e7a190b..5dadb23 100644
--- a/src/views/modules/monitoring/equipmentEfficiency.vue
+++ b/src/views/modules/monitoring/equipmentEfficiency.vue
@@ -249,6 +249,13 @@ export default {
 				}
 			}).then(({ data: res }) => {
 				console.log('oee data:', res)
+				if (res.length) {
+					this.dataList = res 
+					this.totalPage = res.length
+				} else {
+					this.dataList.splice(0)
+					this.totalPage = 0
+				}
 			})
 		},
 		// 每页数
diff --git a/src/views/modules/monitoring/equipmentTimesequence.vue b/src/views/modules/monitoring/equipmentTimesequence.vue
index d9ca13b..2cc296e 100644
--- a/src/views/modules/monitoring/equipmentTimesequence.vue
+++ b/src/views/modules/monitoring/equipmentTimesequence.vue
@@ -1,14 +1,26 @@
 <template>
-	<!-- 设备状态时序图 -->
+	<!-- 设备效率分析 -->
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<!-- 产线 -->
 			<el-form-item>
-				<el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
+				<el-select v-model="dataForm.productlines" :placeholder="'产线'" clearable />
 			</el-form-item>
+			<!-- 工序 -->
+			<el-form-item>
+				<!-- <el-select v-model="dataForm.factoryId" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-select> -->
+				<el-select v-model="dataForm.ftId" :placeholder="'工序'" clearable>
+					<el-option v-for="factory in factoryList" :key="factory.id" :value="factory.id" :label="factory.name" />
+				</el-select>
+			</el-form-item>
+			<!-- 日期选择 -->
+			<el-form-item>
+				<el-date-picker key="date-picker" v-model="rawTime" type="date" :placeholder="'请选择日期'" format="yyyy-MM-dd" />
+			</el-form-item>
+			<!-- 按钮 -->
 			<el-form-item>
 				<el-button @click="getDataList()">{{ $t('search') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipment:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">{{ $t('export') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:equipmentEffiency:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</el-form-item>
 		</el-form>
 
@@ -22,22 +34,18 @@
 			:total="totalPage"
 			layout="total, sizes, prev, pager, next, jumper"
 		></el-pagination>
-		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
 <script>
 import i18n from '@/i18n'
-import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
-// import AddOrUpdate from './equipment-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 CKEditor from 'ckeditor4-vue'
+
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
-import Cookies from 'js-cookie'
+import moment from 'moment'
 
 const tableConfigs = [
 	{
@@ -45,21 +53,52 @@ const tableConfigs = [
 		name: i18n.t('index')
 	},
 	{
-		prop: 'createTime',
-		name: i18n.t('createTime'),
-		filter: timeFilter
+		// name: i18n.t('createTime'),
+		prop: 'factoryName',
+		name: '工厂'
 	},
-	{ prop: 'name', name: i18n.t('eq.name') },
-	{ prop: 'code', name: i18n.t('eq.code') },
-	{ prop: 'equipmentTypeName', name: i18n.t('eq.type') },
-	{ prop: 'groupName', name: i18n.t('eq.group') },
-	{ prop: 'enName', name: i18n.t('enname') },
-	{ prop: 'abbr', name: i18n.t('abbr') },
+	{ prop: 'pdName', name: '产线' },
+	{ prop: 'wsName', name: '工段' },
+	{ prop: 'eqName', name: '设备' },
 	{
-		prop: 'details',
-		name: i18n.t('detail'),
-		subcomponent: TableTextComponent,
-		actionName: 'view-detail'
+		name: '有效时间(h)',
+		children: [
+			{ prop: 'workTime', name: '工作时长(h)', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'workRate', name: '工作时长比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+		]
+	},
+	{
+		name: '关机时间(h)',
+		children: [
+			{ prop: 'stopTime', name: '停机时长(h)', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'stopRate', name: '停机比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+		]
+	},
+	{
+		name: '中断损失',
+		children: [
+			{ prop: 'downTime', name: '故障时长(h)', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'downRate', name: '故障比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' },
+			{ prop: 'timeEfficiency', name: '时间开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+		]
+	},
+	{
+		name: '速度损失',
+		children: [
+			{ prop: 'realYield', name: '实际加工速度', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'designYield', name: '理论加工速度', width: 120, filter: val => `${val} 小时` },
+			{ prop: 'peEfficiency', name: '速度开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
+		]
+	},
+	{
+		name: 'OEE',
+		prop: 'oee',
+		filter: val => (val * 100).toFixed(2) + '%'
+	},
+	{
+		name: 'TEEP',
+		prop: 'teep',
+		filter: val => (val * 100).toFixed(2) + '%'
 	},
 	{
 		prop: 'operations',
@@ -67,266 +106,134 @@ const tableConfigs = [
 		fixed: 'right',
 		width: 180,
 		subcomponent: TableOperateComponent,
-		options: ['edit', 'delete']
+		// options: ['edit', 'delete']
+		options: ['view-trend'] // 查看趋势
 	}
 ]
 
-const addOrUpdateConfigs = {
-	type: 'dialog',
-	infoUrl: '/monitoring/equipment',
-	fields: [
-		{ name: 'name', label: i18n.t('eq.name'), required: true },
-		{ name: 'code', label: i18n.t('eq.code') },
-		{ name: 'enName', label: i18n.t('enname') },
-		{ name: 'abbr', label: i18n.t('abbr') },
-		{
-			name: 'equipmentTypeId',
-			label: i18n.t('eq.type'),
-			required: true,
-			type: 'select',
-			options: []
-		},
-		{
-			name: 'groupId',
-			label: i18n.t('eq.group'),
-			required: true,
-			type: 'select',
-			options: []
-		},
-		{
-			name: 'productionTime',
-			label: i18n.t('produceTime'),
-			type: 'date',
-			props: {
-				'type': 'date', // element-ui 的配置
-				'placeholder': i18n.t('hints.date'),
-				'value-format': 'yyyy-MM-ddTHH:mm:ss',
-				'style': {
-					width: '100%'
-				}
-			}
-		},
-		{
-			name: 'enterTime',
-			label: i18n.t('enterTime'),
-			type: 'date',
-			props: {
-				'type': 'date', // element-ui 的配置
-				'placeholder': i18n.t('hints.date'),
-				'value-format': 'yyyy-MM-ddTHH:mm:ss',
-				'style': {
-					width: '100%'
-				}
-			}
-		},
-		{
-			name: 'tvalue',
-			label: i18n.t('eq.tvalue'),
-			required: true,
-			rules: [
-				{
-					type: 'number',
-					message: i18n.t('hints.number'),
-					trigger: 'blur',
-					transform: val => Number(val)
-				}
-			]
-		},
-		{
-			name: 'processingTime',
-			label: i18n.t('eq.processingTime'),
-			rules: [
-				{
-					type: 'number',
-					message: i18n.t('hints.number'),
-					trigger: 'blur',
-					transform: val => Number(val)
-				}
-			]
-		},
-		{ name: 'manufacturer', label: i18n.t('manufacturer') },
-		{ name: 'spec', label: i18n.t('eq.grade') },
-		{
-			name: 'dataType',
-			label: i18n.t('eq.dtype'),
-			required: true,
-			type: 'select',
-			options: [
-				{ value: 0, label: i18n.t('eq.dtypenone') },
-				{ value: 1, label: i18n.t('eq.dtypeinput') },
-				{ value: 2, label: i18n.t('eq.dtypeoutput') }
-			]
-		},
-		{ name: 'remark', label: i18n.t('remark') }
-	],
-	extraComponents: [
-		{
-			name: 'description',
-			hasModel: true,
-			label: i18n.t('desc'),
-			fieldType: 'string',
-			component: CKEditor.component,
-			props: {
-				// value: 'tests',
-				config: {
-					// ckeditor 的配置: https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
-					// toolbar: [['Bold']]
-					language: Cookies.get('language') || 'en'
-				}
-			}
-		},
-		{
-			name: 'files',
-			label: i18n.t('upload.title'),
-			fieldType: 'array',
-			component: () => import('@/components/base-upload'),
-			props: {
-				// 上传组件需要的 props
-				url: '/monitoring/attachment/uploadFileFormData',
-				extraParams: { typeCode: 'EquipmentInfoFile' },
-				buttonContent: i18n.t('upload.button'),
-				tip: i18n.t('hints.upload2m')
-			}
-		},
-		{
-			name: 'files',
-			label: i18n.t('eq.image'),
-			fieldType: 'array',
-			component: () => import('@/components/base-upload'),
-			props: {
-				// 上传组件需要的 props
-				url: '/monitoring/attachment/uploadFileFormData',
-				extraParams: { typeCode: 'EquipmentInfoImage' },
-				buttonContent: i18n.t('upload.button'),
-				tip: i18n.t('hints.upload2mPic')
-			}
-		}
-	],
-	subtable: {
-		title: i18n.t('eq.viewattr'),
-		url: '/monitoring/equipmentAttr',
-		relatedField: 'equipmentId',
-		tableConfigs: [
-			{ type: 'index', width: 100, name: i18n.t('index') },
-			{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
-			{ prop: 'attrName', name: i18n.t('attrName'), formField: true },
-			{ prop: 'attrValue', name: i18n.t('attrValue'), formField: true },
-			{
-				prop: 'operations',
-				name: i18n.t('handle'),
-				fixed: 'right',
-				width: 180,
-				subcomponent: TableOperateComponent,
-				options: ['edit', 'delete']
-			}
-		]
-	},
-	operations: [
-		{ name: 'cancel', showAlways: true },
-		{
-			name: 'save',
-			url: '/monitoring/equipment',
-			permission: 'monitoring:equipment:save',
-			showOnEdit: false
-		},
-		{
-			name: 'update',
-			url: '/monitoring/equipment',
-			permission: 'monitoring:equipment:update',
-			showOnEdit: true
-		}
-	]
-}
-
 export default {
 	data() {
 		return {
+			/** hfxny part */
+			factoryList: [],
+			productLineList: [],
+			/** */
 			calcMaxHeight,
 			tableConfigs,
-			addOrUpdateConfigs,
+			timeType: 'range',
+			rawTime: null, // [] or datetime
 			dataForm: {
-				key: ''
+				type: 1,
+				ftId: null,
+				productlines: [],
+				startTime: null,
+				entTime: null
 			},
 			dataList: [],
 			pageIndex: 1,
 			pageSize: 10,
 			totalPage: 0,
-			dataListLoading: false,
-			dataListSelections: [],
-			addOrUpdateVisible: false
+			dataListLoading: false
 		}
 	},
 	components: {
-		AddOrUpdate,
 		BaseTable
 	},
-	activated() {
-		console.log('activated')
-		this.getDataList()
-		this.getGroupList()
-		this.getTypeList()
+
+	created() {
+		this.getFactoryList()
+		this.getProductLineList()
+	},
+	watch: {
+		timeType() {
+			// 防止切换日期类型时报错
+			this.rawTime = null
+		}
 	},
 	methods: {
-		// 获取设备类型列表
-		getTypeList() {
+		// 获取工厂列表
+		getFactoryList() {
 			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipmentType/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					// page: this.pageIndex,
-					// limit: this.pageSize,
-					// key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				const eqTypeConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentTypeId')
-				eqTypeConfig.options =
-					data.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取设备分组列表
-		getGroupList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipmentGroup/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					// page: this.pageIndex,
-					// limit: this.pageSize,
-					// key: this.dataForm.key
-				})
-			}).then(({ data }) => {
-				const groupConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'groupId')
-				groupConfig.options =
-					data.data?.list?.map(item => ({
-						value: item.id,
-						label: item.name
-					})) || []
-			})
-		},
-		// 获取数据列表
-		getDataList() {
-			this.dataListLoading = true
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipment/page'),
-				method: 'get',
-				params: this.$http.adornParams({
-					page: this.pageIndex,
-					limit: this.pageSize,
-					key: this.dataForm.key
-				})
+				url: this.$http.adornUrl('/monitoring/factory/page'),
+				method: 'get'
 			}).then(({ data }) => {
 				if (data && data.code === 0) {
-					this.dataList = data.data.list
-					// this.dataList = new Array(20).fill('1')
-					// console.log('data list', this.dataList)
-					this.totalPage = data.data.total
+					this.factoryList = data.data.list
+					/** set default */
+					if (this.factoryList.length) {
+						this.dataForm.ftId = this.factoryList[0].id
+					}
 				} else {
-					this.dataList = []
+					this.factoryList = []
+					this.dataForm.ftId = null
+				}
+			})
+		},
+		// 获取产线列表
+		getProductLineList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/productionLine/page'),
+				method: 'get'
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.productLineList = data.data.list
+					/** set default */
+					if (this.productLineList.length) {
+						this.dataForm.productlines = [this.productLineList[0].id]
+					}
+				} else {
+					this.productLineList = []
+				}
+			})
+		},
+
+		// 时间类型预处理
+		getTimeRange() {
+			let startTime
+			let endTime
+			if (this.rawTime instanceof Array) {
+				startTime = this.rawTime[0] ? moment(this.rawTime[0]).format('YYYY-MM-DDTHH:mm:ss') : '' // 强制axios使用北京时间
+				endTime = this.rawTime[1] ? moment(this.rawTime[1]).format('YYYY-MM-DDTHH:mm:ss') : ''
+			} else {
+				if (this.rawTime) {
+					startTime = moment(this.rawTime).format('YYYY-MM-DDTHH:mm:ss')
+					endTime = moment(startTime)
+						.add(1, 'd')
+						.format('YYYY-MM-DDTHH:mm:ss')
+				} else {
+					startTime = ''
+					endTime = ''
+				}
+			}
+			return { startTime, endTime }
+		},
+
+		// 获取数据列表
+		getDataList() {
+			const { startTime, endTime } = this.getTimeRange()
+
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/eqAnalysis/oee'),
+				method: 'post',
+				data: {
+					startTime,
+					endTime,
+					ftId: this.dataForm.ftId,
+					productlines: this.dataForm.productlines,
+					limit: this.pageIndex,
+					page: this.pageSize,
+					type: 1
+				}
+			}).then(({ data: res }) => {
+				console.log('oee data:', res)
+				if (res.length) {
+					this.dataList = res 
+					this.totalPage = res.length
+				} else {
+					this.dataList.splice(0)
 					this.totalPage = 0
 				}
-				this.dataListLoading = false
 			})
 		},
 		// 每页数
@@ -347,98 +254,12 @@ export default {
 		handleOperations({ type, data: id }) {
 			switch (type) {
 				case 'view-detail':
-					// const { name, code } = this.dataList.find(item => item.id === id)
-					// this.$router.push({
-					// 	name: 'monitoring-equipmentAdd',
-					// 	params: {
-					// 		isdetail: true,
-					// 		equipmentId: id
-					// 	}
-					// })
-					// break
 					return this.addOrUpdateHandle(id, true)
 				case 'edit':
 					return this.addOrUpdateHandle(id)
 				case 'delete':
 					return this.deleteHandle(id)
 			}
-		},
-		exportHandle() {
-			// this.$http.get(this.$http.adornUrl('/monitoring/equipment/export')).then(({ data: res }) => {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipment/export'),
-				method: 'get',
-				responseType: 'blob'
-			}).then(res => {
-				let fileName = 'equipment-list.xls'
-				if (res.headers['content-disposition']) {
-					const contentDisposition = res.headers['content-disposition']
-					fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
-				}
-
-				fileName = decodeURIComponent(fileName)
-
-				const blob = new Blob([res.data])
-
-				if ('download' in document.createElement('a')) {
-					const alink = document.createElement('a')
-					alink.download = fileName
-					alink.style.display = 'none'
-					alink.target = '_blank'
-					alink.href = URL.createObjectURL(blob)
-					document.body.appendChild(alink)
-					alink.click()
-					URL.revokeObjectURL(alink.href)
-					document.body.removeChild(alink)
-				} else {
-					navigator.msSaveBlob(blob, fileName)
-				}
-			})
-		},
-		// 新增 / 修改
-		addOrUpdateHandle(id, isdetail = false) {
-			this.addOrUpdateVisible = true
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, isdetail)
-			})
-			// this.$router.push({
-			// 	name: 'monitoring-equipmentAdd',
-			// 	params: {
-			// 		equipmentId: id
-			// 	}
-			// })
-		},
-		// 删除
-		deleteHandle(id) {
-			var ids = id
-				? [id]
-				: this.dataListSelections.map(item => {
-						return item.id
-				  })
-			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
-				confirmButtonText: i18n.t('confirm'),
-				cancelButtonText: i18n.t('cancel'),
-				type: 'warning'
-			}).then(() => {
-				this.$http({
-					url: this.$http.adornUrl('/monitoring/equipment'),
-					method: 'delete',
-					data: this.$http.adornData(ids, false, 'raw')
-				}).then(({ data }) => {
-					if (data && data.code === 0) {
-						this.$message({
-							message: i18n.t('prompt.success'),
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getDataList()
-							}
-						})
-					} else {
-						this.$message.error(data.msg)
-					}
-				})
-			})
 		}
 	}
 }
-- 
2.45.2


From 9187d56f6c52bd832db450cb94128aa3ffdcf19d Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Wed, 21 Sep 2022 15:30:51 +0800
Subject: [PATCH 07/14] =?UTF-8?q?add=20=E8=AE=BE=E5=A4=87=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E5=88=86=E6=9E=90=E7=9A=84=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/operationComponent.js          |   4 +-
 .../monitoring/equipmentEfficiency.vue        | 121 +++++--
 .../monitoring/equipmentEfficiencyGraph.vue   | 308 ++++++++++++++++++
 3 files changed, 407 insertions(+), 26 deletions(-)
 create mode 100644 src/views/modules/monitoring/equipmentEfficiencyGraph.vue

diff --git a/src/components/base-table/components/operationComponent.js b/src/components/base-table/components/operationComponent.js
index bad72e8..a0b5427 100644
--- a/src/components/base-table/components/operationComponent.js
+++ b/src/components/base-table/components/operationComponent.js
@@ -19,7 +19,8 @@ export default {
       colors: {
         delete: '#FF5454',
         preview: '#f09843',
-        design: '#99089f'
+        design: '#99089f',
+        // 'view-trend': 'red'
         // add more...
       },
       text: {
@@ -30,6 +31,7 @@ export default {
         viewAttr: i18n.t('viewattr'),
         preview: i18n.t('preview'),
         design: i18n.t('design'),
+        'view-trend': '查看趋势'
         // add more...
       }
     }
diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue
index 5dadb23..d022236 100644
--- a/src/views/modules/monitoring/equipmentEfficiency.vue
+++ b/src/views/modules/monitoring/equipmentEfficiency.vue
@@ -46,8 +46,12 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-		<el-pagination
+		<transition mode="out-in" name="slide-to-left">
+			<equipment-efficiency-graph v-if="showGraph" key="graph" ref="eegraph" @close-graph="showGraph = false" />
+			<base-table v-else :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
+			<!-- v-loading="dataIsLoading " -->
+		</transition>
+		<!-- <el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
 			:current-page="pageIndex"
@@ -55,7 +59,7 @@
 			:page-size="pageSize"
 			:total="totalPage"
 			layout="total, sizes, prev, pager, next, jumper"
-		></el-pagination>
+		></el-pagination> -->
 	</div>
 </template>
 
@@ -64,7 +68,7 @@ import i18n from '@/i18n'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
-
+import EquipmentEfficiencyGraph from './equipmentEfficiencyGraph.vue'
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
 import moment from 'moment'
@@ -126,10 +130,13 @@ const tableConfigs = [
 		prop: 'operations',
 		name: i18n.t('handle'),
 		fixed: 'right',
-		width: 180,
-		subcomponent: TableOperateComponent,
+		width: 120,
+		subcomponent: TableTextComponent,
 		// options: ['edit', 'delete']
-		options: ['view-trend'] // 查看趋势
+		// options: ['view-trend'] // 查看趋势
+		buttonContent: '查看趋势',
+		actionName: 'view-trend',
+		emitFullData: true
 	}
 ]
 
@@ -139,10 +146,11 @@ export default {
 			/** hfxny part */
 			factoryList: [],
 			productLineList: [],
+			showGraph: false,
 			/** */
 			calcMaxHeight,
 			tableConfigs,
-			timeType: 'range',
+			timeType: 'date',
 			rawTime: null, // [] or datetime
 			dataForm: {
 				type: 1,
@@ -159,7 +167,7 @@ export default {
 		}
 	},
 	components: {
-		BaseTable
+		BaseTable, EquipmentEfficiencyGraph
 	},
 
 	created() {
@@ -233,8 +241,8 @@ export default {
 		// 获取数据列表
 		getDataList() {
 			const { startTime, endTime } = this.getTimeRange()
-
-			this.dataListLoading = true
+			this.showGraph = false
+			// this.dataListLoading = true
 			this.$http({
 				url: this.$http.adornUrl('/monitoring/eqAnalysis/oee'),
 				method: 'post',
@@ -243,21 +251,59 @@ export default {
 					endTime,
 					ftId: this.dataForm.ftId,
 					productlines: this.dataForm.productlines,
-					limit: this.pageIndex,
-					page: this.pageSize,
+					// limit: this.pageIndex,
+					// page: this.pageSize,
 					type: 1
 				}
 			}).then(({ data: res }) => {
-				console.log('oee data:', res)
-				if (res.length) {
-					this.dataList = res 
-					this.totalPage = res.length
+				if (res.data && res.code !== 500) {
+					console.log('oee data:', res)
+					if (res.data.length) {
+						this.dataList = res.data
+						// this.dataList = Array(20).fill(1)
+					} else {
+						this.dataList.splice(0)
+					}
 				} else {
 					this.dataList.splice(0)
-					this.totalPage = 0
+					this.$message.error(res.msg)
 				}
 			})
 		},
+
+		// 查看趋势
+		viewTrend(data) {
+			const { startTime, endTime } = this.getTimeRange()
+			const injectData = {
+				// 时间段
+				startTime,
+				endTime,
+				// 设备id
+				equipmentId: data.eqId,
+				equipmentName: data.eqName,
+				// 时间类型, type 按年，按月，按日等
+				type: 1, // 默认 type 1, 1无间隔；2按月分隔；3按周分隔；4按天分隔
+				// 时长数据: 工作时长， 停机时长，故障时长
+				workTime: data.workTime,
+				stopTime: data.stopTime,
+				downTime: data.downTime,
+				// 比例数据: 工作时长比率，停机时长比率，故障时长比率，速度开动率，OEE，TEEP
+				workRate: data.workRate,
+				stopRate: data.stopRate,
+				downRate: data.downRate,
+				peEfficiency: data.peEfficiency,
+				timeEfficiency: data.timeEfficiency
+			}
+			// console.log('trends data: ', data)
+
+			this.showGraph = true
+
+			setTimeout(() => {
+				// console.log('befoer graph: ', this.$refs.eegraph)
+				this.$refs.eegraph.init(injectData) // 注入初始数据，这些数据在组件内部用作条件，有可能会被更改
+			}, 600) // 动画是500ms
+		},
+
 		// 每页数
 		sizeChangeHandle(val) {
 			this.pageSize = val
@@ -273,16 +319,41 @@ export default {
 		selectionChangeHandle(val) {
 			this.dataListSelections = val
 		},
-		handleOperations({ type, data: id }) {
+
+		handleOperations({ type, data }) {
 			switch (type) {
-				case 'view-detail':
-					return this.addOrUpdateHandle(id, true)
-				case 'edit':
-					return this.addOrUpdateHandle(id)
-				case 'delete':
-					return this.deleteHandle(id)
+				case 'view-trend':
+					return this.viewTrend(data)
+				// return this.addOrUpdateHandle(id, true)
+				// case 'edit':
+				// 	return this.addOrUpdateHandle(id)
+				// case 'delete':
+				// 	return this.deleteHandle(id)
 			}
 		}
 	}
 }
 </script>
+
+<style scoped>
+	.slide-to-left-enter-active,
+	.slide-to-left-leave-active {
+		transition: all 0.5s;
+	}
+	
+	.slide-to-left-enter {
+		transform: translateX(10px);
+		opacity: 0;
+	}
+	
+	.slide-to-left-leave-to {
+		transform: translateX(-10px);
+		opacity: 0;
+	}
+	
+	.slide-to-left-leave,
+	.slide-to-left-enter-to {
+		transform: translateX(0);
+	}
+	</style>
+	
\ No newline at end of file
diff --git a/src/views/modules/monitoring/equipmentEfficiencyGraph.vue b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue
new file mode 100644
index 0000000..4894ca0
--- /dev/null
+++ b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue
@@ -0,0 +1,308 @@
+<!--
+/*
+* @Author: lb
+* @Date: 2022-07-24 13:30:00
+* @LastEditTime: 2022-07-28 09:30:00
+* @LastEditors: lb
+* @Description: 设备效率分析-echarts图
+*/
+-->
+<template>
+	<div class="graph-area">
+		<span class="close-btn" @click="close">
+			<svg xmlns="http://www.w3.org/2000/svg" style="height: 100%; width: 100%;" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+			</svg>
+		</span>
+
+		<div class="close-row" style="padding-left: 8px;">
+			<el-radio-group v-model="dataType" class="head-radio-group" size="small" @change="setLegend">
+				<el-radio-button label="百分比" />
+				<el-radio-button label="时间" />
+			</el-radio-group>
+
+			<el-radio-group v-if="1" v-model="searchType" class="head-radio-group" style="margin-left: 8px;" size="small" @change="handleRadioGroupChanged">
+				<el-radio-button v-for="(opt, index) in searchRadioOptions" :key="index" :label="opt" />
+			</el-radio-group>
+		</div>
+
+		<div id="trend-graph" class="real-graph" style="width: 100%; height: 500px;" />
+	</div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import moment from 'moment'
+import { pick } from 'lodash/object'
+
+class EchartConfigs {
+	constructor() {
+		this.color = ['#e91e63', '#4caf50', '#3f51b5', '#ffc107', '#607d8b']
+		this.title = {
+			text: '时间区间走势',
+			top: 0,
+			left: 'center',
+			textStyle: {
+				fontWeight: 'bold',
+				fontSize: 18,
+				lineHeight: 18
+			}
+		}
+		this.tooltip = {
+			trigger: 'axis',
+			// 将axisPointer设置得更显眼一点
+			axisPointer: {
+				type: 'shadow'
+			}
+		}
+		// legend
+		this.legend = {
+			icon: 'circle',
+			top: 24,
+			left: 'center',
+			padding: 8,
+			itemGap: 8,
+			data: [] // 动态设置
+		}
+		this.xAxis = {
+			type: 'category',
+			data: [] // 动态设置
+			// https://tushuo.baidu.com/wave/index#/manufacture/dta9pydmexfdhc0sg/999
+		}
+		this.yAxis = {
+			type: 'value'
+		}
+		this.series = [] // 动态设置
+	}
+
+	setTitle(val) {
+		this.title.text = val
+	}
+
+	setLegend(val) {
+		this.legend.data.splice(0)
+		if (Array.isArray(val)) {
+			this.legend.data = val
+		} else {
+			console.error('setLegend() 只接受数组参数')
+		}
+	}
+
+	setXAxis(val) {
+		// console.log('in setXAxis(): ', val)
+		this.xAxis.data.splice(0)
+		if (Array.isArray(val)) {
+			this.xAxis.data = val
+		} else {
+			console.error('setXAxis() 只接受数组参数')
+		}
+	}
+
+	setSeries(val) {
+		this.series.splice(0)
+		if (Array.isArray(val)) {
+			this.series = val
+		} else {
+			console.error('setSeries() 只接受数组参数')
+		}
+	}
+}
+
+export default {
+	name: 'EquipmentEfficiencyGraph',
+	props: {},
+	data() {
+		return {
+			searchType: '无间隔',
+			searchRadioOptions: ['无间隔', '按月', '按周', '按天'],
+			dataType: '时间',
+			dataRadioOptions: ['时间', '百分比'],
+			config: new EchartConfigs(),
+			chart: null,
+			rateList: [], // 对请求来的数据分流
+			timeList: [],
+			xAxis: [], // 动态设置
+			injectData: null
+		}
+	},
+	methods: {
+		async initChart() {
+			this.config.setTitle(this.injectData.equipmentName + ' 时间区间走势')
+			await this.getList()
+			this.setLegend()
+		},
+
+		init(data) {
+			this.injectData = data
+			if (!this.chart) {
+				this.chart = echarts.init(document.getElementById('trend-graph'))
+				// this.chart.setOption(this.config)
+				this.initChart()
+			}
+		},
+		close() {
+			this.$emit('close-graph')
+		},
+
+		makeQuerys() {
+			const searchTypeMap = {
+				无间隔: 1,
+				按月: 2,
+				按周: 3,
+				按天: 4
+			}
+
+			return {
+				// current: 1,
+				// size: 999,
+				// ftId:  this.injectData.factoryId , // 工厂id
+				// wsId:  this.injectData.workSequenceId , // 工段id
+				// productlines: ['1409788336610934786'], // 产线ids， 这几项都暂时不需要
+				type: searchTypeMap[this.searchType],
+				eqId: this.injectData.equipmentId,
+				startTime: this.injectData.startTime, // '2022-06-14T00:00:00'
+				endTime: this.injectData.endTime
+			}
+		},
+
+		// getOEE
+		getOEE(params) {},
+
+		getList() {
+			const params = this.makeQuerys()
+			// 发起请求
+			return this.getOEE(params).then(res => {
+				this.timeList.splice(0)
+				this.rateList.splice(0)
+				this.xAxis.splice(0)
+				if (res.data) {
+					// 分流
+					res.data.map(item => {
+						const time = moment(item.time)
+						if (this.searchType === '按月') {
+							this.xAxis.push(`${time.year()}年${time.month() + 1}月`)
+						} else if (this.searchType === '按周') {
+							this.xAxis.push(`${time.format('YYYY-MM-DD')}`)
+						} else if (this.searchType === '按天') {
+							this.xAxis.push(`${time.format('YY-M-D')}`)
+						} else {
+							this.xAxis.push(`${time.format('YYYY-MM-DD')}`)
+						}
+						this.timeList.push(pick(item, ['workTime', 'stopTime', 'downTime']))
+						this.rateList.push(pick(item, ['workRate', 'stopRate', 'downRate', 'peEfficiency', 'timeEfficiency', 'oee', 'teep']))
+					})
+
+					// 设置横轴
+					this.config.setXAxis(JSON.parse(JSON.stringify(this.xAxis)))
+				}
+			})
+		},
+
+		async handleRadioGroupChanged() {
+			// 获取数据且设置横轴
+			await this.getList()
+			// 设置legend和数据
+			this.setLegend()
+		},
+
+		setLegend() {
+			// 设置legend
+			const legendMap = {
+				百分比: ['工作时长比率', '停机时长比率', '故障时长比率', '速度开动率', '时间开动率', 'OEE', 'TEEP'],
+				时间: ['工作时长', '停机时长', '故障时长']
+			}
+			this.config.setLegend(legendMap[this.dataType])
+			this.setData()
+			// 重新绘制
+			this.renderGraph()
+		},
+
+		setData() {
+			if (this.dataType === '时间') {
+				const workTimeList = []
+				const stopTimeList = []
+				const downTimeList = []
+				this.timeList.map(item => {
+					workTimeList.push(item.workTime)
+					stopTimeList.push(item.stopTime)
+					downTimeList.push(item.downTime)
+				})
+				this.config.setSeries([
+					{ name: '工作时长', type: 'bar', data: workTimeList },
+					{ name: '停机时长', type: 'bar', data: stopTimeList },
+					{ name: '故障时长', type: 'bar', data: downTimeList }
+				])
+			} else {
+				// 百分比
+				const workRateList = []
+				const stopRateList = []
+				const downRateList = []
+				const peEfficiencyList = []
+				const timeEfficiencyList = []
+				const oeeList = []
+				const teepList = []
+				this.rateList.map(item => {
+					workRateList.push(item.workRate)
+					stopRateList.push(item.stopRate)
+					downRateList.push(item.downRate)
+					peEfficiencyList.push(item.peEfficiency)
+					timeEfficiencyList.push(item.timeEfficiency)
+					oeeList.push(item.oee)
+					teepList.push(item.teep)
+				})
+				this.config.setSeries([
+					{ name: '工作时长比率', type: 'bar', data: workRateList },
+					{ name: '停机时长比率', type: 'bar', data: stopRateList },
+					{ name: '故障时长比率', type: 'bar', data: downRateList },
+					{ name: '速度开动率', type: 'bar', data: peEfficiencyList },
+					{ name: '时间开动率', type: 'bar', data: timeEfficiencyList },
+					{ name: 'OEE', type: 'bar', data: oeeList },
+					{ name: 'TEEP', type: 'bar', data: teepList }
+				])
+			}
+		},
+
+		// 重新绘制图形
+		renderGraph() {
+			// console.log('latest config: ', this.config)
+			this.chart.setOption(this.config)
+		}
+	}
+}
+</script>
+
+<style scoped>
+.graph-area {
+	margin-top: 18px;
+	/* background: #f0f0f0; */
+	width: 100%;
+	min-height: 200px;
+	position: relative;
+}
+
+.close-row {
+	position: relative;
+	padding: 8px 0;
+}
+
+.close-btn {
+	position: absolute;
+	z-index: 1;
+	top: 10px;
+	right: 10px;
+	display: inline-block;
+	width: 20px;
+	height: 20px;
+	cursor: pointer;
+	transition: color 0.3s linear;
+}
+
+.close-btn:hover {
+	color: #0b58ff;
+}
+
+.head-radio-group >>> .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+	background-color: #0b58ff;
+	border-color: #0b58ff;
+}
+</style>
-- 
2.45.2


From 7ed4a512bc8512523c959044b2eade0103ffb69b Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Wed, 21 Sep 2022 16:58:26 +0800
Subject: [PATCH 08/14] =?UTF-8?q?update=20=E6=95=B0=E6=8D=AE=E5=88=86?=
 =?UTF-8?q?=E6=9E=90-=E8=AE=BE=E5=A4=87=E6=95=88=E7=8E=87=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E7=9A=84echarts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentEfficiency.vue        | 47 ++++++++--------
 .../monitoring/equipmentEfficiencyGraph.vue   | 53 ++++++++++++-------
 2 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue
index d022236..a843ce6 100644
--- a/src/views/modules/monitoring/equipmentEfficiency.vue
+++ b/src/views/modules/monitoring/equipmentEfficiency.vue
@@ -167,7 +167,8 @@ export default {
 		}
 	},
 	components: {
-		BaseTable, EquipmentEfficiencyGraph
+		BaseTable,
+		EquipmentEfficiencyGraph
 	},
 
 	created() {
@@ -298,6 +299,9 @@ export default {
 
 			this.showGraph = true
 
+			console.clear()
+			console.log('inject data: ', injectData)
+			
 			setTimeout(() => {
 				// console.log('befoer graph: ', this.$refs.eegraph)
 				this.$refs.eegraph.init(injectData) // 注入初始数据，这些数据在组件内部用作条件，有可能会被更改
@@ -336,24 +340,23 @@ export default {
 </script>
 
 <style scoped>
-	.slide-to-left-enter-active,
-	.slide-to-left-leave-active {
-		transition: all 0.5s;
-	}
-	
-	.slide-to-left-enter {
-		transform: translateX(10px);
-		opacity: 0;
-	}
-	
-	.slide-to-left-leave-to {
-		transform: translateX(-10px);
-		opacity: 0;
-	}
-	
-	.slide-to-left-leave,
-	.slide-to-left-enter-to {
-		transform: translateX(0);
-	}
-	</style>
-	
\ No newline at end of file
+.slide-to-left-enter-active,
+.slide-to-left-leave-active {
+	transition: all 0.5s;
+}
+
+.slide-to-left-enter {
+	transform: translateX(10px);
+	opacity: 0;
+}
+
+.slide-to-left-leave-to {
+	transform: translateX(-10px);
+	opacity: 0;
+}
+
+.slide-to-left-leave,
+.slide-to-left-enter-to {
+	transform: translateX(0);
+}
+</style>
diff --git a/src/views/modules/monitoring/equipmentEfficiencyGraph.vue b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue
index 4894ca0..cb2b236 100644
--- a/src/views/modules/monitoring/equipmentEfficiencyGraph.vue
+++ b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue
@@ -15,7 +15,7 @@
 			</svg>
 		</span>
 
-		<div class="close-row" style="padding-left: 8px;">
+		<div class="close-row">
 			<el-radio-group v-model="dataType" class="head-radio-group" size="small" @change="setLegend">
 				<el-radio-button label="百分比" />
 				<el-radio-button label="时间" />
@@ -100,7 +100,7 @@ class EchartConfigs {
 
 	setSeries(val) {
 		this.series.splice(0)
-		if (Array.isArray(val)) {
+		if (Array.isArray(val) && this.series.length === 0) {
 			this.series = val
 		} else {
 			console.error('setSeries() 只接受数组参数')
@@ -127,7 +127,7 @@ export default {
 	},
 	methods: {
 		async initChart() {
-			this.config.setTitle(this.injectData.equipmentName + ' 时间区间走势')
+			this.config.setTitle(this.injectData.equipmentName + '时间区间走势')
 			await this.getList()
 			this.setLegend()
 		},
@@ -149,15 +149,11 @@ export default {
 				无间隔: 1,
 				按月: 2,
 				按周: 3,
-				按天: 4
+				按天: 4,
+				按小时: 5
 			}
 
 			return {
-				// current: 1,
-				// size: 999,
-				// ftId:  this.injectData.factoryId , // 工厂id
-				// wsId:  this.injectData.workSequenceId , // 工段id
-				// productlines: ['1409788336610934786'], // 产线ids， 这几项都暂时不需要
 				type: searchTypeMap[this.searchType],
 				eqId: this.injectData.equipmentId,
 				startTime: this.injectData.startTime, // '2022-06-14T00:00:00'
@@ -166,18 +162,32 @@ export default {
 		},
 
 		// getOEE
-		getOEE(params) {},
+		getOEE(params) {
+			return this.$http({
+				url: this.$http.adornUrl('/monitoring/eqAnalysis/oee'),
+				method: 'post',
+				data: params
+			}).then(({ data: res }) => {
+				if (!res.data || res.code === 500) {
+					this.dataList.splice(0)
+					this.$message.error(res.msg)
+					return { data: null }
+				}
+				return res.data
+			})
+		},
 
 		getList() {
 			const params = this.makeQuerys()
 			// 发起请求
-			return this.getOEE(params).then(res => {
+			return this.getOEE(params).then(datalist => {
+				console.log('getOEE res:', datalist)
 				this.timeList.splice(0)
 				this.rateList.splice(0)
 				this.xAxis.splice(0)
-				if (res.data) {
+				if (datalist.length) {
 					// 分流
-					res.data.map(item => {
+					datalist.map(item => {
 						const time = moment(item.time)
 						if (this.searchType === '按月') {
 							this.xAxis.push(`${time.year()}年${time.month() + 1}月`)
@@ -264,8 +274,13 @@ export default {
 
 		// 重新绘制图形
 		renderGraph() {
-			// console.log('latest config: ', this.config)
-			this.chart.setOption(this.config)
+			console.log('latest config: ', JSON.stringify(this.config))
+			this.$nextTick(() => {
+				// this.chart.setOption(this.config)
+				this.chart.setOption(this.config, {
+          notMerge: true
+        })
+			})
 		}
 	}
 }
@@ -273,8 +288,6 @@ export default {
 
 <style scoped>
 .graph-area {
-	margin-top: 18px;
-	/* background: #f0f0f0; */
 	width: 100%;
 	min-height: 200px;
 	position: relative;
@@ -298,11 +311,11 @@ export default {
 }
 
 .close-btn:hover {
-	color: #0b58ff;
+	color: #409eff;
 }
 
 .head-radio-group >>> .el-radio-button__orig-radio:checked + .el-radio-button__inner {
-	background-color: #0b58ff;
-	border-color: #0b58ff;
+	background-color: #409eff;
+	border-color: #409eff;
 }
 </style>
-- 
2.45.2


From 1ad64efe59c03cb773cf2e5c7f01547b6d388d5f Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Thu, 22 Sep 2022 10:03:23 +0800
Subject: [PATCH 09/14] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |   4 +-
 .../modules/monitoring/equipmentException.vue | 117 ++++++++----------
 2 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 134bf99..d06a328 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,8 +8,8 @@ import merge from 'lodash/merge'
 
 const http = axios.create({
   // baseURL: window.SITE_CONFIG['apiURL'],
-  // baseURL: '/api',
-  baseURL: process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor',
+  baseURL: '/api',
+  // baseURL: process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor',
   timeout: 1000 * 180,
   withCredentials: true
 })
diff --git a/src/views/modules/monitoring/equipmentException.vue b/src/views/modules/monitoring/equipmentException.vue
index 03b3425..c05bb1f 100644
--- a/src/views/modules/monitoring/equipmentException.vue
+++ b/src/views/modules/monitoring/equipmentException.vue
@@ -21,7 +21,8 @@
 		</el-form>
 
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-		<el-pagination
+
+		<!-- <el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
 			:current-page="pageIndex"
@@ -29,18 +30,17 @@
 			:page-size="pageSize"
 			:total="totalPage"
 			layout="total, sizes, prev, pager, next, jumper"
-		></el-pagination>
+		/> -->
 	</div>
 </template>
 
 <script>
 import i18n from '@/i18n'
 import BaseTable from '@/components/base-table'
-import TableOperateComponent from '@/components/base-table/components/operationComponent'
+// import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
-
-import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
+import { calcMaxHeight } from '@/utils'
 import moment from 'moment'
 
 const tableConfigs = [
@@ -48,6 +48,7 @@ const tableConfigs = [
 		type: 'index',
 		name: i18n.t('index')
 	},
+	{ prop: 'time', name: '时间', filter: timeFilter },
 	{ prop: 'pdlName', name: '产线名称' },
 	{ prop: 'wsName', name: '工序' },
 	{ prop: 'eqName', name: '设备' },
@@ -56,15 +57,15 @@ const tableConfigs = [
 	{ prop: 'workTime', name: '工作时长 (h)' },
 	{ prop: 'downTime', name: '故障时长 (h)' },
 	{ prop: 'downCount', name: '故障次数' },
-	{
-		prop: 'operations',
-		name: i18n.t('handle'),
-		fixed: 'right',
-		width: 180,
-		subcomponent: TableOperateComponent,
-		// options: ['edit', 'delete']
-		options: ['view-trend'] // 查看趋势
-	}
+	// {
+	// 	prop: 'operations',
+	// 	name: i18n.t('handle'),
+	// 	fixed: 'right',
+	// 	width: 120,
+	// 	subcomponent: TableTextComponent,
+	// 	buttonContent: '查看详情', // 会转到“设备报警”
+	// 	emitFullData: true
+	// }
 ]
 
 export default {
@@ -77,10 +78,9 @@ export default {
 			calcMaxHeight,
 			tableConfigs,
 			timeType: 'range',
-			rawTime: null, // [] or datetime
+			rawTime: new Date(),
 			dataForm: {
 				type: 1,
-				ftId: null,
 				productlines: [],
 				startTime: null,
 				entTime: null
@@ -97,29 +97,29 @@ export default {
 	},
 
 	created() {
-		this.getFactoryList()
-		// this.getProductLineList()
+		// this.getFactoryList()
+		this.getProductLineList()
 	},
 	watch: {},
 	methods: {
 		// 获取工厂列表
-		getFactoryList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/factory/page'),
-				method: 'get'
-			}).then(({ data }) => {
-				if (data && data.code === 0) {
-					this.factoryList = data.data.list
-					/** set default */
-					if (this.factoryList.length) {
-						this.dataForm.ftId = this.factoryList[0].id
-					}
-				} else {
-					this.factoryList = []
-					this.dataForm.ftId = null
-				}
-			})
-		},
+		// getFactoryList() {
+		// 	this.$http({
+		// 		url: this.$http.adornUrl('/monitoring/factory/page'),
+		// 		method: 'get'
+		// 	}).then(({ data }) => {
+		// 		if (data && data.code === 0) {
+		// 			this.factoryList = data.data.list
+		// 			/** set default */
+		// 			if (this.factoryList.length) {
+		// 				this.dataForm.ftId = this.factoryList[0].id
+		// 			}
+		// 		} else {
+		// 			this.factoryList = []
+		// 			this.dataForm.ftId = null
+		// 		}
+		// 	})
+		// },
 		// 获取产线列表
 		getProductLineList() {
 			this.$http({
@@ -138,46 +138,39 @@ export default {
 			})
 		},
 
-		// 时间类型预处理
-		getTimeRange() {
-			let startTime
-			let endTime
-			if (this.rawTime instanceof Array) {
-				startTime = this.rawTime[0] ? moment(this.rawTime[0]).format('YYYY-MM-DDTHH:mm:ss') : '' // 强制axios使用北京时间
-				endTime = this.rawTime[1] ? moment(this.rawTime[1]).format('YYYY-MM-DDTHH:mm:ss') : ''
-			} else {
-				if (this.rawTime) {
-					startTime = moment(this.rawTime).format('YYYY-MM-DDTHH:mm:ss')
-					endTime = moment(startTime)
-						.add(1, 'd')
-						.format('YYYY-MM-DDTHH:mm:ss')
-				} else {
-					startTime = ''
-					endTime = ''
-				}
-			}
-			return { startTime, endTime }
-		},
-
 		// 获取数据列表
 		getDataList() {
-			const { startTime, endTime } = this.getTimeRange()
+			// this.dataList = Array(10).fill(1)
+			// return
+			let startTime = this.rawTime
+				? moment(this.rawTime)
+						.set({ date: 1, hour: 0, minute: 0, second: 0, millisecond: 0 })
+						.format('YYYY-MM-DDTHH:mm:ss')
+				: ''
+			let endTime = startTime
+				? moment(startTime)
+						.add(1, 'M')
+						.format('YYYY-MM-DDTHH:mm:ss')
+				: ''
 
 			this.dataListLoading = true
+
 			this.$http({
-				url: this.$http.adornUrl('/monitoring/eqAnalysis/oee'),
+				url: this.$http.adornUrl('/monitoring/eqAnalysis/mtbrAndMtbr'),
 				method: 'post',
 				data: {
 					startTime,
 					endTime,
-					ftId: this.dataForm.ftId,
 					productlines: this.dataForm.productlines,
-					limit: this.pageIndex,
-					page: this.pageSize,
 					type: 1
 				}
 			}).then(({ data: res }) => {
-				console.log('oee data:', res)
+				if (res.code === 500) {
+					this.dataList.splice(0)
+					this.$message.error(res.msg)
+				} else {
+					this.dataList = res.data
+				}
 			})
 		},
 		// 每页数
-- 
2.45.2


From 399589bb3ba398fb6b56d740c06ac5ef269f7785 Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Thu, 22 Sep 2022 11:18:48 +0800
Subject: [PATCH 10/14] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E5=BA=8F=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentTimesequence.vue      | 395 ++++++++++++------
 1 file changed, 257 insertions(+), 138 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentTimesequence.vue b/src/views/modules/monitoring/equipmentTimesequence.vue
index 2cc296e..77c1bf8 100644
--- a/src/views/modules/monitoring/equipmentTimesequence.vue
+++ b/src/views/modules/monitoring/equipmentTimesequence.vue
@@ -4,13 +4,15 @@
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<!-- 产线 -->
 			<el-form-item>
-				<el-select v-model="dataForm.productlines" :placeholder="'产线'" clearable />
+				<el-select v-model="dataForm.productlines" :placeholder="'产线'" @change="handleProductLineChange" clearable>
+					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
+				</el-select>
 			</el-form-item>
 			<!-- 工序 -->
 			<el-form-item>
 				<!-- <el-select v-model="dataForm.factoryId" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-select> -->
-				<el-select v-model="dataForm.ftId" :placeholder="'工序'" clearable>
-					<el-option v-for="factory in factoryList" :key="factory.id" :value="factory.id" :label="factory.name" />
+				<el-select v-model="dataForm.wsId" :placeholder="'工序'" clearable>
+					<el-option v-for="ws in wsList" :key="ws.id" :value="ws.id" :label="ws.name" />
 				</el-select>
 			</el-form-item>
 			<!-- 日期选择 -->
@@ -24,107 +26,168 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
-		<el-pagination
-			@size-change="sizeChangeHandle"
-			@current-change="currentChangeHandle"
-			:current-page="pageIndex"
-			:page-sizes="[10, 20, 50, 100]"
-			:page-size="pageSize"
-			:total="totalPage"
-			layout="total, sizes, prev, pager, next, jumper"
-		></el-pagination>
+		<div class="time-chart" style="margin-top: 10px;">
+			<div
+				v-show="equipmentCount > 0"
+				id="time-chart__inner"
+				ref="time-chart__inner"
+				class="time-chart__inner"
+				style="width: 100%; min-height: 50vh;"
+				:style="{ height: autoHeight + 'px' }"
+			/>
+			<div v-show="equipmentCount === 0">请先查询数据</div>
+			<!-- <div v-show="equipmentCount === 0">{{ $t('module.basicData.visual.hints.searchFirst') }}</div> -->
+		</div>
 	</div>
 </template>
 
 <script>
-import i18n from '@/i18n'
+import * as echarts from 'echarts'
+// import i18n from '@/i18n'
 import BaseTable from '@/components/base-table'
-import TableOperateComponent from '@/components/base-table/components/operationComponent'
-import TableTextComponent from '@/components/base-table/components/detailComponent'
-
 import { calcMaxHeight } from '@/utils'
-import { timeFilter } from '@/utils/filters'
 import moment from 'moment'
+// import TableOperateComponent from '@/components/base-table/components/operationComponent'
+// import TableTextComponent from '@/components/base-table/components/detailComponent'
+// import { timeFilter } from '@/utils/filters'
 
-const tableConfigs = [
-	{
-		type: 'index',
-		name: i18n.t('index')
-	},
-	{
-		// name: i18n.t('createTime'),
-		prop: 'factoryName',
-		name: '工厂'
-	},
-	{ prop: 'pdName', name: '产线' },
-	{ prop: 'wsName', name: '工段' },
-	{ prop: 'eqName', name: '设备' },
-	{
-		name: '有效时间(h)',
-		children: [
-			{ prop: 'workTime', name: '工作时长(h)', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'workRate', name: '工作时长比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
-		]
-	},
-	{
-		name: '关机时间(h)',
-		children: [
-			{ prop: 'stopTime', name: '停机时长(h)', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'stopRate', name: '停机比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
-		]
-	},
-	{
-		name: '中断损失',
-		children: [
-			{ prop: 'downTime', name: '故障时长(h)', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'downRate', name: '故障比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' },
-			{ prop: 'timeEfficiency', name: '时间开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
-		]
-	},
-	{
-		name: '速度损失',
-		children: [
-			{ prop: 'realYield', name: '实际加工速度', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'designYield', name: '理论加工速度', width: 120, filter: val => `${val} 小时` },
-			{ prop: 'peEfficiency', name: '速度开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }
-		]
-	},
-	{
-		name: 'OEE',
-		prop: 'oee',
-		filter: val => (val * 100).toFixed(2) + '%'
-	},
-	{
-		name: 'TEEP',
-		prop: 'teep',
-		filter: val => (val * 100).toFixed(2) + '%'
-	},
-	{
-		prop: 'operations',
-		name: i18n.t('handle'),
-		fixed: 'right',
-		width: 180,
-		subcomponent: TableOperateComponent,
-		// options: ['edit', 'delete']
-		options: ['view-trend'] // 查看趋势
+function renderItem(params, api) {
+	var categoryIndex = api.value(0)
+	var start = api.coord([api.value(1), categoryIndex])
+	var end = api.coord([api.value(2), categoryIndex])
+	var height = 32
+
+	return {
+		type: 'rect',
+		shape: echarts.graphic.clipRectByRect(
+			{
+				x: start[0],
+				y: start[1] - height / 2,
+				width: end[0] - start[0],
+				height: height
+			},
+			{
+				x: params.coordSys.x,
+				y: params.coordSys.y,
+				width: params.coordSys.width,
+				height: params.coordSys.height
+			}
+		),
+		style: api.style()
 	}
-]
+}
+
+class ChartOption {
+	constructor() {
+		this.color = ['#4caf50', '#ffb300', '#e53935']
+		this.legend = {
+			data: [
+				// i18n.t('module.basicData.visual.echartLegends.working'),
+				'正常',
+				'停机',
+				'故障'
+			],
+			bottom: '0%',
+			selectedMode: false,
+			textStyle: {
+				color: '#000'
+			}
+		}
+		this.tooltip = {
+			formatter: function(params) {
+				return moment(params.value[1]).format('YYYY-MM-DD HH:mm:ss') + ' - ' + moment(params.value[2]).format('YYYY-MM-DD HH:mm:ss') + ' : ' + params.name
+			}
+		}
+		this.title = {
+			// text: i18n.t('module.basicData.visual.echartTitles.eqStatus'),
+			text: '设备状态时序图',
+			left: 'center'
+		}
+		this.xAxis = {
+			type: 'time',
+			// min: +new Date().setHours(0, 0, 0, 0),
+			splitNumber: 24,
+			interval: 3600 * 1000,
+			axisTick: {
+				show: true,
+				alignWithLabel: true
+			},
+			axisLine: {
+				show: true
+			},
+			axisLabel: {
+				formatter: function(val) {
+					const time = new Date(val)
+					const hour = time.getHours()
+					const minute = time.getMinutes()
+					const hours = hour >= 10 ? hour + '' : '0' + hour
+					const minutes = minute >= 10 ? minute + '' : '0' + minute
+					return hours + ':' + minutes
+				}
+			}
+		}
+		this.yAxis = {
+			// data: Object.keys(eqData).map(item => eqData[item].name)
+			data: []
+		}
+		this.series = [
+			{ name: /** i18n.t('module.basicData.visual.echartLegends.working') */ '正常', type: 'bar', data: [] },
+			{ name: '停机', type: 'bar', data: [] },
+			{ name: '故障', type: 'bar', data: [] },
+			{
+				type: 'custom',
+				renderItem: renderItem,
+				itemStyle: {
+					opacity: 0.8
+				},
+				encode: {
+					x: [1, 2],
+					y: 0
+				},
+				data: []
+			}
+		]
+	}
+
+	setTitle(title) {
+		this.title.text = title
+	}
+
+	// date: 服务器返回来的日期时间数据
+	setXAxis(date) {
+		// this.xAxis.min = +new Date(date).setHours(0)
+		this.xAxis.min = +new Date(date).setHours(0, 0, 0, 0)
+		this.xAxis.max = this.xAxis.min + 3600 * 1000 * 24
+	}
+
+	setYAxis(data) {
+		this.yAxis.data = data
+	}
+
+	setData(data) {
+		this.series[3].data = data
+	}
+}
 
 export default {
 	data() {
 		return {
 			/** hfxny part */
-			factoryList: [],
+			wsList: [],
 			productLineList: [],
-			/** */
+			chart: null,
+			chartOption: new ChartOption(),
+			equipments: {},
+			state: ['正常', '停机', '故障'],
+			colors: ['#4caf50', '#ffb300', '#e53935'],
+			queryBuffer: {},
+			// tableConfigs,
 			calcMaxHeight,
-			tableConfigs,
 			timeType: 'range',
-			rawTime: null, // [] or datetime
+			currentLine: null,
+			rawTime: null,
 			dataForm: {
-				type: 1,
-				ftId: null,
+				wsId: null,
 				productlines: [],
 				startTime: null,
 				entTime: null
@@ -139,10 +202,18 @@ export default {
 	components: {
 		BaseTable
 	},
-
+	computed: {
+		autoHeight: function() {
+			return Object.keys(this.equipments).length * 100 || 500
+		},
+		equipmentCount: function() {
+			return Object.keys(this.equipments).length
+		}
+	},
 	created() {
-		this.getFactoryList()
-		this.getProductLineList()
+		this.getProductLineList().then(() => {
+			this.getWorksetionList()
+		})
 	},
 	watch: {
 		timeType() {
@@ -151,27 +222,14 @@ export default {
 		}
 	},
 	methods: {
-		// 获取工厂列表
-		getFactoryList() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/factory/page'),
-				method: 'get'
-			}).then(({ data }) => {
-				if (data && data.code === 0) {
-					this.factoryList = data.data.list
-					/** set default */
-					if (this.factoryList.length) {
-						this.dataForm.ftId = this.factoryList[0].id
-					}
-				} else {
-					this.factoryList = []
-					this.dataForm.ftId = null
-				}
-			})
+		initChart() {
+			if (!this.chart) {
+				this.chart = echarts.init(this.$refs['time-chart__inner'])
+			}
 		},
 		// 获取产线列表
 		getProductLineList() {
-			this.$http({
+			return this.$http({
 				url: this.$http.adornUrl('/monitoring/productionLine/page'),
 				method: 'get'
 			}).then(({ data }) => {
@@ -179,7 +237,7 @@ export default {
 					this.productLineList = data.data.list
 					/** set default */
 					if (this.productLineList.length) {
-						this.dataForm.productlines = [this.productLineList[0].id]
+						this.dataForm.productlines = this.productLineList[0].id
 					}
 				} else {
 					this.productLineList = []
@@ -187,55 +245,116 @@ export default {
 			})
 		},
 
-		// 时间类型预处理
-		getTimeRange() {
-			let startTime
-			let endTime
-			if (this.rawTime instanceof Array) {
-				startTime = this.rawTime[0] ? moment(this.rawTime[0]).format('YYYY-MM-DDTHH:mm:ss') : '' // 强制axios使用北京时间
-				endTime = this.rawTime[1] ? moment(this.rawTime[1]).format('YYYY-MM-DDTHH:mm:ss') : ''
-			} else {
-				if (this.rawTime) {
-					startTime = moment(this.rawTime).format('YYYY-MM-DDTHH:mm:ss')
-					endTime = moment(startTime)
-						.add(1, 'd')
-						.format('YYYY-MM-DDTHH:mm:ss')
+		// 获取工序列表
+		getWorksetionList() {
+			// 分页列表才有根据产线过滤功能
+			this.$http({
+				// url: this.$http.adornUrl('/monitoring/workshopSection/list'),
+				url: this.$http.adornUrl('/monitoring/workshopSection/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					limit: 99999,
+					page: 1,
+					lineId: this.dataForm.productlines ?? ''
+				})
+			}).then(({ data: res }) => {
+				if (res && res.code === 0) {
+					this.wsList = res.data.list
+					/** set default */
+					if (this.wsList.length) {
+						this.dataForm.wsId = this.wsList[0].id
+					}
 				} else {
-					startTime = ''
-					endTime = ''
+					this.wsList.splice(0)
+					this.dataForm.wsId = '' // <== 不起作用...
 				}
-			}
-			return { startTime, endTime }
+			})
+		},
+
+		// 把服务器数据按照设备分组
+		transformDataToEquipments(dataList) {
+			console.log('transformDataToEquipments() datalist: ', dataList)
+			const equipments = {}
+			dataList.map(item => {
+				if (equipments[item.eqId]) {
+					// 如果设备已存在
+					equipments[item.eqId].name = item.eqName
+					equipments[item.eqId].status.push({
+						startTime: +new Date(item.startTime),
+						endTime: +new Date(item.endTime),
+						status: this.state[item.status] // 0 正常、1 停机、2 故障
+					})
+				} else {
+					equipments[item.eqId] = {
+						name: item.eqName,
+						status: [
+							{
+								startTime: +new Date(item.startTime),
+								endTime: +new Date(item.endTime),
+								status: this.state[item.status] // 0 正常、1 停机、2 故障
+							}
+						]
+					}
+				}
+			})
+			// console.log('items --- ', equipments)
+			return equipments
+		},
+		// 把分组好的设备数据转换为echarts需要的series数据
+		transformEquipmentsToSeries(equipments) {
+			const seriesData = []
+			Object.entries(equipments).map(([key, item], index) => {
+				item.status.forEach(status => {
+					seriesData.push({
+						name: status.status,
+						value: [index, status.startTime, status.endTime],
+						itemStyle: {
+							normal: {
+								color: status.status === '正常' ? '#4caf50' : status.status === '停机' ? '#ffb300' : status.status === '故障' ? '#e53935' : null
+							}
+						}
+					})
+				})
+			})
+			return seriesData
 		},
 
 		// 获取数据列表
 		getDataList() {
-			const { startTime, endTime } = this.getTimeRange()
+			let startTime = this.rawTime
+				? moment(this.rawTime)
+						.set({ date: 1, hour: 0, minute: 0, second: 0, millisecond: 0 })
+						.format('YYYY-MM-DDTHH:mm:ss')
+				: ''
+			let endTime = startTime
+				? moment(startTime)
+						.add(1, 'M')
+						.format('YYYY-MM-DDTHH:mm:ss')
+				: ''
 
 			this.dataListLoading = true
 			this.$http({
-				url: this.$http.adornUrl('/monitoring/eqAnalysis/oee'),
+				url: this.$http.adornUrl('/monitoring/eqAnalysis/timeAndStatus'),
 				method: 'post',
 				data: {
 					startTime,
 					endTime,
-					ftId: this.dataForm.ftId,
-					productlines: this.dataForm.productlines,
-					limit: this.pageIndex,
-					page: this.pageSize,
-					type: 1
+					productlines: [this.dataForm.productlines],
+					wsId: this.dataForm.wsId
 				}
 			}).then(({ data: res }) => {
-				console.log('oee data:', res)
-				if (res.length) {
-					this.dataList = res 
-					this.totalPage = res.length
-				} else {
+				if (res.code === 500) {
 					this.dataList.splice(0)
-					this.totalPage = 0
+					this.$message.error(res.msg)
+				} else {
+					this.dataList = res.data
 				}
 			})
 		},
+		handleProductLineChange(val) {
+			console.log('handleProductLineChange', this.dataForm.productlines)
+			this.getWorksetionList()
+		},
 		// 每页数
 		sizeChangeHandle(val) {
 			this.pageSize = val
-- 
2.45.2


From 31f496cc134d3da3ca62f7800a8827ba4bf79452 Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Thu, 22 Sep 2022 13:25:41 +0800
Subject: [PATCH 11/14] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E5=BA=8F=E5=9B=BE=E4=BA=A7=E7=BA=BF=E5=B7=A5?=
 =?UTF-8?q?=E6=AE=B5=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/monitoring/equipmentTimesequence.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentTimesequence.vue b/src/views/modules/monitoring/equipmentTimesequence.vue
index 77c1bf8..15a859e 100644
--- a/src/views/modules/monitoring/equipmentTimesequence.vue
+++ b/src/views/modules/monitoring/equipmentTimesequence.vue
@@ -185,7 +185,7 @@ export default {
 			calcMaxHeight,
 			timeType: 'range',
 			currentLine: null,
-			rawTime: null,
+			rawTime: new Date(),
 			dataForm: {
 				wsId: null,
 				productlines: [],
@@ -263,10 +263,11 @@ export default {
 					/** set default */
 					if (this.wsList.length) {
 						this.dataForm.wsId = this.wsList[0].id
+					} else {
+						this.dataForm.wsId = null
 					}
 				} else {
 					this.wsList.splice(0)
-					this.dataForm.wsId = '' // <== 不起作用...
 				}
 			})
 		},
@@ -352,7 +353,6 @@ export default {
 			})
 		},
 		handleProductLineChange(val) {
-			console.log('handleProductLineChange', this.dataForm.productlines)
 			this.getWorksetionList()
 		},
 		// 每页数
-- 
2.45.2


From 5a45aead7cd0597d873e317145f2abe984970ec4 Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Thu, 22 Sep 2022 14:20:03 +0800
Subject: [PATCH 12/14] =?UTF-8?q?update=20=E5=9F=BA=E6=9C=AC=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E6=97=B6=E5=BA=8F?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentTimesequence.vue      | 92 +++++++++++++++++--
 1 file changed, 84 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentTimesequence.vue b/src/views/modules/monitoring/equipmentTimesequence.vue
index 15a859e..69074c4 100644
--- a/src/views/modules/monitoring/equipmentTimesequence.vue
+++ b/src/views/modules/monitoring/equipmentTimesequence.vue
@@ -32,8 +32,8 @@
 				id="time-chart__inner"
 				ref="time-chart__inner"
 				class="time-chart__inner"
-				style="width: 100%; min-height: 50vh;"
-				:style="{ height: autoHeight + 'px' }"
+				style="min-height: 50vh;"
+				:style="{ height: autoHeight + 'px', width: '100%' }"
 			/>
 			<div v-show="equipmentCount === 0">请先查询数据</div>
 			<!-- <div v-show="equipmentCount === 0">{{ $t('module.basicData.visual.hints.searchFirst') }}</div> -->
@@ -112,6 +112,9 @@ class ChartOption {
 				show: true,
 				alignWithLabel: true
 			},
+			splitLine: {
+				show: true
+			},
 			axisLine: {
 				show: true
 			},
@@ -188,7 +191,7 @@ export default {
 			rawTime: new Date(),
 			dataForm: {
 				wsId: null,
-				productlines: [],
+				productlines: null,
 				startTime: null,
 				entTime: null
 			},
@@ -215,6 +218,14 @@ export default {
 			this.getWorksetionList()
 		})
 	},
+	mounted() {
+		this.$nextTick(() => {
+			this.initChart()
+		})
+	},
+	updated() {
+		if (this.chart) this.chart.resize()
+	},
 	watch: {
 		timeType() {
 			// 防止切换日期类型时报错
@@ -279,7 +290,7 @@ export default {
 			dataList.map(item => {
 				if (equipments[item.eqId]) {
 					// 如果设备已存在
-					equipments[item.eqId].name = item.eqName
+					// equipments[item.eqId].name = item.eqName
 					equipments[item.eqId].status.push({
 						startTime: +new Date(item.startTime),
 						endTime: +new Date(item.endTime),
@@ -298,7 +309,7 @@ export default {
 					}
 				}
 			})
-			// console.log('items --- ', equipments)
+			console.log('created equipments --- ', equipments)
 			return equipments
 		},
 		// 把分组好的设备数据转换为echarts需要的series数据
@@ -324,16 +335,26 @@ export default {
 		getDataList() {
 			let startTime = this.rawTime
 				? moment(this.rawTime)
-						.set({ date: 1, hour: 0, minute: 0, second: 0, millisecond: 0 })
+						.set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
 						.format('YYYY-MM-DDTHH:mm:ss')
 				: ''
 			let endTime = startTime
 				? moment(startTime)
-						.add(1, 'M')
+						.add(1, 'd')
 						.format('YYYY-MM-DDTHH:mm:ss')
 				: ''
+			const productlines = this.dataForm.productlines ? [this.dataForm.productlines] : []
+			const wsId = this.dataForm.wsId || ''
+
+			/** keep a copy of query conditions */
+			this.$set(this.queryBuffer, 'productlines', productlines)
+			this.$set(this.queryBuffer, 'wsId', wsId)
+			this.$set(this.queryBuffer, 'startTime', startTime)
+			this.$set(this.queryBuffer, 'endTime', endTime)
 
 			this.dataListLoading = true
+
+			/** fetch data */
 			this.$http({
 				url: this.$http.adornUrl('/monitoring/eqAnalysis/timeAndStatus'),
 				method: 'post',
@@ -346,15 +367,64 @@ export default {
 			}).then(({ data: res }) => {
 				if (res.code === 500) {
 					this.dataList.splice(0)
+					this.equipments = {} // 关闭 echarts 的显示
 					this.$message.error(res.msg)
 				} else {
-					this.dataList = res.data
+					/** handle actual data */
+					this.dataList = res.data 
+					
+					/** test data */
+					// this.dataList = [
+					// 	{
+					// 		eqId: 'eq-001',
+					// 		eqName: 'A1预热机',
+					// 		startTime: '2022-05-04T00:30:34',
+					// 		endTime: '2022-05-04T08:30:34',
+					// 		status: 0
+					// 	},
+					// 	{
+					// 		eqId: 'eq-001',
+					// 		eqName: 'A1预热机',
+					// 		startTime: '2022-05-04T08:30:34',
+					// 		endTime: '2022-05-04T09:30:34',
+					// 		status: 1
+					// 	},
+					// 	{
+					// 		eqId: 'eq-001',
+					// 		eqName: 'A1预热机',
+					// 		startTime: '2022-05-04T09:30:34',
+					// 		endTime: '2022-05-04T11:30:34',
+					// 		status: 2
+					// 	},
+					// 	{
+					// 		eqId: 'eq-001',
+					// 		eqName: 'A1预热机',
+					// 		startTime: '2022-05-04T11:30:34',
+					// 		endTime: '2022-05-04T13:30:34',
+					// 		status: 1
+					// 	}
+					// ]
+
+					this.equipments = this.transformDataToEquipments(this.dataList)
+					this.chartOption.setYAxis(Object.keys(this.equipments).map(eId => this.equipments[eId].name))
+					console.log('(((set x axis))): ', this.dataList[0].startTime)
+					this.chartOption.setXAxis(this.dataList[0].startTime)
+					this.chartOption.setData(this.transformEquipmentsToSeries(this.equipments))
+
+					this.$nextTick(() => {
+						this.renderChart()
+					})
 				}
 			})
 		},
 		handleProductLineChange(val) {
 			this.getWorksetionList()
 		},
+		// 渲染 echarts
+		renderChart() {
+			console.log('>>> chart configs: ', this.chartOption)
+			this.chart.setOption(this.chartOption)
+		},
 		// 每页数
 		sizeChangeHandle(val) {
 			this.pageSize = val
@@ -383,3 +453,9 @@ export default {
 	}
 }
 </script>
+
+<style scoped>
+/* .time-chart__inner {
+	transition: all 300ms ease-out;
+} */
+</style>
-- 
2.45.2


From 4f3948169356501f3aee814e623568858c4069bc Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Thu, 22 Sep 2022 15:02:38 +0800
Subject: [PATCH 13/14] =?UTF-8?q?update=20=E5=9F=BA=E6=9C=AC=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E6=97=B6=E5=BA=8F?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentTimesequence.vue      | 127 +++++++++++++++---
 1 file changed, 108 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentTimesequence.vue b/src/views/modules/monitoring/equipmentTimesequence.vue
index 69074c4..7afe0d9 100644
--- a/src/views/modules/monitoring/equipmentTimesequence.vue
+++ b/src/views/modules/monitoring/equipmentTimesequence.vue
@@ -24,6 +24,9 @@
 				<el-button @click="getDataList()">{{ $t('search') }}</el-button>
 				<!-- <el-button v-if="$hasPermission('monitoring:equipmentEffiency:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</el-form-item>
+			<el-form-item>
+				<el-button type="success" @click="addEq()">{{ '添加设备' }}</el-button>
+			</el-form-item>
 		</el-form>
 
 		<div class="time-chart" style="margin-top: 10px;">
@@ -38,6 +41,16 @@
 			<div v-show="equipmentCount === 0">请先查询数据</div>
 			<!-- <div v-show="equipmentCount === 0">{{ $t('module.basicData.visual.hints.searchFirst') }}</div> -->
 		</div>
+
+		<el-dialog :visible.sync="dialogVisible" :title="'添加设备'" width="30%">
+			<el-select v-model="eqId" style="width: 100%" placeholder="请选择设备" clearable>
+				<el-option v-for="eq in dialogEqList" :key="eq.id" :label="eq.name" :value="eq.id" />
+			</el-select>
+			<div slot="footer">
+				<el-button @click="dialogVisible = false">{{ '取消' }}</el-button>
+				<el-button type="primary" @click="dialogConfirm">{{ '确定' }}</el-button>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 
@@ -183,7 +196,7 @@ export default {
 			equipments: {},
 			state: ['正常', '停机', '故障'],
 			colors: ['#4caf50', '#ffb300', '#e53935'],
-			queryBuffer: {},
+			// queryBuffer: {},
 			// tableConfigs,
 			calcMaxHeight,
 			timeType: 'range',
@@ -199,7 +212,11 @@ export default {
 			pageIndex: 1,
 			pageSize: 10,
 			totalPage: 0,
-			dataListLoading: false
+			dataListLoading: false,
+			/** dialog */
+			dialogVisible: false,
+			eqId: null,
+			dialogEqList: []
 		}
 	},
 	components: {
@@ -217,6 +234,7 @@ export default {
 		this.getProductLineList().then(() => {
 			this.getWorksetionList()
 		})
+		this.getEqList()
 	},
 	mounted() {
 		this.$nextTick(() => {
@@ -312,6 +330,7 @@ export default {
 			console.log('created equipments --- ', equipments)
 			return equipments
 		},
+
 		// 把分组好的设备数据转换为echarts需要的series数据
 		transformEquipmentsToSeries(equipments) {
 			const seriesData = []
@@ -343,27 +362,20 @@ export default {
 						.add(1, 'd')
 						.format('YYYY-MM-DDTHH:mm:ss')
 				: ''
-			const productlines = this.dataForm.productlines ? [this.dataForm.productlines] : []
-			const wsId = this.dataForm.wsId || ''
 
-			/** keep a copy of query conditions */
-			this.$set(this.queryBuffer, 'productlines', productlines)
-			this.$set(this.queryBuffer, 'wsId', wsId)
-			this.$set(this.queryBuffer, 'startTime', startTime)
-			this.$set(this.queryBuffer, 'endTime', endTime)
-
-			this.dataListLoading = true
+			// this.dataListLoading = true
+			const condition = {
+				startTime,
+				endTime,
+				productlines: [this.dataForm.productlines],
+				wsId: this.dataForm.wsId
+			}
 
 			/** fetch data */
 			this.$http({
 				url: this.$http.adornUrl('/monitoring/eqAnalysis/timeAndStatus'),
 				method: 'post',
-				data: {
-					startTime,
-					endTime,
-					productlines: [this.dataForm.productlines],
-					wsId: this.dataForm.wsId
-				}
+				data: condition
 			}).then(({ data: res }) => {
 				if (res.code === 500) {
 					this.dataList.splice(0)
@@ -371,8 +383,8 @@ export default {
 					this.$message.error(res.msg)
 				} else {
 					/** handle actual data */
-					this.dataList = res.data 
-					
+					this.dataList = res.data
+
 					/** test data */
 					// this.dataList = [
 					// 	{
@@ -417,14 +429,91 @@ export default {
 				}
 			})
 		},
+
 		handleProductLineChange(val) {
 			this.getWorksetionList()
 		},
+
 		// 渲染 echarts
 		renderChart() {
 			console.log('>>> chart configs: ', this.chartOption)
 			this.chart.setOption(this.chartOption)
 		},
+
+		// 获取对话框里的设备列表
+		getEqList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipment/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: 1,
+					limit: 99999
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dialogEqList = data.data.list
+				} else {
+					this.dialogEqList.splice(0)
+				}
+			})
+		},
+
+		// 添加设备
+		addEq() {
+			if (this.equipmentCount) {
+				this.dialogVisible = true
+			} else {
+				this.$message.warning('请先查询数据')
+			}
+		},
+
+		// 确认添加设备
+		dialogConfirm() {
+			let startTime = this.rawTime
+				? moment(this.rawTime)
+						.set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
+						.format('YYYY-MM-DDTHH:mm:ss')
+				: ''
+			let endTime = startTime
+				? moment(startTime)
+						.add(1, 'd')
+						.format('YYYY-MM-DDTHH:mm:ss')
+				: ''
+
+			const condition = {
+				startTime,
+				endTime,
+				productlines: [this.dataForm.productlines],
+				wsId: this.dataForm.wsId,
+				eqId: this.eqId
+			}
+
+			/** fetch data */
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/eqAnalysis/timeAndStatus'),
+				method: 'post',
+				data: condition
+			}).then(({ data: res }) => {
+				if (res.code === 500) {
+					this.$message.error(res.msg)
+				} else {
+					/** handle new equipment */
+					const newEqStatusList = res.data
+					console.log('添加设备', res)
+					const newEq = this.transformDataToEquipments(newEqStatusList)
+					this.$set(this.equipments, Object.keys(newEq)[0], newEq[Object.keys(newEq)[0]])
+					this.chartOption.setYAxis(Object.keys(this.equipments).map(item => this.equipments[item].name))
+					this.chartOption.setData(this.transformEquipmentsToSeries(this.equipments))
+
+					this.$message.success('新设备数据获取成功')
+					this.$nextTick(() => {
+						this.dialogVisible = false
+						this.renderChart()
+					})
+				}
+			})
+		},
+
 		// 每页数
 		sizeChangeHandle(val) {
 			this.pageSize = val
-- 
2.45.2


From 31834662c9b53decf8c78b95ebb573670f7e6584 Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Fri, 23 Sep 2022 15:02:13 +0800
Subject: [PATCH 14/14] update icon

---
 public/favicon.ico                            | Bin 4286 -> 1673 bytes
 src/assets/img/logo.png                       | Bin 0 -> 1673 bytes
 src/assets/img/logo@2x.png                    | Bin 0 -> 3113 bytes
 src/assets/img/logo@4x.png                    | Bin 0 -> 7069 bytes
 .../modules/monitoring/equipmentException.vue |   4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/img/logo.png
 create mode 100644 src/assets/img/logo@2x.png
 create mode 100644 src/assets/img/logo@4x.png

diff --git a/public/favicon.ico b/public/favicon.ico
index 2bd581cea17fd10bf80730efcf0563e634494a91..37a3d39dd2cdb28beb1d36e90fcfbf95533fcacd 100644
GIT binary patch
literal 1673
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
TT%)Lb00000NkvXXu0mjfTt5Xb

literal 4286
zcmd6rTTc@~6vxLWUw!hKM?Z!i0Bu2TsS-6cTx^U+gVA^?F$OhFG%>~~61Dn5)V9zS
zY^l%`s1Q@d(qdYKrfW;@ug1sYITNQ@=mITfcWrYzvpZ+c?>{qVXLrijKKwQ{G5Ter
z2N*lZ7(0Z9r`TaMI?q4Yw%y0<X*Q#U(0-wTMn<uTVOHwEV~0k(ZTn$zH#<lJY0;Z4
zc&LHcbK=;5lGwiu;EH)Mk}Wj+7iIT*3p`wW06ib9|E$O2?SMdX3gm(e>3kaEKVvYz
zHV4wmIE+Mwq08G|!|3%{xo^2#hCsp(XZ^i3KK10uu`v^8RVo!wv-R8>^!s{LW1o<^
zz!iH3q@h?Uf^+F5P`rA$!spHMXbm@+O~UIXCtUh?0a`pqca1j~x&fI&hR0b<Edb4p
zh`&>LH$23(i+)GtZ*XhYj?5!<U9XINZmJ(rxfIv1l8M9ViS8X^*!+F4QQYAErE&?L
ze;I++2FFgxr@9Sufbxg>6T=)jE_JGE==8Sn93wx{U=Lka_1hZ1p5uY(i%=*PxQ5vu
zA=R;*_%8AGY%vSuUr*ddeCWOub2=P(vMK)k1qW{{l=5&jczIJ>BaGdAgR9e=lSfXU
z?+oYAoac%;o^wO<w>4vvHtXa`&Z2P$uFgRFcq=T+QLgD(<f*1?F*dJoJrMKoX+6yA
zw5Ex6txH;;XuO36S{vHN%)0TZf9|-e%D*x*pevjB=L5DX-xYhSJD)T}|K^>XmvQ`C
zbl2eg`l31p_riB{=hONsaxjrifJN%iRm08DwJM)<*ztL(^}VNzPiru7={>;{cQ^cw
zpp3Pbx^?mtJpTNMKOgsUz4989@$cV8?>`LNf8jjveJGZ??>~vTWe=>|{u^_yy8liy
Twto=+A|O-h(XuXhX=MKaRZyEC

diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..37a3d39dd2cdb28beb1d36e90fcfbf95533fcacd
GIT binary patch
literal 1673
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
TT%)Lb00000NkvXXu0mjfTt5Xb

literal 0
HcmV?d00001

diff --git a/src/assets/img/logo@2x.png b/src/assets/img/logo@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ce238fa3ba019c18e2c7b2e0335c7f5e5c7c1d3
GIT binary patch
literal 3113
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
D>-@VD

literal 0
HcmV?d00001

diff --git a/src/assets/img/logo@4x.png b/src/assets/img/logo@4x.png
new file mode 100644
index 0000000000000000000000000000000000000000..36641d430bff8669003a92b8e0584d62ea161ea4
GIT binary patch
literal 7069
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
Hu0mjf4=7W`

literal 0
HcmV?d00001

diff --git a/src/views/modules/monitoring/equipmentException.vue b/src/views/modules/monitoring/equipmentException.vue
index c05bb1f..e765f89 100644
--- a/src/views/modules/monitoring/equipmentException.vue
+++ b/src/views/modules/monitoring/equipmentException.vue
@@ -48,8 +48,8 @@ const tableConfigs = [
 		type: 'index',
 		name: i18n.t('index')
 	},
-	{ prop: 'time', name: '时间', filter: timeFilter },
-	{ prop: 'pdlName', name: '产线名称' },
+	// { prop: 'time', name: '时间', filter: timeFilter },
+	{ prop: 'pdName', name: '产线名称' },
 	{ prop: 'wsName', name: '工序' },
 	{ prop: 'eqName', name: '设备' },
 	{ prop: 'mtbf', name: '平均故障间隔时间[MTBF] (h)', width: 220 },
-- 
2.45.2