From f9d40b3790ca37f505602cbd3342281e266bb5c3 Mon Sep 17 00:00:00 2001
From: Fanzink <460995166@qq.com>
Date: Fri, 3 Feb 2023 16:44:47 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=94=B9bug'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                            | Bin 1673 -> 24785 bytes
 public/favicon2.ico                           | Bin 0 -> 1673 bytes
 .../base-dialog/addOrUpdate/index.vue         |  19 ++++-
 .../base-table/components/table-head.vue      |  39 ++++++++-
 src/components/base-table/index.vue           |   4 +-
 src/i18n/en.js                                |  20 +++--
 src/i18n/zh-CN.js                             |  21 +++--
 src/utils/filters.js                          |   4 +-
 src/views/main-content.vue                    |  12 ++-
 src/views/main-navbar.vue                     |   5 +-
 src/views/main-sidebar.vue                    |   2 +-
 src/views/modules/monitoring/equipment.vue    |   2 +-
 .../monitoring/equipmentCurrentState.vue      |  48 +++++++----
 .../monitoring/equipmentEfficiency.vue        |  10 ++-
 .../monitoring/equipmentEfficiencyGraph.vue   |  31 +++++---
 .../modules/monitoring/equipmentGroup.vue     |   2 +-
 .../equipmentHistoricalParameters.vue         |  51 ++++++++----
 .../monitoring/equipmentTimesequence.vue      |   6 +-
 .../modules/monitoring/equipmentType.vue      |  22 ++---
 src/views/modules/monitoring/product.vue      |   4 +-
 .../monitoring/qualityInspectionBoxBtn.vue    |  26 ++++--
 .../monitoring/qualityInspectionRecord.vue    |  75 +++++++++++++-----
 .../modules/monitoring/realtimeEquipment.vue  |   4 +-
 .../monitoring/realtimeProductLine.vue        |   6 +-
 .../monitoring/realtimeQualityInspection.vue  |   4 +-
 .../modules/monitoring/workShopSection.vue    |   2 +-
 .../monitoring/workshopSectionDialog.vue      |   3 +-
 src/views/modules/sys/dict-type.vue           |   4 +-
 src/views/modules/sys/user-add-or-update.vue  |   3 +-
 src/views/modules/sys/user.vue                |   4 +-
 30 files changed, 311 insertions(+), 122 deletions(-)
 create mode 100644 public/favicon2.ico

diff --git a/public/favicon.ico b/public/favicon.ico
index 37a3d39dd2cdb28beb1d36e90fcfbf95533fcacd..774214b95515335f9051df66384e99dbbd41e8c9 100644
GIT binary patch
literal 24785
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
ayN4|~PO7Nj&}#rq;V8?iJujCv4gMef?6HFY

literal 1673
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
TT%)Lb00000NkvXXu0mjfTt5Xb

diff --git a/public/favicon2.ico b/public/favicon2.ico
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/components/base-dialog/addOrUpdate/index.vue b/src/components/base-dialog/addOrUpdate/index.vue
index d061f46..605d855 100644
--- a/src/components/base-dialog/addOrUpdate/index.vue
+++ b/src/components/base-dialog/addOrUpdate/index.vue
@@ -32,7 +32,8 @@
 								:placeholder="getPlaceholder(n, c)"
 								v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]"
 								clearable
-								:disabled="isDetail"
+								:disabled="isDetail || configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].isDisabled"
+								
 								@change="emitSelectChange(configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name, $event)">
 								<el-option v-for="opt in configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].options" :key="opt.label + Math.random()" :label="opt.label" :value="opt.value" />
 							</el-select>
@@ -49,6 +50,7 @@
 								v-if="getType(n, c) === 'date'"
 								v-bind="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].props"
 								:placeholder="getPlaceholder(n, c)"
+								value-format='yyyy-MM-ddTHH:mm:ss'
 								v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]"
 								:disabled="isDetail" />
 						</el-form-item>
@@ -97,6 +99,7 @@
 						color: btnColor[operate.name]
 					}"
 					@click="handleClick(operate)"
+					:disabled='isDisabled'
 					>{{ btnName[operate.name] }}</el-button
 				>
 			</template>
