TODO.md

@@ -0,0 +1,5 @@
+# TODO List 
+
+1. 按钮加权限
+2. 国际化
+3. 表格高度 

src/views/modules/monitoring/equipment.vue

@@ -187,9 +187,6 @@ const addOrUpdateConfigs = {
 		},
 		{ name: 'remark', label: '备注 ' }
 	],
-	// TODO: 富文本  √
-	// TODO: 设备资料上传 √
-	// TODO: 设备图片上传 √
 	extraComponents: [
 		{
 			name: 'description',

src/views/modules/monitoring/equipmentAlarmLog.vue

@@ -9,29 +9,7 @@
 				<el-button v-if="$hasPermission('monitoring:equipmenalarmlog:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
-			<el-table-column prop="alarmId" header-align="center" align="center" label="报警信息ID，关联T_equipment_group_alarm表"> </el-table-column>
-			<el-table-column prop="alarmSource" header-align="center" align="center" label="报警来源"> </el-table-column>
-			<el-table-column prop="alarmContent" header-align="center" align="center" label="报警详细内容"> </el-table-column>
-			<el-table-column prop="alarmEquipmentId" header-align="center" align="center" label="报警设备id 关联equipment表"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
+
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"

src/views/modules/monitoring/equipmentGroupAlarm.vue

@@ -86,23 +86,6 @@ const tableConfigs = [
 	{ prop: 'gradeDictValue', name: '报警级别' },
 	{ prop: 'alarmContent', name: '报警内容' },
 	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
-	// { prop: 'typeDictValue', name: '报警类型 字典表关联label_value' },
-	// { prop: 'gradeDictValue', name: '报警级别 字典表关联label_value' },
-	// { "prop": "id", "name": "ID" },
-	// { "prop": "equipmentGroupId", "name": "设备分组ID，关联t_equipment_group" },
-	// { "prop": "description", "name": "描述" },
-	// { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
-	// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
-	// { "prop": "remark", "name": "备注" },
-	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-	// { "prop": "creatorId", "name": "创建人" },
-	// { "prop": "creatorName", "name": "创建人姓名" },
-	// { "prop": "updaterId", "name": "更新人" },
-	// { "prop": "updaterName", "name": "更新人姓名" },
-	// { "prop": "updateTime", "name": "更新时间" },
-	// { "prop": "version", "name": "版本号" },
-	// { prop: 'alarmNotify', name: '推送方式 0邮箱 1微信' },
-	// { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
 const addOrUpdateConfigs = {

src/views/modules/monitoring/equipmentPlc.vue

@@ -76,19 +76,6 @@ const addOrUpdateConfigs = {
 		{ name: 'save', url: '/monitoring/equipmentPlc', permission: '', showOnEdit: false },
 		{ name: 'update', url: '/monitoring/equipmentPlc', permission: '', showOnEdit: true }
 	]
-	// subtable: {
-	// 	// for i18n
-	// 	title: '动态属性',
-	// 	url: '/monitoring/productArrt',
-	// 	relatedField: 'productId',
-	// 	tableConfigs: [
-	// 		{ type: 'index', name: '序号' },
-	// 		{ prop: 'createTime', name: '添加时间', filter: val => (val ? moment(val).format('YYYY-MM-DD hh:mm:ss') : '-') },
-	// 		{ prop: 'name', name: '属性名', formField: true, rules: [{ required: true, message: '必填', trigger: 'blur' }] },
-	// 		{ prop: 'code', name: '属性值', formField: true },
-	// 		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
-	// 	]
-	// }
 }
 
 export default {

src/views/modules/monitoring/equipmentPlcConnect.vue

@@ -108,10 +108,6 @@ const addOrUpdateConfigs = {
 					{ value: 1, label: '采集' }
 				]
 			},
-			// { prop: 'collectionCycle', name: '采集周期（s） 暂不使用' },
-			// { prop: 'reportingCycle', name: '上报周期（s） 暂不使用' },
-			// { prop: 'reportingMethod', name: '上报方式 暂不使用' },
-			// { prop: 'reportingCode', name: '上报编码 暂不使用' },
 			{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 		]
 	}

src/views/modules/monitoring/equipmentPlcParam.vue

@@ -48,15 +48,8 @@ const tableConfigs = [
 	{ prop: 'defaultValue', name: '参数设定标准值' },
 	{ prop: 'description', name: '描述' },
 	{ prop: 'enabled', name: '启用状态', filter: val => ['停用', '启用'][+val] },
-	// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
 	{ prop: 'remark', name: '备注' },
-	// { prop: 'createTime', name: '添加时间' },
 	{ prop: 'collection', name: '是否采集', filter: val => ['不采集', '采集'][+val] }
-	// { prop: 'collectionCycle', name: '采集周期（s） 暂不使用' },
-	// { prop: 'reportingCycle', name: '上报周期（s） 暂不使用' },
-	// { prop: 'reportingMethod', name: '上报方式 暂不使用' },
-	// { prop: 'reportingCode', name: '上报编码 暂不使用' },
-	// { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
 export default {

src/views/modules/monitoring/equipmentattr.vue

@@ -59,15 +59,6 @@ const tableConfigs = [
 	{ prop: 'equipmentId', name: '设备ID' },
 	{ prop: 'attrName', name: '属性名' },
 	{ prop: 'attrValue', name: '属性值' },
-	// { "prop": "id", "name": "ID" },
-	// { "prop": "remark", "name": "备注" },
-	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-	// { "prop": "creatorId", "name": "创建人" },
-	// { "prop": "creatorName", "name": "创建人姓名" },
-	// { "prop": "updaterId", "name": "更新人" },
-	// { "prop": "updaterName", "name": "更新人姓名" },
-	// { "prop": "updateTime", "name": "更新时间" },
-	// { prop: 'version', name: '版本号' },
 	{
 		prop: 'operations',
 		name: '操作',

src/views/modules/monitoring/qualityInspectionRecord.vue

@@ -48,15 +48,12 @@ const tableConfigs = [
 	{
 		prop: 'inspectionDetContent',
 		name: '检测内容'
-		// "name": "检测内容（设备推送消息时，可能无对应id，只填这个字段）"
 	},
 	{ prop: 'checkTime', name: '检测时间' },
 	{ prop: 'productionId', name: '产线id' },
 	{ prop: 'sectionId', name: '工段id' },
 	{ prop: 'checkPerson', name: '检测人员' },
-	// { prop: 'checkPerson', name: '检测人员，可以多个' },
 	{ prop: 'source', name: '来源', filter: val => ({ 1: '手动', 2: '自动' }[val]) },
-	// { prop: 'source', name: '来源 1，手动（默认） 2，自动' },
 	{ prop: 'explainText', name: '描述' },
 	{ prop: 'remark', name: '备注' },
 	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }

src/views/modules/monitoring/reportCategory.vue

@@ -37,9 +37,6 @@ import { calcMaxHeight } from '@/utils'
 const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
 	{ prop: 'name', name: '分类名称' },
-	// { prop: 'code', name: '分类编码' },
-	// 'description',
-	// 'remark',
 	{ prop: 'operations', name: '操作', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
@@ -48,9 +45,6 @@ const addOrUpdateConfigs = {
 	infoUrl: '/monitoring/reportSheetCategory',
 	fields: [
 		{ name: 'name', label: '分类名称', required: true, span: 24 }
-		// { name: 'code', label: '分类编码', required: true },
-		// { name: 'description', label: '描述' },
-		// { name: 'remark', label: '备注' }
 	],
 	operations: [
 		{ name: 'cancel', url: true, showAlways: true },

src/views/modules/monitoring/reportDesign.vue

@@ -22,7 +22,6 @@ export default {
 		this.url += name ? '?_u=db:' + this.$route.query.name : ''
 		const ifream = document.getElementById('zgboke')
 
-    console.log('url: ', this.url)
 		ifream.onload = function() {
 			console.log('加载完成')
 			vm.loading = false

src/views/modules/monitoring/reportSheet.vue

@@ -38,21 +38,11 @@ const tableConfigs = [
 	{ prop: 'name', name: '报表名称' },
 	{ prop: 'code', name: '报表编码' },
 	{ prop: 'category', name: '报表分类' },
-	// { prop: 'id', name: 'ID' },
-	// { prop: 'category', name: '分类：关联report_sheet_category' },
 	{ prop: 'fileName', name: '文件名称' },
 	{ prop: 'url', name: '链接地址' },
 	{ prop: 'description', name: '描述' },
 	{ prop: 'remark', name: '备注' },
 	{ prop: 'content', name: '报表内容' },
-	// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
-	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
-	// { prop: 'creatorId', name: '创建人' },
-	// { prop: 'creatorName', name: '创建人姓名' },
-	// { prop: 'updaterId', name: '更新人' },
-	// { prop: 'updaterName', name: '更新人姓名' },
-	// { prop: 'updateTime', name: '更新时间' },
-	// { prop: 'version', name: '版本号' },
 	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 

src/views/modules/monitoring/reportSheetCategory.vue

@@ -60,18 +60,6 @@ const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
 	{ prop: 'name', name: '分类名称' },
 	{ prop: 'code', name: '分类编码' },
-	// { "prop": "id", "name": "ID" },
-	// { "prop": "description", "name": "描述" },
-	// { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
-	// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
-	// { "prop": "remark", "name": "备注" },
-	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-	// { "prop": "creatorId", "name": "创建人" },
-	// { "prop": "creatorName", "name": "创建人姓名" },
-	// { "prop": "updaterId", "name": "更新人" },
-	// { "prop": "updaterName", "name": "更新人姓名" },
-	// { "prop": "updateTime", "name": "更新时间" },
-	// { prop: 'version', name: '版本号' },
 	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 

src/views/modules/monitoring/workShopSection.vue

@@ -38,7 +38,6 @@ const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
 	{ prop: 'name', name: '工段名称' },
 	{ prop: 'code', name: '工段编码' },
-	// { prop: 'productionLineId', name: '产线ID' },
 	{ prop: 'productionLineName', name: '产线' },
 	{ prop: 'remark', name: '备注' },
 	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }

src/views/modules/monitoring/workShopSectionEquipment.vue

@@ -9,28 +9,7 @@
 				<el-button v-if="$hasPermission('monitoring:workshopsectionequipment:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
-			<el-table-column prop="workshopSectionId" header-align="center" align="center" label="工段ID"> </el-table-column>
-			<el-table-column prop="equipmentId" header-align="center" align="center" label="设备ID"> </el-table-column>
-			<el-table-column prop="sort" header-align="center" align="center" label="排序"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
+
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -59,14 +38,6 @@ const tableConfigs = [
 	{ prop: 'equipmentId', name: '设备ID' },
 	{ prop: 'sort', name: '排序' },
 	{ prop: 'remark', name: '备注' },
-	// { prop: 'id', name: 'ID' },
-	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
-	// { prop: 'creatorId', name: '创建人' },
-	// { prop: 'creatorName', name: '创建人姓名' },
-	// { prop: 'updaterId', name: '更新人' },
-	// { prop: 'updaterName', name: '更新人姓名' },
-	// { prop: 'updateTime', name: '更新时间' },
-	// { prop: 'version', name: '版本号' },
 	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]