From 90a93e4f8bdd767ec826d7379d54a541b1690199 Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Thu, 1 Sep 2022 11:28:13 +0800
Subject: [PATCH] update permissions

---
 src/views/modules/monitoring/equipment.vue    |  2 +-
 .../modules/monitoring/equipmentFile.vue      | 27 +----------------
 .../monitoring/equipmentGroupAlarm.vue        | 29 +------------------
 .../modules/monitoring/equipmentattr.vue      | 23 +--------------
 src/views/modules/monitoring/product.vue      |  4 +--
 src/views/modules/monitoring/productArrt.vue  | 27 +----------------
 .../monitoring/productionLineRecSch.vue       | 18 +-----------
 src/views/modules/monitoring/reportDetail.vue |  4 +--
 .../monitoring/reportSheetCategory.vue        | 25 +---------------
 9 files changed, 11 insertions(+), 148 deletions(-)

diff --git a/src/views/modules/monitoring/equipment.vue b/src/views/modules/monitoring/equipment.vue
index 12f5aae..f4dd2c0 100644
--- a/src/views/modules/monitoring/equipment.vue
+++ b/src/views/modules/monitoring/equipment.vue
@@ -7,7 +7,7 @@
 			<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 @click="exportHandle()">导出</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipment:export')" @click="exportHandle()">导出</el-button>
 			</el-form-item>
 		</el-form>
 
diff --git a/src/views/modules/monitoring/equipmentFile.vue b/src/views/modules/monitoring/equipmentFile.vue
index f468701..33ec1a2 100644
--- a/src/views/modules/monitoring/equipmentFile.vue
+++ b/src/views/modules/monitoring/equipmentFile.vue
@@ -9,32 +9,7 @@
 				<el-button v-if="$hasPermission('monitoring:equipmenfile: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=""> </el-table-column>
-			<el-table-column prop="equipmentId" header-align="center" align="center" label="设备ID"> </el-table-column>
-			<el-table-column prop="fileId" header-align="center" align="center" label="文件ID"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </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 prop="typeCode" header-align="center" align="center" label="文件类型编号"> </el-table-column>
-			<el-table-column prop="fileName" header-align="center" align="center" label="文件名字"> </el-table-column>
-			<el-table-column prop="fileUrl" 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="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
diff --git a/src/views/modules/monitoring/equipmentGroupAlarm.vue b/src/views/modules/monitoring/equipmentGroupAlarm.vue
index f050044..5ede7af 100644
--- a/src/views/modules/monitoring/equipmentGroupAlarm.vue
+++ b/src/views/modules/monitoring/equipmentGroupAlarm.vue
@@ -20,34 +20,7 @@
 				</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="equipmentGroupId" header-align="center" align="center" label="设备分组ID，关联t_equipment_group"></el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="编码"></el-table-column>
-			<el-table-column prop="typeDictValue" header-align="center" align="center" label="报警类型 字典表关联label_value"></el-table-column>
-			<el-table-column prop="gradeDictValue" header-align="center" align="center" label="报警级别 字典表关联label_value"></el-table-column>
-			<el-table-column prop="alarmContent" header-align="center" align="center" label="报警内容"></el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"></el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="外部编码，用于对照外部系统的编码"></el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"></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 prop="alarmNotify" header-align="center" align="center" label="推送方式 0邮箱 1微信"></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="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
diff --git a/src/views/modules/monitoring/equipmentattr.vue b/src/views/modules/monitoring/equipmentattr.vue
index de09ddd..17c467c 100644
--- a/src/views/modules/monitoring/equipmentattr.vue
+++ b/src/views/modules/monitoring/equipmentattr.vue
@@ -9,28 +9,7 @@
 				<el-button v-if="$hasPermission('monitoring:equipmenattr: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="equipmentId" header-align="center" align="center" label="设备ID"> </el-table-column>