@@ -120,7 +123,7 @@ const title = {
 
 // 或者也可以改造成自定义颜色：
 const btnType = {
-	add :'#0b58ff',
+	add: '#0b58ff',
 	save: '#000',
 	update: '#0b58ff',
 	reset: ''
@@ -179,6 +182,8 @@ export default {
 	// },
 	data() {
 		return {
+			// 按钮防重复点击
+			isDisabled: false,
 			COLUMN_PER_ROW,
 			title,
 			/** 按钮相关属性 */
@@ -456,6 +461,7 @@ export default {
 		},
 
 		emitSelectChange(name, id) {
+			// console.log(id)
 			const currentField = this.configs.fields.find((item) => item.name === name)
 			if (currentField.relatedField) {
 				this.dataForm[currentField.relatedField] = null
@@ -476,7 +482,16 @@ export default {
 			/** 操作 */
 			switch (btn.name) {
 				case 'save':
+					this.isDisabled = true
+					setTimeout(() => {
+						this.isDisabled = false
+					}, 3000)
 				case 'update':
+					this.isDisabled = true
+					setTimeout(() => {
+						this.isDisabled = false
+					}, 3000)
+
 					/** 需要验证表单的操作 */
 					this.$refs['dataForm'].validate((valid) => {
 						if (valid) {
diff --git a/src/components/base-table/components/table-head.vue b/src/components/base-table/components/table-head.vue
index 042d1c4..c51360d 100644
--- a/src/components/base-table/components/table-head.vue
+++ b/src/components/base-table/components/table-head.vue
@@ -1,8 +1,18 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: fzq
+ * @Date: 2022-11-25 09:51:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-02-03 14:30:23
+-->
 <template>
+<!-- 数字代表多级表头最小列宽 -->
+<!-- :width="opt.width || null" -->
 	<el-table-column
 		:label="opt.label ? opt.label : opt.name"
 		:prop="opt.prop || null"
-		:width="opt.width || null"
+		:width="flexColumnWidth(opt.prop || null)"
 		:min-width="opt.minWidth || null"
 		:fixed="opt.fixed || null"
 		:show-overflow-tooltip="opt.showOverflowTooltip || false"
@@ -35,6 +45,33 @@ export default {
 			type: Object,
 			default: () => ({})
 		}
+	},
+	methods: {
+		// 自定义表头列宽
+        flexColumnWidth(str) {
+          let flexWidth = 0
+          for (const char of str) {
+            if ((char >= 'A' && char <= 'Z') || (char >= 'a' && char <= 'z')) {
+              // 如果是英文字符，为字符分配8个单位宽度
+              flexWidth += 8
+            } else if (char >= '\u4e00' && char <= '\u9fa5') {
+              // 如果是中文字符，为字符分配20个单位宽度
+              flexWidth += 20
+            } else {
+              // 其他种类字符，为字符分配5个单位宽度
+              flexWidth += 5
+            }
+          }
+        //   if (flexWidth < 50) {
+        //     // 设置最小宽度
+        //     flexWidth = 50
+        //   }
+          if (flexWidth > 250) {
+            // 设置最大宽度
+            flexWidth = 250
+          }
+          return flexWidth + 'px'
+        },
 	}
 }
 </script>
diff --git a/src/components/base-table/index.vue b/src/components/base-table/index.vue
index a9b666a..2114896 100644
--- a/src/components/base-table/index.vue
+++ b/src/components/base-table/index.vue
@@ -109,7 +109,9 @@ export default {
 		maxHeight: {
 			type: Number,
 			// default: window.innerHeight - 325
-			default: 500
+			// el-table高度
+			default: window.innerHeight - 100
+			// default: 500
 		},
 		spanMethod: {
 			type: Function,
diff --git a/src/i18n/en.js b/src/i18n/en.js
index d06475d..11c24c9 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -26,9 +26,9 @@ t.routes['设备'] = 'Equipment'
 t.routes['字典管理'] = 'Dict Management'
 t.routes['PLC信息'] = 'PLC'
 t.routes['设备与PLC关联配置'] = 'Relations between plc & equipments'
-t.routes['设备生产实时数据'] = 'Realtime Equipment Data'
-t.routes['产线生产实时数据'] = 'Realtime Productline Data'
-t.routes['质量检查实时数据'] = 'Realtime Quality Inspection Data'
+t.routes['近24小时设备生产数据'] = 'Realtime Equipment Data(24h)'
+t.routes['近24小时产线生产数据'] = 'Realtime Productline Data(24h)'
+t.routes['近24小时质量检查数据'] = 'Realtime Quality Inspection Data(24h)'
 t.routes['报表总览'] = 'Report Overview'
 t.routes['报表分类'] = 'Report Types'
 t.routes['报表详情'] = 'Report Detail'
@@ -152,6 +152,9 @@ t.ti = 'Time'
 t.plcCode = 'PLC Code'
 t.equName = 'Equipment Name'
 t.equCode = 'Equipment Code'
+t.yAxisTime = 'Time (h)'
+t.yAxisRate = 'Percentage (%)'
+t.hourTime = '(h)'
 
 
 t.graph = 'Graph'
@@ -182,6 +185,8 @@ t.timetype = 'Time Type'
 t.reftimerange = 'By time range'
 t.refdate = 'By date'
 t.hour = 'Hour(s)'
+t.yes = 'yes'
+t.no = 'no'
 
 t.errors = {}
 t.errors.nosection = 'There is no sections on this product line.'
@@ -266,15 +271,15 @@ t.inspect.typeCount = 'Data of inspection types'
 
 
 t.realtime = {}
-t.realtime.eq = 'Realtime data of equipments'
-t.realtime.pl = 'Realtime data of product lines'
-t.realtime.inspect = 'Realtime data of quality inspections'
+t.realtime.eq = 'Realtime data of equipments(24h)'
+t.realtime.pl = 'Realtime data of product lines(24h)'
+t.realtime.inspect = 'Realtime data of quality inspections(24h)'
 t.realtime.in = 'in'
 t.realtime.out = 'out'
 t.realtime.data = 'scrap'
 t.realtime.num = 'scrap quantity'
 t.realtime.rate = 'scrap rate'
-t.realtime.total = 'total production'
+t.realtime.total = 'Equipment total production'
 t.realtime.goodrate = 'Passed Rate'
 t.realtime.runState = 'running state'
 t.realtime.state = 'status'
@@ -387,6 +392,7 @@ t.pl.tvalue = 'TT Value'
 t.pl.factoryHints = 'Please select a factory'
 t.pl.process = 'Working procedure'
 t.pl.add = 'Add Euipment'
+t.pl.add2 = 'Add Comparison Euipment'
 t.pl.queryFirst = 'Please Query First'
 t.pl.choose = 'Please select equipment'
 t.pl.confirm = 'Confirm'
diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index e95d2f3..58f13ff 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -27,9 +27,9 @@ t.routes['设备'] = '设备'
 t.routes['字典管理'] = '字典管理'
 t.routes['PLC信息'] = 'PLC信息'
 t.routes['设备与PLC关联配置'] = '设备与PLC关联配置'  // ?
-t.routes['设备生产实时数据'] = '设备生产实时数据'
-t.routes['产线生产实时数据'] = '产线生产实时数据'
-t.routes['质量检查实时数据'] = '质量检查实时数据'
+t.routes['近24小时设备生产数据'] = '近24小时设备生产数据'
+t.routes['近24小时产线生产数据'] = '近24小时产线生产数据'
+t.routes['近24小时质量检查数据'] = '近24小时质量检查数据'
 t.routes['报表总览'] = '报表总览'
 t.routes['报表分类'] = '报表分类'
 t.routes['报表详情'] = '报表详情'
@@ -153,6 +153,9 @@ t.ti = '时间'
 t.plcCode = 'PLC 编码'
 t.equName = '设备名称'
 t.equCode = '设备编码'
+t.yAxisTime = '时间 (h)'
+t.yAxisRate = '百分比 (%)'
+t.hourTime = '(时)'
 
 t.graph = '图形'
 t.category = '分类'
@@ -182,6 +185,9 @@ t.timetype = '时间类型'
 t.reftimerange = '按时间段'
 t.refdate = '按日期'
 t.hour = '小时'
+t.yes = '是'
+t.no = '否'
+
 
 t.errors = {}
 t.errors.nosection = '该产线没有工段'
@@ -266,15 +272,15 @@ t.inspect.typeCount = '检测类型统计数据'
 
 
 t.realtime = {}
-t.realtime.eq = '设备生产实时数据'
-t.realtime.pl = '产线生产实时数据'
-t.realtime.inspect = '质量检查实时数据'
+t.realtime.eq = '近24小时产线生产数据'
+t.realtime.pl = '近24小时产线生产数据'
+t.realtime.inspect = '近24小时质量检查数据'
 t.realtime.in = '进数据'
 t.realtime.out = '出数据'
 t.realtime.data = '报废数据'
 t.realtime.num = '报废数量'
 t.realtime.rate = '报废比例'
-t.realtime.total = '总产量'
+t.realtime.total = '设备总产量'
 t.realtime.goodrate = '良品率'
 t.realtime.runState = '是否运行'
 t.realtime.state = '状态'
@@ -386,6 +392,7 @@ t.pl.tvalue = '产线TT值(每小时下片数量)'
 t.pl.factoryHints = '请选择所属工厂'
 t.pl.process = '工序'
 t.pl.add = '添加设备'
+t.pl.add2 = '添加对比设备'
 t.pl.queryFirst = '请先查询数据'
 t.pl.success = '新设备数据获取成功'
 t.pl.choose = '请选择设备'
diff --git a/src/utils/filters.js b/src/utils/filters.js
index 1ee971d..67efcab 100644
--- a/src/utils/filters.js
+++ b/src/utils/filters.js
@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-11-25 09:51:46
  * @LastEditors: fzq
- * @LastEditTime: 2023-01-11 20:52:35
+ * @LastEditTime: 2023-02-01 09:39:37
  */
 /** filters */
 import moment from 'moment'
@@ -16,7 +16,7 @@ export const dictFilter = dictTypeId => {
 }
 
 export const timeFilter = (val) => {
-	return moment(val).format('YYYY-MM-DD HH:mm:ss')
+	return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '-'
 }
 
 export const pick = (obj, paths) => {
diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index d4910bf..9cb1972 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -46,7 +46,7 @@ export default {
 	},
 	mounted() {
 		this.$nextTick(() => {
-			// 通过加上ref，再删除数组第一个元素来把空元素删除，不知道为何会出现这个元素
+			// 通过加上ref，再删除数组第一个元素来把空元素删除，不知为何会出现这个元素
 			this.$store.state.contentTabs.splice(0, 1)
 			// 加个判断防止home页面报$children的错
 			if (this.$route.meta.hiddenSiderbar !== true) {
@@ -56,6 +56,16 @@ export default {
 			// console.log('11',this.$refs.tabs.$children[0].$refs.tabs[0])
 			// console.log('22',this.$store.state.contentTabs)
 		})
+
+		// setTimeout(function() {
+		// 	// 执行代码块
+		// 	// 不加.bind(this) 因为使用的是function() 这样函数就不会从你的类组件继承this，所以this是undefined
+		// 	this.$store.state.contentTabs.splice(0, 1)
+		// 	// 加个判断防止home页面报$children的错
+		// 	if (this.$route.meta.hiddenSiderbar !== true) {
+		// 		this.$refs.tabs.$children[0].$refs.tabs[0].style.display = 'none'
+		// 	}
+		// }.bind(this),0)
 	},
 	methods: {
 		// tabs, 是否通过iframe展示
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index e463bc2..a7c5546 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -217,7 +217,7 @@ import moment from 'moment'
 // let logoutInterval = null
 // const timeInterval = null
 export default {
-	inject: ['refresh'],
+	// inject: ['refresh'],
 	data() {
 		return {
 			// logoutTime: 1800000,
@@ -307,6 +307,9 @@ export default {
 		getLang() {
 			return Cookies.get('language')
 		},
+		refresh() {
+			this.$router.go(0)
+		},
 		// 切换语言环境
 		handleCommand(command) {
 			// 切换语言选项时，可能需要手动刷新页面
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index 0612c79..40dd720 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -29,7 +29,7 @@ export default {
 	mounted() {
 		// this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList']
 		this.$nextTick(() => {
-			console.log(`window.SITE_CONFIG['menuList']`, window.SITE_CONFIG['menuList'])
+			// console.log(`window.SITE_CONFIG['menuList']`, window.SITE_CONFIG['menuList'])
 			this.unhiddenMenuList = this.getUnhiddenRoutesListFrom(window.SITE_CONFIG['menuList'])
 			/** 本地保存一份，store保存一份，感觉 store 都不需要保存... */
 			this.$store.state.sidebarMenuList = this.unhiddenMenuList
diff --git a/src/views/modules/monitoring/equipment.vue b/src/views/modules/monitoring/equipment.vue
index c474b40..d5b9be4 100644
--- a/src/views/modules/monitoring/equipment.vue
+++ b/src/views/modules/monitoring/equipment.vue
@@ -411,7 +411,7 @@ export default {
 				if (data && data.code === 0) {
 					this.dataList = data.data.list
 					// this.dataList = new Array(20).fill('1')
-					// console.log('data list', this.dataList)
+					console.log('data list', this.dataList)
 					this.totalPage = data.data.total
 				} else {
 					this.dataList = []
diff --git a/src/views/modules/monitoring/equipmentCurrentState.vue b/src/views/modules/monitoring/equipmentCurrentState.vue
index 6b31b4b..e0dfe88 100644
--- a/src/views/modules/monitoring/equipmentCurrentState.vue
+++ b/src/views/modules/monitoring/equipmentCurrentState.vue
@@ -23,7 +23,14 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table
+			:page="pageIndex"
+			:size="pageSize"
+			:data="dataList"
+			:table-head-configs="tableConfigs"
+			:max-height="calcMaxHeight(8)"
+			@operate-event="handleOperations"
+			@refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -31,8 +38,7 @@
 			:page-sizes="[10, 20, 50, 100]"
 			:page-size="pageSize"
 			:total="totalPage"
-			layout="total, sizes, prev, pager, next, jumper"
-		>
+			layout="total, sizes, prev, pager, next, jumper">
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
 		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
@@ -56,27 +62,41 @@ const tableConfigs = [
 	},
 	{ prop: 'equipmentName', name: i18n.t('realtime.eqName') },
 	{ prop: 'equipmentCode', name: i18n.t('realtime.eqCode') },
-	{ prop: 'inputNum', name: i18n.t('realtime.input') },
-	{ prop: 'outputNum', name: i18n.t('realtime.output') },
+	{
+		prop: 'inputNum',
+		name: i18n.t('realtime.input'),
+		filter: (val) => {
+			if (val !== null && val !== undefined) return val ? val : '-'
+			else return '-'
+		}
+	},
+	{
+		prop: 'outputNum',
+		name: i18n.t('realtime.output'),
+		filter: (val) => {
+			if (val !== null && val !== undefined) return val ? val : '-'
+			else return '-'
+		}
+	},
 	{
 		prop: 'run',
 		name: i18n.t('realtime.runState'),
-		filter: val => {
-			if (val !== null && val !== undefined) return val ? '是' : '否'
+		filter: (val) => {
+			if (val !== null && val !== undefined) return val ? i18n.t('yes') : i18n.t('no')
 		}
 	},
 	{
 		prop: 'status',
 		name: i18n.t('realtime.state'),
-		filter: val => {
-			if (val !== null && val !== undefined) return ['正常', '计划停机', '故障'][+val]
+		filter: (val) => {
+			if (val !== null && val !== undefined) return [i18n.t('normal'), i18n.t('planStop'), i18n.t('malfunction')][+val]
 		}
 	},
 	{
 		prop: 'error',
 		name: i18n.t('realtime.hasFault'),
-		filter: val => {
-			if (val !== null && val !== undefined) return val ? '是' : '否'
+		filter: (val) => {
+			if (val !== null && val !== undefined) return val ? i18n.t('yes') : i18n.t('no')
 		}
 	},
 	{ prop: 'quantityTime', name: i18n.t('realtime.productionSnapshotTime'), filter: timeFilter },
@@ -137,8 +157,8 @@ export default {
 		// destroy dialog
 		handleDestroyDialog() {
 			setTimeout(() => {
-				this.addOrUpdateVisible= false
-			}, /** after dialog animated */ 200);
+				this.addOrUpdateVisible = false
+			}, /** after dialog animated */ 200)
 		},
 		// 设备
 		getEqList() {
@@ -231,7 +251,7 @@ export default {
 		deleteHandle(id) {
 			var ids = id
 				? [id]
-				: this.dataListSelections.map(item => {
+				: 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'), {
diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue
index 188cc18..70df6b5 100644
--- a/src/views/modules/monitoring/equipmentEfficiency.vue
+++ b/src/views/modules/monitoring/equipmentEfficiency.vue
@@ -8,7 +8,7 @@
 			</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="$t('factory.title')" clearable>
+				<el-select v-model="dataForm.ftId" :placeholder="$t('factory.title')" @change="handleftIdChange" clearable>
 					<el-option v-for="factory in factoryList" :key="factory.id" :value="factory.id" :label="factory.name" />
 				</el-select>
 			</el-form-item>
@@ -124,8 +124,8 @@ const tableConfigs = [
 	{
 		name: i18n.t('eq.speedlost'),
 		children: [
-			{ prop: 'realYield', name: i18n.t('eq.realyield'), width: 120, filter: val => `${val} `+i18n.t('hour') },
-			{ prop: 'designYield', name: i18n.t('eq.designyield'), width: 120, filter: val => `${val} `+i18n.t('hour') },
+			{ prop: 'realYield', name: i18n.t('eq.realyield'), width: 120, filter: val => `${val} `+'/'+i18n.t('hour') },
+			{ prop: 'designYield', name: i18n.t('eq.designyield'), width: 120, filter: val => `${val} `+'/'+i18n.t('hour') },
 			{ prop: 'peEfficiency', name: i18n.t('eq.speedefficiency'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }
 		]
 	},
@@ -242,7 +242,9 @@ export default {
 				}
 			})
 		},
-
+        handleftIdChange() {
+			this.getProductLineList()
+		},
 		// 时间类型预处理
 		getTimeRange() {
 			let startTime
diff --git a/src/views/modules/monitoring/equipmentEfficiencyGraph.vue b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue
index 08b6e37..d74f640 100644
--- a/src/views/modules/monitoring/equipmentEfficiencyGraph.vue
+++ b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue
@@ -2,15 +2,15 @@
 /*
 * @Author: lb
 * @Date: 2022-07-24 13:30:00
-* @LastEditTime: 2022-07-28 09:30:00
-* @LastEditors: lb
+ * @LastEditTime: 2023-02-02 15:02:52
+ * @LastEditors: fzq
 * @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">
+			<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>
@@ -21,12 +21,12 @@
 				<el-radio-button :label="$t('eq.time')" />
 			</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-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 id="trend-graph" class="real-graph" style="width: 100%; height: 500px" />
 	</div>
 </template>
 
@@ -131,6 +131,7 @@ export default {
 			this.config.setTitle(this.injectData.equipmentName + i18n.t('eq.timetrend'))
 			await this.getList()
 			this.setLegend()
+			// console.log('this.dataType',this.dataType);
 		},
 
 		init(data) {
@@ -181,14 +182,14 @@ export default {
 		getList() {
 			const params = this.makeQuerys()
 			// 发起请求
-			return this.getOEE(params).then(datalist => {
+			return this.getOEE(params).then((datalist) => {
 				console.log('getOEE res:', datalist)
 				this.timeList.splice(0)
 				this.rateList.splice(0)
 				this.xAxis.splice(0)
 				if (datalist.length) {
 					// 分流
-					datalist.map(item => {
+					datalist.map((item) => {
 						const time = moment(item.time)
 						if (this.searchType === i18n.t('eq.monthgap')) {
 							this.xAxis.push(`${time.year()}${i18n.t('eq.year')}${time.month() + 1}${i18n.t('eq.month')}`)
@@ -241,7 +242,7 @@ export default {
 				const workTimeList = []
 				const stopTimeList = []
 				const downTimeList = []
-				this.timeList.map(item => {
+				this.timeList.map((item) => {
 					workTimeList.push(item.workTime)
 					stopTimeList.push(item.stopTime)
 					downTimeList.push(item.downTime)
@@ -260,7 +261,7 @@ export default {
 				const timeEfficiencyList = []
 				const oeeList = []
 				const teepList = []
-				this.rateList.map(item => {
+				this.rateList.map((item) => {
 					workRateList.push(item.workRate)
 					stopRateList.push(item.stopRate)
 					downRateList.push(item.downRate)
@@ -283,6 +284,18 @@ export default {
 
 		// 重新绘制图形
 		renderGraph() {
+			if (this.dataType === i18n.t('eq.time')) {
+				this.config.yAxis = {
+					type: 'value',
+					name: i18n.t('yAxisTime')
+				}
+			} else {
+				this.config.yAxis = {
+					type: 'value',
+					name: i18n.t('yAxisRate')
+				}
+			}
+			console.log('this.dataType', this.dataType)
 			console.log('latest config: ', JSON.stringify(this.config))
 			this.$nextTick(() => {
 				// this.chart.setOption(this.config)
diff --git a/src/views/modules/monitoring/equipmentGroup.vue b/src/views/modules/monitoring/equipmentGroup.vue
index 16f92a3..8d8e496 100644
--- a/src/views/modules/monitoring/equipmentGroup.vue
+++ b/src/views/modules/monitoring/equipmentGroup.vue
@@ -70,7 +70,7 @@ const tableConfigs = [
 const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/equipmentGroup',
-	fields: [{ name: 'name', required: true, label: i18n.t('eq.groupname') }, { name: 'code', required: true, label: i18n.t('eq.groupcode') }, 'remark'],
+	fields: [{ name: 'name', required: true, label: i18n.t('eq.groupname') }, { name: 'code', required: true, label: i18n.t('eq.groupcode'),api: '/monitoring/equipmentGroupAlarm/getCode' }, 'remark'],
 	operations: [
 		{ name: 'cancel', showAlways: true },
 		{ name: 'save', url: '/monitoring/equipmentGroup', permission: 'monitoring:equipmentgroup:save', showOnEdit: false },
diff --git a/src/views/modules/monitoring/equipmentHistoricalParameters.vue b/src/views/modules/monitoring/equipmentHistoricalParameters.vue
index 5ed69fe..dce0dab 100644
--- a/src/views/modules/monitoring/equipmentHistoricalParameters.vue
+++ b/src/views/modules/monitoring/equipmentHistoricalParameters.vue
@@ -1,16 +1,27 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true"  class="blueTip" size="small">
-			<el-form-item :label="$t('eqId')">
-				<strong>{{ $route.params.id }}</strong></el-form-item
-			>
+		<el-form :inline="true" class="blueTip" size="small">
+			<!-- <el-form-item>
+				{{ $t('eq.plcname') }}
+			</el-form-item>
+			<el-form-item>
+				<el-select v-model="dataForm.lineId" :placeholder="$t('eq.plcname')" clearable>
+					<el-option v-for="line in lineList" :key="line.code" :value="line.id" :label="line.name" />
+				</el-select>
+			</el-form-item> -->
+			<!-- <el-form-item :label="$t('eqId')">
+				<strong>{{ $route.params.id }}</strong>
+			</el-form-item> -->
+			<el-form-item :label="$t('equName')">
+				<strong>{{ equipmentName }}</strong>
+			</el-form-item>
+			<el-form-item :label="$t('equCode')">
+				<strong>{{ equipmentCode }}</strong>
+			</el-form-item>
 		</el-form>
 
 		<!-- <base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" /> -->
-		<base-table 
-			:data="dataList" 
-			:table-head-configs="tableConfigs" 
-			:max-height="calcMaxHeight(8)" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 	</div>
 </template>
 
@@ -21,11 +32,14 @@ import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import i18n from '@/i18n'
 import BaseTable from '@/components/base-table'
 import { pick } from 'lodash/object'
+import equipmentVue from './equipment.vue'
 
 export default {
 	data() {
 		return {
 			calcMaxHeight,
+			equipmentName: null,
+			equipmentCode: null,
 			tableConfigs: [],
 			dataList: [],
 			dataListLoading: false,
@@ -42,12 +56,15 @@ export default {
 	mouted() {
 		this.getDataList()
 	},
+	created(){
+		// console.log('params',this.$route.params)
+	},
 	methods: {
 		// destroy dialog
 		handleDestroyDialog() {
 			setTimeout(() => {
-				this.addOrUpdateVisible= false
-			}, /** after dialog animated */ 200);
+				this.addOrUpdateVisible = false
+			}, /** after dialog animated */ 200)
 		},
 		// 获取数据列表
 		getDataList() {
@@ -56,6 +73,7 @@ export default {
 				url: this.$http.adornUrl(`/monitoring/equipmentValueMonitor/runLog/${this.$route.params.id}`),
 				method: 'get'
 			}).then(({ data: res }) => {
+				console.log('res',res)
 				if (
 					res &&
 					res.code === 0 &&
@@ -66,6 +84,9 @@ export default {
 					res.data[0].data &&
 					res.data[0].data.length > 0
 				) {
+					this.equipmentName = res.data[0].data[0].equName
+					this.equipmentCode = res.data[0].data[0].equCode
+					console.log(this.equipmentName)
 					this.setTableProps(res.data[0].nameData)
 					this.setTableData(res.data[0].data)
 				} else {
@@ -82,19 +103,19 @@ export default {
 				},
 				{ prop: 'time', name: this.$t('ti'), filter: timeFilter },
 				{ prop: 'plcCode', name: this.$t('plcCode') },
-				{ prop: 'equName', name: this.$t('equName') },
-				{ prop: 'equCode', name: this.$t('equCode') },
+				// { prop: 'equName', name: this.$t('equName') },
+				// { prop: 'equCode', name: this.$t('equCode') },
 				// ...['数值1', '数值2', '数值3'].map(name => {
 				// 	return { prop: name, name }
 				// })
-				...Array.from(new Set(nameData.map(item => item.name))).map(name => ({ prop: name, name }))
+				...Array.from(new Set(nameData.map((item) => item.name))).map((name) => ({ prop: name, name }))
 			]
 		},
 		setTableData(data) {
-			this.dataList = data.map(item => {
+			this.dataList = data.map((item) => {
 				const rowItem = pick(item, ['time', 'plcCode', 'equName', 'equCode'])
 				if (item.data && item.data.length > 0) {
-					item.data.forEach(param => {
+					item.data.forEach((param) => {
 						rowItem[param.dynamicName] = param.dynamicValue
 					})
 				}
diff --git a/src/views/modules/monitoring/equipmentTimesequence.vue b/src/views/modules/monitoring/equipmentTimesequence.vue
index f258597..ed44d5b 100644
--- a/src/views/modules/monitoring/equipmentTimesequence.vue
+++ b/src/views/modules/monitoring/equipmentTimesequence.vue
@@ -35,7 +35,7 @@
 				<!-- <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()">{{ $t('pl.add') }}</el-button>
+				<el-button type="success" @click="addEq()">{{ $t('pl.add2') }}</el-button>
 			</el-form-item>
 		</el-form>
 
@@ -489,8 +489,8 @@ export default {
 			const condition = {
 				startTime,
 				endTime,
-				productlines: [this.dataForm.productlines],
-				wsId: this.dataForm.wsId,
+				// productlines: [this.dataForm.productlines],
+				// wsId: this.dataForm.wsId,
 				eqId: this.eqId
 			}
 
diff --git a/src/views/modules/monitoring/equipmentType.vue b/src/views/modules/monitoring/equipmentType.vue
index a18220b..88569b9 100644
--- a/src/views/modules/monitoring/equipmentType.vue
+++ b/src/views/modules/monitoring/equipmentType.vue
@@ -72,7 +72,7 @@ const addOrUpdateConfigs = {
 	fields: [
 		{ name: 'name', required: true, label: i18n.t('eq.type') },
 		{ name: 'code', required: true, label: i18n.t('eq.typecode'), api: '/monitoring/equipmentType/getCode' },
-		{ name: 'parentId', label: i18n.t('eq.parent'), type: 'cascader', props: { label: 'name', value: 'id', checkStrictly: true, emitPath: false }, options: [] },
+		// { name: 'parentId', label: i18n.t('eq.parent'), type: 'cascader', props: { label: 'name', value: 'id', checkStrictly: true, emitPath: false }, options: [] },
 		'remark'
 	],
 	operations: [
@@ -133,16 +133,16 @@ export default {
 		},
 		// 获取设备类型树形数据
 		getTreeEquipmentType() {
-			this.$http({
-				url: this.$http.adornUrl('/monitoring/equipmentType/getTree'),
-				method: 'post'
-			}).then(({ data: res }) => {
-				if (res && res.code === 0 && res.data.length) {
-					this.addOrUpdateConfigs.fields.find(item => item.name === 'parentId').options = res.data
-				} else {
-					this.addOrUpdateConfigs.fields.find(item => item.name === 'parentId').options.splice(0)
-				}
-			})
+			// this.$http({
+			// 	url: this.$http.adornUrl('/monitoring/equipmentType/getTree'),
+			// 	method: 'post'
+			// }).then(({ data: res }) => {
+			// 	if (res && res.code === 0 && res.data.length) {
+			// 		this.addOrUpdateConfigs.fields.find(item => item.name === 'parentId').options = res.data
+			// 	} else {
+			// 		this.addOrUpdateConfigs.fields.find(item => item.name === 'parentId').options.splice(0)
+			// 	}
+			// })
 		},
 		// 获取数据列表
 		getDataList() {
diff --git a/src/views/modules/monitoring/product.vue b/src/views/modules/monitoring/product.vue
index 4f47198..2e27476 100644
--- a/src/views/modules/monitoring/product.vue
+++ b/src/views/modules/monitoring/product.vue
@@ -143,7 +143,9 @@ const addOrUpdateConfigs = {
 		relatedField: 'productId',
 		tableConfigs: [
 			{ type: 'index', width: 100, name: i18n.t('index') },
-			{ prop: 'createTime', name: i18n.t('createTime'), filter: (val) => (val ? moment(val).format('YYYY-MM-DD hh:mm:ss') : '-') },
+			// 12小时制的时间
+			// { prop: 'createTime', name: i18n.t('createTime'), filter: (val) => (val ? moment(val).format('YYYY-MM-DD hh:mm:ss') : '-') },
+			{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 			{ prop: 'name', name: i18n.t('attrName'), formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },
 			{ prop: 'code', name: i18n.t('attrValue'), formField: true },
 			{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
diff --git a/src/views/modules/monitoring/qualityInspectionBoxBtn.vue b/src/views/modules/monitoring/qualityInspectionBoxBtn.vue
index 0f9b60b..8af5a87 100644
--- a/src/views/modules/monitoring/qualityInspectionBoxBtn.vue
+++ b/src/views/modules/monitoring/qualityInspectionBoxBtn.vue
@@ -38,7 +38,7 @@
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
 			:configs="addOrUpdateConfigs"
-			@refreshDataList="getDataList"
+			@refreshDataList="addSuccess"
 			@select-change="handleDialogSelectChange"
 			@destory-dialog="handleDestroyDialog" />
 	</div>
@@ -92,7 +92,7 @@ const addOrUpdateConfigs = {
 	fields: [
 		// { name: 'productionId', label: i18n.t('eq.name'), required: true },
 		{ name: 'productionId', label: i18n.t('pl.title'), required: true, type: 'select', options: [], relatedField: 'sectionId' },
-		{ name: 'sectionId', label: i18n.t('ws.title'), required: true, type: 'select', options: [] },
+		{ name: 'sectionId', label: i18n.t('ws.title'), required: true, type: 'select', options: [], isDisabled: true },
 		{ name: 'model', label: i18n.t('andeng.btnBoxModel') },
 		{
 			// name: 'keyValue',
@@ -215,6 +215,7 @@ export default {
 	methods: {
 		// destroy dialog
 		handleDestroyDialog() {
+			this.$set(this.addOrUpdateConfigs.fields[1], 'isDisabled', true)
 			setTimeout(() => {
 				this.addOrUpdateVisible = false
 			}, /** after dialog animated */ 200)
@@ -332,8 +333,7 @@ export default {
 					this.addOrUpdateConfigs.fields.forEach((item) => {
 						// console.log('item',item)
 						// console.log('res',res)
-						if (item.name === 'inspectionDetContent')
-							item.options = res.data.list.map((item) => ({ label: item.content, value: item.content, inspectionDetId: item.code }))
+						if (item.name === 'inspectionDetContent') item.options = res.data.list.map((item) => ({ label: item.content, value: item.content, inspectionDetId: item.code }))
 						// console.log('item',item)
 					})
 				} else {
@@ -359,10 +359,19 @@ export default {
 			this.dataListSelections = val
 		},
 		// 对话框里的某个选择改变了
-		handleDialogSelectChange({ name, id }) {
+		async handleDialogSelectChange({ name, id }) {
 			switch (name) {
 				case 'productionId':
-					this.getWsList(id)
+					// this.getWsList(id)
+					if (name === 'productionId') {
+						// 如果选择了产线，就依据此更新工单的选项
+						if (id) {
+							this.$set(this.addOrUpdateConfigs.fields[1], 'isDisabled', false)
+						} else {
+							this.$set(this.addOrUpdateConfigs.fields[1], 'isDisabled', true)
+						}
+						await this.getWsList(id)
+					}
 				case 'inspectionDetContent':
 					// this.dataForm.inspectionDetId = id
 					// console.log(id)
@@ -377,6 +386,11 @@ export default {
 					console.log('addOrUpdateConfigs', this.addOrUpdateConfigs.fields)
 			}
 		},
+		addSuccess() {
+			this.getDataList()
+			this.$set(this.addOrUpdateConfigs.fields[1], 'options', [])
+			this.$set(this.addOrUpdateConfigs.fields[1], 'isDisabled', true)
+		},
 		handleOperations({ type, data: id }) {
 			switch (type) {
 				case 'view-detail':
diff --git a/src/views/modules/monitoring/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue
index 789094b..bfbf83a 100644
--- a/src/views/modules/monitoring/qualityInspectionRecord.vue
+++ b/src/views/modules/monitoring/qualityInspectionRecord.vue
@@ -3,7 +3,7 @@
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<el-form-item>
 				{{ $t('pl.title') }}
-		    </el-form-item>
+			</el-form-item>
 			<el-form-item>
 				<el-select v-model="dataForm.lineId" :placeholder="$t('pl.title')" clearable filterable>
 					<el-option v-for="pl in plList" :key="pl.value" :value="pl.value" :label="pl.label" />
@@ -11,7 +11,7 @@
 			</el-form-item>
 			<el-form-item>
 				{{ $t('inspect.det') }}
-		    </el-form-item>
+			</el-form-item>
 			<el-form-item>
 				<el-input v-model="dataForm.key" :placeholder="$t('inspect.det')" clearable></el-input>
 			</el-form-item>
@@ -22,7 +22,7 @@
 		</el-form>
 
 		<base-table
-	    	:top-btn-config="topBtnConfig"
+			:top-btn-config="topBtnConfig"
 			:page="pageIndex"
 			:size="pageSize"
 			:data="dataList"
@@ -30,8 +30,7 @@
 			:max-height="calcMaxHeight(8)"
 			@operate-event="handleOperations"
 			@refreshDataList="getDataList"
-			@clickTopBtn="clickTopBtn"
-		/>
+			@clickTopBtn="clickTopBtn" />
 
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -40,8 +39,7 @@
 			:page-sizes="[10, 20, 50, 100]"
 			:page-size="pageSize"
 			:total="totalPage"
-			layout="total, sizes, prev, pager, next, jumper"
-		>
+			layout="total, sizes, prev, pager, next, jumper">
 		</el-pagination>
 
 		<!-- 弹窗, 新增 / 修改 -->
@@ -49,10 +47,9 @@
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
 			:configs="addOrUpdateConfigs"
-			@refreshDataList="getDataList"
+			@refreshDataList="addSuccess"
 			@destory-dialog="handleDestroyDialog"
-			@select-change="handleSelectChange"
-		/>
+			@select-change="handleSelectChange" />
 	</div>
 </template>
 
@@ -87,7 +84,7 @@ const tableConfigs = [
 	// { prop: 'productionId', name: i18n.t('pl.id') },
 	// { prop: 'sectionId', name: i18n.t('ws.id') },
 	{ prop: 'checkPerson', name: i18n.t('inspect.people') },
-	{ prop: 'source', name: i18n.t('source'), filter: val => ({ 1: i18n.t('manual'), 2: i18n.t('auto') }[val]) },
+	{ prop: 'source', name: i18n.t('source'), filter: (val) => ({ 1: i18n.t('manual'), 2: i18n.t('auto') }[val]) },
 	{ prop: 'explainText', name: i18n.t('desc') },
 	{ prop: 'remark', name: i18n.t('remark') },
 	{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
@@ -98,8 +95,23 @@ const addOrUpdateConfigs = {
 	infoUrl: '/monitoring/qualityInspectionRecord',
 	fields: [
 		{ name: 'checkTime', required: true, label: i18n.t('inspect.time'), type: 'date', props: { style: 'width: 100%', type: 'datetime' }, placeholder: i18n.t('hints.checktime') },
+		// {
+		// 	name: 'checkTime',
+		// 	required: true,
+		// 	label: i18n.t('inspect.time'),
+		// 	type: 'date',
+		// 	props: {
+		// 		'type': 'date', // element-ui 的配置
+		// 		'placeholder': i18n.t('hints.date'),
+		// 		'value-format': 'yyyy-MM-ddTHH:mm:ss',
+		// 		'style': {
+		// 			width: '100%'
+		// 		}
+		// 	},
+		// 	placeholder: i18n.t('hints.checktime')
+		// },
 		{ name: 'productionId', required: true, label: i18n.t('pl.title'), type: 'select', options: [] },
-		{ name: 'sectionId', required: true, label: i18n.t('ws.title'), type: 'select', options: [] },
+		{ name: 'sectionId', required: true, label: i18n.t('ws.title'), type: 'select', options: [] , isDisabled: true },
 		{
 			name: 'source',
 			label: i18n.t('source'),
@@ -155,15 +167,29 @@ export default {
 	methods: {
 		// destroy dialog
 		handleDestroyDialog() {
+			this.$set(this.addOrUpdateConfigs.fields[2], 'isDisabled', true)
 			setTimeout(() => {
 				this.addOrUpdateVisible = false
 			}, /** after dialog animated */ 200)
 		},
 		// handle
 		async handleSelectChange({ name, id }) {
+			// console.log('this',this)
 			if (name === 'productionId') {
 				// 如果选择了产线，就依据此更新工单的选项
+				if (id) {
+					this.$set(this.addOrUpdateConfigs.fields[2], 'isDisabled', false)
+				} else {
+					this.$set(this.addOrUpdateConfigs.fields[2], 'isDisabled', true)
+				}
 				await this.getWorkSections(id)
+				
+			}
+			if (name === 'sectionId') {
+				// 如果选择了产线，就依据此更新工单的选项
+				// console.log('nihao',id);
+				// console.log('nihao2',this.addOrUpdateConfigs.fields[1].options == []);
+				// console.log('nihao2',this.addOrUpdateConfigs.fields[1].options );
 			}
 		},
 		// 获取检测内容
@@ -178,9 +204,9 @@ export default {
 				})
 			}).then(({ data: res }) => {
 				console.log('insdet:', res)
-				const insDetOpt = this.addOrUpdateConfigs.fields.find(item => item.name === 'inspectionDetId')
+				const insDetOpt = this.addOrUpdateConfigs.fields.find((item) => item.name === 'inspectionDetId')
 				if (insDetOpt) {
-					insDetOpt.options = res.data.list.map(item => ({ value: item.id, label: item.content })) || []
+					insDetOpt.options = res.data.list.map((item) => ({ value: item.id, label: item.content })) || []
 				}
 			})
 		},
@@ -190,11 +216,11 @@ export default {
 				url: this.$http.adornUrl('/monitoring/productionLine/list'),
 				method: 'get'
 			}).then(({ data: res }) => {
-				const plOpt = this.addOrUpdateConfigs.fields.find(item => item.name === 'productionId')
+				const plOpt = this.addOrUpdateConfigs.fields.find((item) => item.name === 'productionId')
 				if (plOpt) {
-					plOpt.options = res.data.map(item => ({ value: item.id, label: item.name })) || []
+					plOpt.options = res.data.map((item) => ({ value: item.id, label: item.name })) || []
 				}
-				this.plList = res.data.map(item => ({ value: item.id, label: item.name })) || []
+				this.plList = res.data.map((item) => ({ value: item.id, label: item.name })) || []
 			})
 		},
 		// 获取工段
@@ -215,15 +241,23 @@ export default {
 					if (res.data.total === 0) {
 						this.$message.error(i18n.t('errors.nosection'))
 					} else {
+						// console.log('da',this.dataForm);
 						this.$message.success(i18n.t('errors.numsection', { num: res.data.total }))
 					}
 				}
-				const wsOpt = this.addOrUpdateConfigs.fields.find(item => item.name === 'sectionId')
+				const wsOpt = this.addOrUpdateConfigs.fields.find((item) => item.name === 'sectionId')
+				// const wsOpt2 = this.addOrUpdateConfigs.fields.find((item) => item.name === 'productionId')
+				// console.log('wsOpt',wsOpt);
 				if (wsOpt) {
-					wsOpt.options = res.data.list.map(item => ({ value: item.id, label: item.name })) || []
+					wsOpt.options = res.data.list.map((item) => ({ value: item.id, label: item.name })) || []
 				}
 			})
 		},
+		addSuccess() {
+			this.getDataList()
+			this.$set(this.addOrUpdateConfigs.fields[2], 'options', [])
+			this.$set(this.addOrUpdateConfigs.fields[2], 'isDisabled', true)
+		},
 		// 获取数据列表
 		getDataList() {
 			this.addOrUpdateVisible = false
@@ -245,6 +279,7 @@ export default {
 				method: 'get',
 				params: this.$http.adornParams(queryParams)
 			}).then(({ data }) => {
+				// console.log('data', data)
 				if (data && data.code === 0) {
 					this.dataList = data.data.list
 					this.totalPage = data.data.total
@@ -295,7 +330,7 @@ export default {
 		deleteHandle(id) {
 			var ids = id
 				? [id]
-				: this.dataListSelections.map(item => {
+				: 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'), {
diff --git a/src/views/modules/monitoring/realtimeEquipment.vue b/src/views/modules/monitoring/realtimeEquipment.vue
index 848f6fe..3093122 100644
--- a/src/views/modules/monitoring/realtimeEquipment.vue
+++ b/src/views/modules/monitoring/realtimeEquipment.vue
@@ -2,7 +2,7 @@
  * @Author: lb
  * @Date: 2022-06-22 14:00:17
  * @LastEditors: fzq
- * @LastEditTime: 2023-01-03 10:18:14
+ * @LastEditTime: 2023-02-02 17:19:10
  * @Description: 设备生产实时数据
 -->
 <template>
@@ -130,7 +130,7 @@ export default {
 								if (obj.recordTime) {
 									// 如果 obj.recordTime 是有效的
 									this.tableProps.push({
-										label: moment(obj.recordTime).format('YYYY-MM-DD HH:mm:ss'),
+										label: moment(obj.recordTime).format('YYYY-MM-DD HH')+ moment(obj.recordTime).add(1,'hours').format('-HH')+i18n.t('hourTime'),
 										children: [
 											{ prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') },
 											{ prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') },
diff --git a/src/views/modules/monitoring/realtimeProductLine.vue b/src/views/modules/monitoring/realtimeProductLine.vue
index 848238f..30d5b9d 100644
--- a/src/views/modules/monitoring/realtimeProductLine.vue
+++ b/src/views/modules/monitoring/realtimeProductLine.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: lb
  * @Date: 2022-06-22 14:00:17
- * @LastEditors: lb
- * @LastEditTime: 2022-06-22 14:00:17
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-02-02 17:17:45
  * @Description: 产线生产实时数据
 -->
 <template>
@@ -109,7 +109,7 @@ export default {
 						// Step2: 设置动态props
 						if (!this.dynamicPropSet) {
 							this.tableProps.push({
-								label: moment(obj.recordTime).format('YYYY-MM-DD HH:mm:ss'),
+								label: moment(obj.recordTime).format('YYYY-MM-DD HH')+ moment(obj.recordTime).add(1,'hours').format('-HH')+i18n.t('hourTime'),
 								children: [
 									{ prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') },
 									{ prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') },
diff --git a/src/views/modules/monitoring/realtimeQualityInspection.vue b/src/views/modules/monitoring/realtimeQualityInspection.vue
index 955046d..568f5dc 100644
--- a/src/views/modules/monitoring/realtimeQualityInspection.vue
+++ b/src/views/modules/monitoring/realtimeQualityInspection.vue
@@ -138,14 +138,14 @@ export default {
 			// 保存为 props
 			for (const key of sortedTime) {
 				// const prop = { label: key, children: [] }
-				const prop = { label: moment(key).format('YYYY-MM-DD HH:mm:ss'), children: [] }
+				const prop = { label: moment(key).format('YYYY-MM-DD HH')+ moment(key).add(1,'hours').format('-HH')+i18n.t('hourTime'), children: [] }
 				for (const subKey in timeMap[key]) {
 					prop.children.push({ label: subKey, prop: key + subKey })
 				}
 				dynamicPropNames.push(prop)
 			}
 
-			return [{ prop: 'checkType', label: i18n.t('inspect.type'), isFixed: true }, ...dynamicPropNames]
+			return [{ prop: 'checkType', label: i18n.t('inspect.det'), isFixed: true }, ...dynamicPropNames]
 		}
 	}
 }
diff --git a/src/views/modules/monitoring/workShopSection.vue b/src/views/modules/monitoring/workShopSection.vue
index 5de8ff8..35c56bd 100644
--- a/src/views/modules/monitoring/workShopSection.vue
+++ b/src/views/modules/monitoring/workShopSection.vue
@@ -75,7 +75,7 @@ const addOrUpdateConfigs = {
 	fields: [
 		{ name: 'name', required: true, label: i18n.t('ws.name') },
 		{ name: 'code', required: true, label: i18n.t('ws.code'), api: '/monitoring/workshopSection/getCode' },
-		{ name: 'productionLineId', label: i18n.t('ws.belong'), type: 'select', options: [] },
+		{ name: 'productionLineId', required: true, label: i18n.t('ws.belong'), type: 'select', options: [] },
 		'description',
 		'remark'
 	],
diff --git a/src/views/modules/monitoring/workshopSectionDialog.vue b/src/views/modules/monitoring/workshopSectionDialog.vue
index af7464c..db912b0 100644
--- a/src/views/modules/monitoring/workshopSectionDialog.vue
+++ b/src/views/modules/monitoring/workshopSectionDialog.vue
@@ -124,7 +124,8 @@ export default {
 			},
 			dataFormRules: {
 				name: [{ required: true, message: i18n.t('validate.required'), trigger: 'blur' }],
-				code: [{ required: true, message: i18n.t('validate.required'), trigger: 'blur' }]
+				code: [{ required: true, message: i18n.t('validate.required'), trigger: 'blur' }],
+				productionLineId: [{ required: true, message: i18n.t('validate.required'), trigger: 'blur' }]
 			},
 			limit: 5,
 			page: 1,
diff --git a/src/views/modules/sys/dict-type.vue b/src/views/modules/sys/dict-type.vue
index 9689f71..98bafe3 100644
--- a/src/views/modules/sys/dict-type.vue
+++ b/src/views/modules/sys/dict-type.vue
@@ -17,9 +17,9 @@
 				<el-form-item>
 					<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
 				</el-form-item>
-				<!-- <el-form-item>
+				<el-form-item>
 					<el-button v-if="$hasPermission('sys:dict:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-				</el-form-item> -->
+				</el-form-item>
 				<el-form-item>
 					<el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
 				</el-form-item>
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index f62ed34..167d95b 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -105,7 +105,8 @@ export default {
 				confirmPassword: [{ validator: validateConfirmPassword, trigger: 'blur' }],
 				realName: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
 				email: [{ validator: validateEmail, trigger: 'blur' }],
-				mobile: [{ validator: validateMobile, trigger: 'blur' }],
+				// 解除手机号输入限制
+				// mobile: [{ validator: validateMobile, trigger: 'blur' }],
 				roleIdList: [{ required: true, message: '至少选择一个角色', trigger: 'change' }]
 			}
 		}
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index c487157..1645337 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-11-25 09:51:46
  * @LastEditors: fzq
- * @LastEditTime: 2023-01-13 09:06:52
+ * @LastEditTime: 2023-02-02 15:36:55
 -->
 <template>
 	<el-card shadow="never" class="aui-card--fill">
@@ -58,7 +58,7 @@
 						<el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+				<!-- <el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column> -->
 				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
 					<template slot-scope="scope">
 						<el-button v-if="$hasPermission('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>