'修改路由点击BUG，字段显示，按钮盒，基础样式'

src/assets/scss/common.scss

@@ -371,7 +371,9 @@ img {
       font-weight: 500;
       color: #FFFFFF;
       line-height: 20px;
-      margin-top: 7px;
+      margin-top: 14px;
+      // 新加的
+      margin-left: 10px;
     }
     &-mini {
       max-width: 100%;
@@ -410,6 +412,7 @@ img {
     }
     .el-menu-item.is-active,
     .el-submenu.is-active > .el-submenu__title {
+      // 点击之后背景颜色
       color: $--color-text-secondary;
       // background-color: rgb(13,43,104);
       &:focus,
@@ -425,6 +428,7 @@ img {
       &:hover {
         .aui-navbar__icon-menu {
           color: $--color-text-primary;
+          // color: #fff;
         }
         .el-dropdown {
           color: $--color-text-primary;

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

@@ -490,7 +490,7 @@ export default {
 								this.$set(this.dataForm, 'fileIds', fileIds)
 							}
 
-							// console.log('before send: ', this.dataForm)
+							console.log('before send: ', this.dataForm)
 
 							this.$http({
 								url: this.$http.adornUrl(urls[btn.name].url),

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

@@ -19,7 +19,7 @@ export default {
       colors: {
         delete: '#FF5454',
         preview: '#f09843',
-        design: '#99089f',
+        design: '#0b58ff',
         // 'view-trend': 'red'
         // add more...
       },

src/components/base-table/index.vue

@@ -16,7 +16,8 @@
 			<!-- 设置小齿轮table列的图标 -->
 			<el-popover placement="bottom-start" width="200" trigger="click">
 				<div class="setting-box">
-					<el-checkbox v-for="(item, index) in tableHeadConfigs" :key="'cb' + index" v-model="selectedBox[index]" :label="item.name" />
+					<!-- :label="item.name ? item.name : item.label" 三元判别就可以让厂务的实时数据可以显示 -->
+					<el-checkbox v-for="(item, index) in tableHeadConfigs" :key="'cb' + index" v-model="selectedBox[index]" :label="item.name ? item.name : item.label" />
 				</div>
 				<i slot="reference" class="el-icon-s-tools" style="color: #0b58ff" />
 			</el-popover>

src/components/small-title/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: lb
  * @Date: 2022-05-18 16:00:00
- * @LastEditors: lb
- * @LastEditTime: 2022-05-18 16:00:00
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-01-03 10:00:06
  * @Description:
 -->
 <template>
@@ -53,11 +53,11 @@ $mgr: 6px;
 			display: inline-block;
 			vertical-align: top;
 			width: 4px;
-			height: $height + 2px;
+			height: $height;
 			border-radius: 1px;
-			margin-right: $mgr;
-			// background-color: #0b58ff;
-			background-color: #409EFF;
+			margin-right: $mgr; 
+			// background-color: #0b58ff;#409EFF;
+			background-color: #0b58ff;
 		}
 	}
 }

src/i18n/en.js

@@ -387,6 +387,7 @@ t.prompt.month = 'Please choose month'
 t.validate = {}
 t.validate.required = 'This is required.'
 t.validate.format = '{attr} has a wrong format.'
+t.validate.keyValueWarning = 'The value must be an integer between 0 and 100!'
 
 t.upload = {}
 t.upload.title = 'Upload Assets'

src/i18n/zh-CN.js

@@ -386,6 +386,7 @@ t.prompt.month = '请选择月份'
 t.validate = {}
 t.validate.required = '必填项不能为空'
 t.validate.format = '{attr}格式错误'
+t.validate.keyValueWarning = '该数值必须是100以内的正整数！'
 
 t.upload = {}
 t.upload.title = '上传资料'

src/views/main-navbar.vue

@@ -9,14 +9,15 @@
 		<div class="aui-navbar__header">
 			<h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
 				<a class="aui-navbar__brand-lg" href="javascript:;">
-					<img src="../assets/img/cnbm.png" style="width: 36px; height: 36px; position: relative; top: 0em; margin-right: 12px" alt="" />
+					<!-- 36px -->
+					<img src="../assets/img/cnbm.png" style="width: 26px; height: 26px; position: relative; top: -.075em; margin-right: 12px" alt="" />
 					{{ $t('brand.lg') }}
 				</a>
 				<!-- <a class="aui-navbar__brand-mini" href="javascript:;">{{ $t('brand.mini') }}</a> -->
 				<!-- 缩放时LOGO -->
 				<!-- <a class="aui-navbar__brand-mini" href="javascript:;"> -->
 				<a class="aui-navbar__brand-mini" href="javascript:;">
-					<img src="../assets/img/cnbm.png" style="width: 36px; height: 36px; position: relative; top: 0em" alt="" />
+					<img src="../assets/img/cnbm.png" style="width: 26px; height: 26px; position: relative; top: 0em" alt="" />
 				</a>
 			</h1>
 		</div>
@@ -49,7 +50,11 @@
 						<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true"><use xlink:href="#gitee"></use></svg>
 					</a>
 				</el-menu-item> -->
-				<el-menu-item index="3">
+				<el-menu-item
+					index="3"
+					:style="{
+						backgroundColor: this.$route.meta.hiddenSiderbar !== true ? '#fff' : 'rgb(13,43,104)'
+					}">
 					<!-- <el-dropdown :style="showTitle ? 'color: #fff' : '#000'" class="hover-effect" trigger="click">
 						<el-badge :hidden="alarmNum > 0 ? false : true" :value="alarmNum" class="item" style="line-height: 0; margin: 0 10px; vertical-align: -3px" @click.native="handleAlarm">
 							<svg-icon style="width: 24px; height: 24px" class="item-icon" icon-class="alarm" />
@@ -71,12 +76,22 @@
 						</el-dropdown-menu>
 					</el-dropdown>
 				</el-menu-item>
-				<el-menu-item index="4" @click="fullscreenHandle()">
+				<el-menu-item
+					index="4"
+					@click="fullscreenHandle()"
+					:style="{
+						backgroundColor: this.$route.meta.hiddenSiderbar !== true ? '#fff' : 'rgb(13,43,104)'
+					}">
 					<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
 						<use xlink:href="#icon-fullscreen"></use>
 					</svg>
 				</el-menu-item>
-				<el-menu-item index="5" class="aui-navbar__avatar">
+				<el-menu-item
+					index="5"
+					class="aui-navbar__avatar"
+					:style="{
+						backgroundColor: this.$route.meta.hiddenSiderbar !== true ? '#fff' : 'rgb(13,43,104)'
+					}">
 					<el-dropdown placement="bottom" :show-timeout="0">
 						<span class="el-dropdown-link">
 							<img src="~@/assets/img/avatar.png" />
@@ -176,3 +191,4 @@ export default {
 	}
 }
 </script>
+

src/views/modules/home.vue

@@ -124,13 +124,16 @@ export default {
       // } else {
       //   this.toRouter(item)
       // }
+      console.log('item',item)
       this.toRouter(item)
     },
     toRouter(item) {
-      console.log(item.children[0].url)
-      if (item.children) {
-        this.$router.push({name: item.children[0].url.replace(new RegExp('/','g'),'-')})
-      } else {
+      // console.log(item.children[0].url)
+      // 加个判断看是否双层children
+      if ((item.children) && (item.children[0].url == "")){
+        this.$router.push({name: item.children[0].children[0].url.replace(new RegExp('/','g'),'-')})
+      } 
+      else {
         this.$router.push({name: item.children[0].url.replace(new RegExp('/','g'),'-')})
       }
     },
@@ -148,29 +151,28 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.choicepart-container {
+.choicepart-container{
   min-width: 100%;
   min-height: 100vh;
   // background: linear-gradient(-45deg, rgb(25, 25, 200), rgb(0, 100, 200));
   background: url('../../assets/img/choicepart/choicepart-back.png') repeat;
   background-size: cover;
   overflow-x: scroll;
-  .choicepart-box {
+  .choicepart-box{
     width: 1440px;
     margin: 0 auto;
     margin: 0 auto;
-    // 距离上面边距
-    padding-top: 8vh;
+    padding-top: 16vh;
     min-height: 100vh;
-    .choicepart-item {
+    .choicepart-item{
       display: inline-block;
       width: 208px;
       height: 258px;
       margin: 40px;
-      background: url('../../assets/img/choicepart/choice-item-back.png') no-repeat;
+      background:  url('../../assets/img/choicepart/choice-item-back.png') no-repeat;
       background-size: 100% 100%;
       // border: 1px dashed #fff;
-      box-shadow: 0 2px 10px rgba(0, 0, 0, 0.5);
+      box-shadow: 0 2px 10px rgba(0, 0, 0, .5);
       top: 0;
       border-radius: 5px;
       overflow: hidden;
@@ -180,41 +182,41 @@ export default {
         width: 208px;
         height: 258px;
       }
-      .choicepart-item-border {
+      .choicepart-item-border{
         height: 100%;
         border-radius: 5px;
         padding: 0 5px;
         line-height: 32px;
         font-size: 28px;
         font-weight: lighter;
-        color: #2c6bd8;
+        color: #2C6BD8;
         overflow: hidden;
       }
       .choicepart-item-title {
-        overflow: hidden;
+        overflow:hidden;
         padding: 0 10px;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+        text-overflow:ellipsis;
+        white-space:nowrap;
         position: absolute;
         bottom: 0;
-        left: 2px;
-        right: 2px;
+        left: 0;
+        right: 0;
         text-align: center;
         color: #fff;
         font-size: 16px;
         line-height: 48px;
         height: 48px;
         letter-spacing: 2px;
-        background-color: rgba($color: #0b58ff, $alpha: 0.45);
+        background-color: rgba($color: #0B58FF, $alpha: 0.45);
       }
     }
     .choicepart-item:hover {
       .choicepart-item-title {
-        background-color: rgba($color: #0b58ff, $alpha: 1);
+        background-color: rgba($color: #0B58FF, $alpha: 1);
       }
     }
   }
-  .choicepat-navbar {
+  .choicepat-navbar{
     position: fixed;
     top: 0;
     left: 0;
@@ -222,23 +224,20 @@ export default {
     z-index: 10;
   }
 }
-::-webkit-scrollbar-track-piece {
-  //滚动条凹槽的颜色，还可以设置边框属性
-  background: rgba(255, 255, 255, 0.1);
+::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色，还可以设置边框属性
+  background: rgba(255, 255, 255, .1);
 }
-::-webkit-scrollbar {
-  //滚动条的宽度
-  width: 9px;
-  height: 9px;
+::-webkit-scrollbar {//滚动条的宽度
+  width:9px;
+  height:9px;
 }
-::-webkit-scrollbar-thumb {
-  //滚动条的设置
+::-webkit-scrollbar-thumb {//滚动条的设置
   background-color: #dddddd;
-  background-clip: padding-box;
-  min-height: 28px;
+  background-clip:padding-box;
+  min-height:28px;
   border-radius: 9px;
 }
 ::-webkit-scrollbar-thumb:hover {
-  background-color: #bbb;
+  background-color:#bbb;
 }
-</style>
+</style>

src/views/modules/job/schedule.vue

@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-job__schedule">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
         <el-form-item>
           <el-input v-model="dataForm.beanName" :placeholder="$t('schedule.beanName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+          <el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:schedule:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -200,3 +200,20 @@ export default {
   }
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/equipmentCurrentState.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<el-form-item>
 				<el-select v-model="dataForm.lineId" :placeholder="'产线'" clearable>
 					<el-option v-for="line in lineList" :key="line.code" :value="line.id" :label="line.name" />
@@ -12,7 +12,7 @@
 				</el-select>
 			</el-form-item>
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
 				<!-- <el-button v-if="$hasPermission('monitoring:equipmentgroup:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</el-form-item>
 		</el-form>
@@ -256,3 +256,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/equipmentEfficiency.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 设备效率分析 -->
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<!-- 工厂 -->
 			<el-form-item>
 				<!-- <el-select v-model="dataForm.factoryId" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-select> -->
@@ -41,7 +41,7 @@
 			</el-form-item>
 			<!-- 按钮 -->
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('search') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $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>
@@ -372,4 +372,18 @@ export default {
 .slide-to-left-enter-to {
 	transform: translateX(0);
 }
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
 </style>

src/views/modules/monitoring/equipmentException.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 设备效率分析 -->
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<!-- 月份 -->
 			<el-form-item>
 				<el-date-picker key="month-picker" v-model="rawTime" type="month" :placeholder="$t('prompt.month')" format="yyyy-MM" />
@@ -15,7 +15,7 @@
 
 			<!-- 按钮 -->
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('search') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $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>
@@ -49,7 +49,7 @@ const tableConfigs = [
 		name: i18n.t('index')
 	},
 	// { prop: 'time', name: '时间', filter: timeFilter },
-	{ prop: 'pdName', name: i18n.t('pl.name') },
+	{ prop: 'pdlName', name: i18n.t('pl.name') },
 	{ prop: 'wsName', name: i18n.t('ws.title') },
 	{ prop: 'eqName', name: i18n.t('eq.title') },
 	{ prop: 'mtbf', name: i18n.t('eq.mtbf'), width: 220 },
@@ -202,3 +202,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/equipmentGroup.vue

@@ -19,7 +19,7 @@
 			:max-height="calcMaxHeight(8)"
 			@operate-event="handleOperations"
 			@refreshDataList="getDataList"
-			@clickTopBtn="clickTopBtn" />
+			@clickTopBtn="clickTopBtn"
 		/>
 		<el-pagination
 			@size-change="sizeChangeHandle"

src/views/modules/monitoring/equipmentGroupAlarm.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm">
+		<el-form :inline="true" :model="dataForm" class="blueTip" size="small">
 			<el-form-item :label="$t('eq.groupname')">
 				<strong>{{ $route.params.groupName || '--' }}</strong></el-form-item
 			>
@@ -17,8 +17,8 @@
 				<el-input :placeholder="$t('alarm.code') + '/' + $t('alarm.content')" v-model="dataForm.key" clearable />
 			</el-form-item>
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
-				<el-button v-if="$route.params.id && $hasPermission('monitoring:equipmentgroupalarm:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+				<!-- <el-button v-if="$route.params.id && $hasPermission('monitoring:equipmentgroupalarm:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 				<!-- <el-button v-if="$hasPermission('monitoring:equipmentgroupalarm:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">
 					批量删除
 				</el-button> -->
@@ -26,6 +26,7 @@
 		</el-form>
 
 		<base-table
+	     	:top-btn-config="topBtnConfig"
 			:page="pageIndex"
 			:size="pageSize"
 			:data="dataList"
@@ -33,6 +34,7 @@
 			:max-height="calcMaxHeight(8)"
 			@operate-event="handleOperations"
 			@refreshDataList="getDataList"
+			@clickTopBtn="clickTopBtn"
 		/>
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -65,7 +67,12 @@ const dictEntries = {
 	alarmType: { value: '1557925215454814210', field: 'typeDictValue' }, // field 和下面 addOrUpdateConfigs 里对应
 	alarmLevel: { value: '1557925289517834242', field: 'gradeDictValue' }
 }
-
+const topBtnConfig = [
+	{
+		type: 'add',
+		btnName: i18n.t('add')
+	}
+]
 const tableConfigs = [
 	{
 		type: 'index',
@@ -76,7 +83,7 @@ const tableConfigs = [
 	{ prop: 'typeDictValue', name: i18n.t('alarm.type'), filter: dictFilter(dictEntries.alarmType.value) },
 	{ prop: 'gradeDictValue', name: i18n.t('alarm.level'), filter: dictFilter(dictEntries.alarmLevel.value) },
 	{ prop: 'alarmContent', name: i18n.t('alarm.content') },
-	// { prop: 'externalCode', name: i18n.t('alarm.externalCode') },
+	{ prop: 'externalCode', name: i18n.t('alarm.externalCode') },
 	{ prop: 'description', name: i18n.t('alarm.description') },
 	{ prop: 'remark', name: i18n.t('alarm.remark') },
 	{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
@@ -90,6 +97,7 @@ const addOrUpdateConfigs = {
 		{ name: 'typeDictValue', label: i18n.t('alarm.type'), type: 'select', options: [] },
 		{ name: 'gradeDictValue', label: i18n.t('alarm.level'), type: 'select', options: [] },
 		{ name: 'alarmContent', label: i18n.t('alarm.content'), required: true },
+		{ name: 'externalCode', label: i18n.t('alarm.externalCode') },
 		{ name: 'description', label: i18n.t('alarm.description') },
 		{ name: 'remark', label: i18n.t('alarm.remark') }
 		// { name: 'externalCode', label: i18n.t('alarm.externalCode') }
@@ -105,6 +113,7 @@ export default {
 	mixins: [dictListMixin],
 	data() {
 		return {
+			topBtnConfig,
 			addOrUpdateConfigs,
 			calcMaxHeight,
 			tableConfigs,
@@ -212,6 +221,17 @@ export default {
 				this.$refs.addOrUpdate.init(id)
 			})
 		},
+		clickTopBtn() {
+			this.addOrUpdateConfigs.operations.forEach(item => {
+				if (item.extraFields) {
+					item.extraFields.equipmentGroupId = this.$route.params.id || null
+				}
+			})
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init()
+			})
+		},
 		// 删除
 		deleteHandle(id) {
 			var ids = id
@@ -247,3 +267,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/equipmentPlc.vue

@@ -1,16 +1,16 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<el-form-item>
 				<el-input v-model="dataForm.key" :placeholder="$t('name') + ' / ' + $t('code')" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipmentplc:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:equipmentplc:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</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 :top-btn-config="topBtnConfig" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" @clickTopBtn="clickTopBtn"/>
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -35,7 +35,12 @@ 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'
-
+const topBtnConfig = [
+	{
+		type: 'add',
+		btnName: i18n.t('add')
+	}
+]
 const tableConfigs = [
 	{ type: 'index', width: 100, name: i18n.t('index') },
 	{ prop: 'code', name: i18n.t('code') },
@@ -83,6 +88,7 @@ const addOrUpdateConfigs = {
 export default {
 	data() {
 		return {
+			topBtnConfig,
 			tableConfigs,
 			calcMaxHeight,
 			addOrUpdateConfigs,
@@ -165,6 +171,12 @@ export default {
 				this.$refs.addOrUpdate.init(id)
 			})
 		},
+		clickTopBtn() {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init()
+			})
+		},
 		// 删除
 		deleteHandle(id) {
 			var ids = id
@@ -200,3 +212,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/equipmentPlcConnect.vue

@@ -1,16 +1,16 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<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="currentChangeHandle(1)">{{ $t('query') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipmentplcconnect:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:equipmentplcconnect:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</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 :top-btn-config="topBtnConfig" :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" @clickTopBtn="clickTopBtn"/>
 
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -38,7 +38,12 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
 import { dictFilter } from '@/utils/filters'
 // import axios from '@/utils/request.js'
-
+const topBtnConfig = [
+	{
+		type: 'add',
+		btnName: i18n.t('add')
+	}
+]
 const tableConfigs = [
 	{ type: 'index', width: 100, name: i18n.t('index') },
 	{ prop: 'lineName', name: i18n.t('pl.title') },
@@ -116,6 +121,7 @@ const addOrUpdateConfigs = {
 export default {
 	data() {
 		return {
+			topBtnConfig,
 			addOrUpdateConfigs,
 			calcMaxHeight,
 			tableConfigs,
@@ -229,6 +235,12 @@ export default {
 				this.$refs.addOrUpdate.init(id)
 			})
 		},
+		clickTopBtn() {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init()
+			})
+		},
 		// 删除
 		deleteHandle(id) {
 			var ids = id
@@ -264,3 +276,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/equipmentTimesequence.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 设备效率分析 -->
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"  class="blueTip" size="small">
 			<!-- 产线 -->
 			<el-form-item>
 				<el-select v-model="dataForm.productlines" :placeholder="'产线'" @change="handleProductLineChange" clearable>
@@ -22,7 +22,7 @@
 			</el-form-item>
 			<!-- 按钮 -->
 			<el-form-item>
-				<el-button @click="getDataList()">{{ $t('search') }}</el-button>
+				<el-button class="buttonColor" @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>
@@ -544,4 +544,18 @@ export default {
 /* .time-chart__inner {
 	transition: all 300ms ease-out;
 } */
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
 </style>

src/views/modules/monitoring/qualityInspectionBoxBtn.vue

@@ -1,17 +1,19 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
-			<!-- <el-form-item> -->
-			<!-- <el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input>
-			</el-form-item> -->
+		<el-form :inline="true" :model="dataForm" :rules="dataFormRules" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('search') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:qualityInspectionBoxBtn:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<!-- <el-input v-model="dataForm.key" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-input> -->
+				<el-input v-model="dataForm.key" :placeholder="$t('inspect.det')" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('search') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:qualityInspectionBoxBtn: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
+			:top-btn-config="topBtnConfig"
 			:page="pageIndex"
 			:size="pageSize"
 			:data="dataList"
@@ -19,7 +21,7 @@
 			:max-height="calcMaxHeight(8)"
 			@operate-event="handleOperations"
 			@refreshDataList="getDataList"
-		/>
+			@clickTopBtn="clickTopBtn" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -27,8 +29,7 @@
 			:page-sizes="[10, 20, 50, 100]"
 			:page-size="pageSize"
 			:total="totalPage"
-			layout="total, sizes, prev, pager, next, jumper"
-		></el-pagination>
+			layout="total, sizes, prev, pager, next, jumper"></el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
 		<add-or-update
 			v-if="addOrUpdateVisible"
@@ -36,8 +37,7 @@
 			:configs="addOrUpdateConfigs"
 			@refreshDataList="getDataList"
 			@select-change="handleDialogSelectChange"
-			@destory-dialog="handleDestroyDialog"
-		/>
+			@destory-dialog="handleDestroyDialog" />
 	</div>
 </template>
 
@@ -51,8 +51,14 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import CKEditor from 'ckeditor4-vue'
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
+import { iteratee } from 'lodash'
 // import Cookies from 'js-cookie'
-
+const topBtnConfig = [
+	{
+		type: 'add',
+		btnName: i18n.t('add')
+	}
+]
 const tableConfigs = [
 	{
 		type: 'index',
@@ -86,14 +92,55 @@ const addOrUpdateConfigs = {
 		{ name: 'sectionId', label: i18n.t('ws.title'), required: true, type: 'select', options: [] },
 		{ name: 'model', label: i18n.t('andeng.btnBoxModel') },
 		{
+			// name: 'keyValue',
+			// label: i18n.t('andeng.btnVal'),
+			// required: true,
+			// rules: [{ type: 'integer', trigger: 'blur', message: i18n.t('hints.integer'), transform: (val) => Number(val) }]
+
+			// keyValue: [
+			// 	{
+			// 		type: 'number',
+			// 		message: i18n.t('validate.keyValueWarning'),
+			// 		trigger: 'blur',
+			// 		transform(value) {
+			// 			if (value) {
+			// 				// 将输入的转为数字
+			// 				var val = Number(value)
+			// 				// 正则校验输入的数字是否在0-128之内并且属于整数
+			// 				if (/^(?:[1-9]?\d|128)$/.test(val)) return val
+			// 				// 返回false即为校验失败
+			// 				return false
+			// 			}
+			// 		}
+			// 	}
+			// ]
 			name: 'keyValue',
 			label: i18n.t('andeng.btnVal'),
 			required: true,
-			rules: [{ type: 'integer', trigger: 'blur', message: i18n.t('hints.integer'), transform: val => Number(val) }]
+			rules: [
+				{
+					type: 'integer',
+					trigger: 'blur',
+					message: i18n.t('validate.keyValueWarning'),
+					transform(value) {
+						if (value) {
+							// 将输入的转为数字
+							var val = Number(value)
+							// 正则校验输入的数字是否在[0-100]之内并且属于整数
+							if (/^(?:[1-9]?\d|100)$/.test(val)) return val
+							// 返回false即为校验失败
+							return false
+						}
+					}
+				}
+			]
 		},
 		{
 			name: 'inspectionDetContent',
-			label: i18n.t('andeng.inspectContent')
+			label: i18n.t('andeng.inspectContent'),
+			required: true,
+			type: 'select',
+			options: []
 		}
 	],
 	operations: [
@@ -116,11 +163,13 @@ const addOrUpdateConfigs = {
 export default {
 	data() {
 		return {
+			topBtnConfig,
 			calcMaxHeight,
 			tableConfigs,
 			addOrUpdateConfigs,
 			dataForm: {
-				key: ''
+				key: '',
+				inspectionDetId: ''
 			},
 			dataList: [],
 			pageIndex: 1,
@@ -128,7 +177,26 @@ export default {
 			totalPage: 0,
 			dataListLoading: false,
 			dataListSelections: [],
-			addOrUpdateVisible: false
+			addOrUpdateVisible: false,
+			dataFormRules: {
+				keyValue: [
+					{
+						type: 'number',
+						message: i18n.t('validate.keyValueWarning'),
+						trigger: 'blur',
+						transform(value) {
+							if (value) {
+								// 将输入的转为数字
+								var val = Number(value)
+								// 正则校验输入的数字是否在0-128之内并且属于整数
+								if (/^(?:[1-9]?\d|128)$/.test(val)) return val
+								// 返回false即为校验失败
+								return false
+							}
+						}
+					}
+				]
+			}
 		}
 	},
 	components: {
@@ -136,6 +204,7 @@ export default {
 		BaseTable
 	},
 	activated() {
+		this.getInspectionContentList()
 		this.getDataList()
 		this.getPlList()
 		this.getWsList()
@@ -153,9 +222,9 @@ export default {
 				url: this.$http.adornUrl('/monitoring/productionLine/list'),
 				method: 'get'
 			}).then(({ data: res }) => {
-				const plConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'productionId')
+				const plConfig = this.addOrUpdateConfigs.fields.find((item) => item.name === 'productionId')
 				plConfig.options =
-					res.data?.map(item => ({
+					res.data?.map((item) => ({
 						value: item.id,
 						label: item.name
 					})) || []
@@ -175,9 +244,9 @@ export default {
 				method: 'get',
 				params: this.$http.adornParams(params)
 			}).then(({ data: res }) => {
-				const wsConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'sectionId')
+				const wsConfig = this.addOrUpdateConfigs.fields.find((item) => item.name === 'sectionId')
 				wsConfig.options =
-					res.data?.list?.map(item => ({
+					res.data?.list?.map((item) => ({
 						value: item.id,
 						label: item.name
 					})) || []
@@ -194,9 +263,9 @@ export default {
 					// key: this.dataForm.key
 				})
 			}).then(({ data }) => {
-				const eqTypeConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentTypeId')
+				const eqTypeConfig = this.addOrUpdateConfigs.fields.find((item) => item.name === 'equipmentTypeId')
 				eqTypeConfig.options =
-					data.data?.list?.map(item => ({
+					data.data?.list?.map((item) => ({
 						value: item.id,
 						label: item.name
 					})) || []
@@ -213,9 +282,9 @@ export default {
 					// key: this.dataForm.key
 				})
 			}).then(({ data }) => {
-				const groupConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'groupId')
+				const groupConfig = this.addOrUpdateConfigs.fields.find((item) => item.name === 'groupId')
 				groupConfig.options =
-					data.data?.list?.map(item => ({
+					data.data?.list?.map((item) => ({
 						value: item.id,
 						label: item.name
 					})) || []
@@ -227,10 +296,11 @@ export default {
 			this.$http({
 				url: this.$http.adornUrl('/monitoring/qualityInspectionBoxBtn/page'),
 				method: 'get',
+				// key 查询
 				params: this.$http.adornParams({
 					page: this.pageIndex,
-					limit: this.pageSize
-					// key: this.dataForm.key
+					limit: this.pageSize,
+					key: this.dataForm.key
 				})
 			}).then(({ data }) => {
 				if (data && data.code === 0) {
@@ -245,6 +315,31 @@ export default {
 				this.dataListLoading = false
 			})
 		},
+		// 获取产检测内容列表
+		getInspectionContentList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/qualityInspectionDet/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					limit: 999,
+					page: 1
+				})
+			}).then(({ data: res }) => {
+				if (res && res.code === 0) {
+					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 }))
+						// console.log('item',item)
+					})
+				} else {
+					this.addOrUpdateConfigs.fields.forEach((item) => {
+						if (item.name === 'inspectionDetContent') item.options.splice(0)
+					})
+				}
+			})
+		},
 		// 每页数
 		sizeChangeHandle(val) {
 			this.pageSize = val
@@ -265,6 +360,18 @@ export default {
 			switch (name) {
 				case 'productionId':
 					this.getWsList(id)
+				case 'inspectionDetContent':
+					// this.dataForm.inspectionDetId = id
+					// console.log(id)
+					// console.log(this.addOrUpdateConfigs.fields[4].options)
+					for (var i = 0; i < this.addOrUpdateConfigs.fields[4].options.length; i++) {
+						if (this.addOrUpdateConfigs.fields[4].options[i].label == id) {
+							this.dataForm.inspectionDetId = this.addOrUpdateConfigs.fields[4].options[i].inspectionDetId
+							this.addOrUpdateConfigs.fields.inspectionDetId = this.addOrUpdateConfigs.fields[4].options[i].inspectionDetId
+						}
+					}
+					console.log('dataForm', this.dataForm)
+					console.log('addOrUpdateConfigs', this.addOrUpdateConfigs.fields)
 			}
 		},
 		handleOperations({ type, data: id }) {
@@ -292,7 +399,7 @@ export default {
 				url: this.$http.adornUrl('/monitoring/equipment/export'),
 				method: 'get',
 				responseType: 'blob'
-			}).then(res => {
+			}).then((res) => {
 				let fileName = 'equipment-list.xls'
 				if (res.headers['content-disposition']) {
 					const contentDisposition = res.headers['content-disposition']
@@ -331,11 +438,17 @@ export default {
 			// 	}
 			// })
 		},
+		clickTopBtn() {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init()
+			})
+		},
 		// 删除
 		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'), {
@@ -366,3 +479,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/qualityInspectionCurrent.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" @keyup.enter.native="getDataList()">
+		<el-form :inline="true" @keyup.enter.native="getDataList()" class="blueTip" size="small">
 			<el-form-item>
 				<!-- type="datetimerange" -->
 				<el-date-picker
@@ -16,7 +16,7 @@
 				/>
 			</el-form-item>
 			<el-form-item>
-				<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+				<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
 				<!-- <el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</el-form-item>
 		</el-form>

src/views/modules/monitoring/qualityInspectionDet.vue

@@ -1,16 +1,16 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<el-form-item>
 				<el-input v-model="dataForm.key" :placeholder="$t('inspect.det')" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:qualityinspectiondet:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:qualityinspectiondet:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</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 :top-btn-config="topBtnConfig" :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" @clickTopBtn="clickTopBtn"/>
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -35,7 +35,12 @@ 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'
-
+const topBtnConfig = [
+	{
+		type: 'add',
+		btnName: i18n.t('add')
+	}
+]
 const tableConfigs = [
 	{
 		type: 'index',
@@ -68,6 +73,7 @@ const addOrUpdateConfigs = {
 export default {
 	data() {
 		return {
+			topBtnConfig,
 			calcMaxHeight,
 			addOrUpdateConfigs,
 			tableConfigs,
@@ -172,6 +178,12 @@ export default {
 				this.$refs.addOrUpdate.init(id)
 			})
 		},
+		clickTopBtn() {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init()
+			})
+		},
 		// 删除
 		deleteHandle(id) {
 			var ids = id
@@ -207,3 +219,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/qualityInspectionRecord.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<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" />
@@ -10,12 +10,13 @@
 				<el-input v-model="dataForm.key" :placeholder="$t('inspect.det')" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</el-form-item>
 		</el-form>
 
 		<base-table
+	    	:top-btn-config="topBtnConfig"
 			:page="pageIndex"
 			:size="pageSize"
 			:data="dataList"
@@ -23,6 +24,7 @@
 			:max-height="calcMaxHeight(8)"
 			@operate-event="handleOperations"
 			@refreshDataList="getDataList"
+			@clickTopBtn="clickTopBtn"
 		/>
 
 		<el-pagination
@@ -57,7 +59,12 @@ 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'
-
+const topBtnConfig = [
+	{
+		type: 'add',
+		btnName: i18n.t('add')
+	}
+]
 const tableConfigs = [
 	{
 		type: 'index',
@@ -111,6 +118,7 @@ const addOrUpdateConfigs = {
 export default {
 	data() {
 		return {
+			topBtnConfig,
 			calcMaxHeight,
 			addOrUpdateConfigs,
 			tableConfigs,
@@ -271,6 +279,12 @@ export default {
 				this.$refs.addOrUpdate.init(id)
 			})
 		},
+		clickTopBtn() {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init()
+			})
+		},
 		// 删除
 		deleteHandle(id) {
 			var ids = id
@@ -306,3 +320,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/qualityInspectionType.vue

@@ -1,16 +1,17 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)"  class="blueTip" size="small">
 			<el-form-item>
 				<el-input v-model="dataForm.key" :placeholder="$t('inspect.typename')" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:qualityinspectiontype:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:qualityinspectiontype:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</el-form-item>
 		</el-form>
 
 		<base-table
+		    :top-btn-config="topBtnConfig"
 			:page="pageIndex"
 			:size="pageSize"
 			:data="dataList"
@@ -18,6 +19,7 @@
 			:max-height="calcMaxHeight(8)"
 			@operate-event="handleOperations"
 			@refreshDataList="getDataList"
+			@clickTopBtn="clickTopBtn"
 		/>
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -43,6 +45,12 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
+const topBtnConfig = [
+	{
+		type: 'add',
+		btnName: i18n.t('add')
+	}
+]
 const tableConfigs = [
 	{
 		type: 'index',
@@ -73,6 +81,7 @@ const addOrUpdateConfigs = {
 export default {
 	data() {
 		return {
+			topBtnConfig,
 			calcMaxHeight,
 			addOrUpdateConfigs,
 			tableConfigs,
@@ -155,6 +164,13 @@ export default {
 				this.$refs.addOrUpdate.init(id)
 			})
 		},
+		// 新增按钮
+		clickTopBtn() {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init()
+			})
+		},
 		// 删除
 		deleteHandle(id) {
 			var ids = id
@@ -190,3 +206,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/realtimeEquipment.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-01-03 10:18:14
  * @Description: 设备生产实时数据
 -->
 <template>
@@ -59,6 +59,7 @@ export default {
 				}
 			})
 		}, 1000 * 60 * 5)
+		console.log(this.tableProps)
 	},
 	// beforeDestroy() {
 	// 	console.log('before destroyed...')

src/views/modules/monitoring/reportCategory.vue

@@ -1,16 +1,16 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<el-form-item>
 				<el-input v-model="dataForm.name" :placeholder="$t('categoryName')" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
-				<el-button v-if="$hasPermission('monitoring:reportsheetcategory:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:reportsheetcategory:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
 			</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 :top-btn-config="topBtnConfig" :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" @clickTopBtn="clickTopBtn"/>
 
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -36,6 +36,12 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
+const topBtnConfig = [
+	{
+		type: 'add',
+		btnName: i18n.t('add')
+	}
+]
 const tableConfigs = [
 	{
 		type: 'index',
@@ -60,6 +66,7 @@ const addOrUpdateConfigs = {
 export default {
 	data() {
 		return {
+			topBtnConfig,
 			calcMaxHeight,
 			tableConfigs,
 			addOrUpdateConfigs,
@@ -141,6 +148,12 @@ export default {
 				this.$refs.addOrUpdate.init(id)
 			})
 		},
+		clickTopBtn() {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init()
+			})
+		},
 		// 删除
 		deleteHandle(id) {
 			var ids = id
@@ -176,3 +189,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/monitoring/reportDetail.vue

@@ -1,17 +1,17 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
 			<el-form-item>
 				<el-input v-model="dataForm.name" :placeholder="$t('report.name')" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
-				<el-button @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
+				<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button>
 				<!-- <el-button v-if="$hasPermission('')" type="primary" @click="addOrUpdateHandle()">新增(跳到设计)</el-button> -->
-				<el-button v-if="$hasPermission('monitoring:reportsheet:save')" type="primary" @click="handleAdd()">{{ $t('add') }}</el-button>
+				<!-- <el-button v-if="$hasPermission('monitoring:reportsheet:save')" type="primary" @click="handleAdd()">{{ $t('add') }}</el-button> -->
 			</el-form-item>
 		</el-form>
 
-		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table :top-btn-config="topBtnConfig" :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" @clickTopBtn="clickTopBtn"/>
 
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -37,7 +37,12 @@ import i18n from '@/i18n'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import axios from '@/utils/request'
-
+const topBtnConfig = [
+	{
+		type: 'add',
+		btnName: i18n.t('add')
+	}
+]
 const CategoryList = {
 	name: 'CategoryList',
 	props: {
@@ -93,6 +98,7 @@ const addOrUpdateConfigs = {
 export default {
 	data() {
 		return {
+			topBtnConfig,
 			addOrUpdateConfigs,
 			tableConfigs: [],
 			dataForm: {
@@ -233,6 +239,11 @@ export default {
 				name: 'monitoring-reportDesign'
 			})
 		},
+		clickTopBtn() {
+			this.$router.push({
+				name: 'monitoring-reportDesign'
+			})
+		},
 		addOrUpdateHandle(id) {
 			console.log('edit:', id)
 			this.addOrUpdateVisible = true
@@ -275,3 +286,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/oss/oss.vue

@@ -1,7 +1,15 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: fzq
+ * @Date: 2022-11-25 09:51:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-01-03 11:21:36
+-->
 <template>
 	<el-card shadow="never" class="aui-card--fill">
 		<div class="mod-oss__oss">
-			<el-form :inline="true" :model="dataForm">
+			<el-form :inline="true" :model="dataForm" size="small">
 				<el-form-item>
 					<el-button type="primary" @click="configHandle()">{{ $t('oss.config') }}</el-button>
 				</el-form-item>

src/views/modules/sys/dept.vue

@@ -1,7 +1,15 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: fzq
+ * @Date: 2022-11-25 09:51:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-01-03 11:23:41
+-->
 <template>
 	<el-card shadow="never" class="aui-card--fill">
 		<div class="mod-sys__dept">
-			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" size="small">
 				<el-form-item>
 					<el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
 				</el-form-item>

src/views/modules/sys/log-login.vue

@@ -1,7 +1,15 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: fzq
+ * @Date: 2022-11-25 09:51:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-01-03 11:13:55
+-->
 <template>
 	<el-card shadow="never" class="aui-card--fill">
 		<div class="mod-sys__log-login">
-			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"  class="blueTip" size="small">
 				<el-form-item>
 					<el-input v-model="dataForm.creatorName" :placeholder="$t('logLogin.creatorName')" clearable></el-input>
 				</el-form-item>
@@ -13,7 +21,7 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item>
-					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+					<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
 				</el-form-item>
 				<el-form-item>
 					<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -70,3 +78,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/sys/log-operation.vue

@@ -1,7 +1,15 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: fzq
+ * @Date: 2022-11-25 09:51:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-01-03 11:15:45
+-->
 <template>
 	<el-card shadow="never" class="aui-card--fill">
 		<div class="mod-sys__log-operation">
-			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"  class="blueTip" size="small">
 				<el-form-item>
 					<el-select v-model="dataForm.status" :placeholder="$t('logOperation.status')" clearable>
 						<el-option :label="$t('logOperation.status0')" :value="0"></el-option>
@@ -9,7 +17,7 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item>
-					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+					<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
 				</el-form-item>
 				<el-form-item>
 					<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -75,3 +83,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/sys/menu.vue

@@ -1,9 +1,17 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: fzq
+ * @Date: 2022-11-25 09:51:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-01-03 11:17:22
+-->
 <template>
 	<el-card shadow="never" class="aui-card--fill">
 		<div class="mod-sys__menu">
-			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" size="small">
 				<el-form-item>
-					<el-button v-if="$hasPermission('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+					<el-button class="buttonColor" v-if="$hasPermission('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
 				</el-form-item>
 			</el-form>
 			<el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">

src/views/modules/sys/params.vue

@@ -1,12 +1,20 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: fzq
+ * @Date: 2022-11-25 09:51:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-01-03 11:19:31
+-->
 <template>
 	<el-card shadow="never" class="aui-card--fill">
 		<div class="mod-sys__params">
-			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"  class="blueTip" size="small">
 				<el-form-item>
 					<el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')" clearable></el-input>
 				</el-form-item>
 				<el-form-item>
-					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+					<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
 				</el-form-item>
 				<el-form-item>
 					<el-button v-if="$hasPermission('sys:params:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -66,3 +74,20 @@ export default {
 	}
 }
 </script>
+
+<style>
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 24px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 4px;
+}
+.buttonColor {
+	color: #fff;
+	background: #0b58ff;
+}
+</style>

src/views/modules/sys/role.vue

@@ -1,12 +1,20 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: fzq
+ * @Date: 2022-11-25 09:51:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-01-03 11:24:35
+-->
 <template>
 	<el-card shadow="never" class="aui-card--fill">
 		<div class="mod-sys__role">
-			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" class="blueTip" size="small">
 				<el-form-item>
 					<el-input v-model="dataForm.name" :placeholder="$t('role.name')" clearable></el-input>
 				</el-form-item>
 				<el-form-item>
-					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+					<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
 				</el-form-item>
 				<el-form-item>
 					<el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>

src/views/modules/sys/user.vue

@@ -1,7 +1,15 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: fzq
+ * @Date: 2022-11-25 09:51:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2023-01-03 11:22:15
+-->
 <template>
 	<el-card shadow="never" class="aui-card--fill">
 		<div class="mod-sys__user">
-			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" class="blueTip" size="small">
 				<el-form-item>
 					<el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable></el-input>
 				</el-form-item>
@@ -12,7 +20,7 @@
 					<ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true"></ren-dept-tree>
 				</el-form-item>
 				<el-form-item>
-					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+					<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
 				</el-form-item>
 				<el-form-item>
 					<el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>