-			<el-table-column prop="attrName" header-align="center" align="center" label="属性名称"> </el-table-column>
-			<el-table-column prop="attrValue" 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="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
diff --git a/src/views/modules/monitoring/product.vue b/src/views/modules/monitoring/product.vue
index 3f4dd84..c494af6 100644
--- a/src/views/modules/monitoring/product.vue
+++ b/src/views/modules/monitoring/product.vue
@@ -106,8 +106,8 @@ const addOrUpdateConfigs = {
 	],
 	operations: [
 		{ name: 'cancel', url: true, showAlways: true },
-		{ name: 'save', url: '/monitoring/product', permission: '', showOnEdit: false },
-		{ name: 'update', url: '/monitoring/product', permission: '', showOnEdit: true }
+		{ name: 'save', url: '/monitoring/product', permission: 'monitoring:product:save', showOnEdit: false },
+		{ name: 'update', url: '/monitoring/product', permission: 'monitoring:product:update', showOnEdit: true }
 	],
 	subtable: {
 		// for i18n
diff --git a/src/views/modules/monitoring/productArrt.vue b/src/views/modules/monitoring/productArrt.vue
index 63129de..65baf14 100644
--- a/src/views/modules/monitoring/productArrt.vue
+++ b/src/views/modules/monitoring/productArrt.vue
@@ -9,32 +9,7 @@
 				<el-button v-if="$hasPermission('monitoring:productarrt: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="code" header-align="center" align="center" label="编码"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
-			<el-table-column prop="productId" header-align="center" align="center" label="产品id,关联产品表"> </el-table-column>
-			<el-table-column prop="value" header-align="center" align="center" label="属性值"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="外部编码，用于对照外部系统的编码"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </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="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
diff --git a/src/views/modules/monitoring/productionLineRecSch.vue b/src/views/modules/monitoring/productionLineRecSch.vue
index fed56c3..8462f9c 100644
--- a/src/views/modules/monitoring/productionLineRecSch.vue
+++ b/src/views/modules/monitoring/productionLineRecSch.vue
@@ -9,23 +9,7 @@
 				<el-button v-if="$hasPermission('monitoring:productionlinerecsch: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="productionLineId" header-align="center" align="center" label="产线id"> </el-table-column>
-			<el-table-column prop="inputNum" header-align="center" align="center" label="上一次记录时间至该条记录时间端内上片数量"> </el-table-column>
-			<el-table-column prop="outputNum" header-align="center" align="center" label="上一次记录时间至该条记录时间端内下片数量"> </el-table-column>
-			<el-table-column prop="recordTime" 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="sumInputNum" header-align="center" align="center" label="该记录时间点的累计上片数量"> </el-table-column>
-			<el-table-column prop="sumOutputNum" 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="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
diff --git a/src/views/modules/monitoring/reportDetail.vue b/src/views/modules/monitoring/reportDetail.vue
index 0141418..6386c7f 100644
--- a/src/views/modules/monitoring/reportDetail.vue
+++ b/src/views/modules/monitoring/reportDetail.vue
@@ -7,11 +7,11 @@
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<!-- <el-button v-if="$hasPermission('')" type="primary" @click="addOrUpdateHandle()">新增(跳到设计)</el-button> -->
-				<el-button type="primary" @click="handleAdd()">新增</el-button>
+				<el-button v-if="$hasPermission('monitoring:reportsheet:save')" type="primary" @click="handleAdd()">新增</el-button>
 			</el-form-item>
 		</el-form>
 
-		<base-table :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="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 
 		<el-pagination
 			@size-change="sizeChangeHandle"
diff --git a/src/views/modules/monitoring/reportSheetCategory.vue b/src/views/modules/monitoring/reportSheetCategory.vue
index b1aa505..6c2b261 100644
--- a/src/views/modules/monitoring/reportSheetCategory.vue
+++ b/src/views/modules/monitoring/reportSheetCategory.vue
@@ -9,30 +9,7 @@
 				<el-button v-if="$hasPermission('monitoring:reporsheecategory: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="code" header-align="center" align="center" label="编码"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="外部编码，用于对照外部系统的编码"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </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="calcMaxHeight(8)" />
 		<el-pagination
 			@size-change="sizeChangeHandle"