Merge pull request 'fzq' (#32) from fzq into develop

Reviewed-on: #32

src/views/modules/monitoring/equipmentCurrentState.vue

@@ -165,7 +165,11 @@ export default {
 		getEqList() {
 			this.$http({
 				url: this.$http.adornUrl('/monitoring/equipment/page'),
-				method: 'get'
+				method: 'get',
+				params: this.$http.adornParams({
+					limit: 99999,
+					page: 1
+				})
 			}).then(({ data }) => {
 				if (data && data.code === 0) {
 					this.eqList = data.data.list

src/views/modules/monitoring/equipmentEfficiency.vue

@@ -207,7 +207,7 @@ export default {
 					this.factoryList = res.data
 					/** set default */
 					if (this.factoryList.length) {
-						this.dataForm.ftId = this.factoryList[0].id
+						// this.dataForm.ftId = this.factoryList[0].id
 					}
 				} else {
 					this.factoryList = []
@@ -236,7 +236,7 @@ export default {
 				if (res && res.code === 0 && res.data.length) {
 					this.productLineList = res.data
 					/** set default */
-					this.dataForm.productlines = [this.productLineList[0].id]
+					// this.dataForm.productlines = [this.productLineList[0].id]
 				} else {
 					this.productLineList = []
 					this.dataForm.productlines = []

src/views/modules/monitoring/equipmentPlcConnect.vue

@@ -165,6 +165,8 @@ export default {
 					// page: this.pageIndex,
 					// limit: this.pageSize,
 					// key: this.dataForm.key
+					limit: 99999,
+					page: 1
 				})
 			}).then(({ data }) => {
 				const eqConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'equipmentId')
@@ -180,6 +182,8 @@ export default {
 					// page: this.pageIndex,
 					// limit: this.pageSize,
 					// key: this.dataForm.key
+					limit: 99999,
+					page: 1
 				})
 			}).then(({ data }) => {
 				const plcConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'plcId')

src/views/modules/monitoring/productAnalysis.vue

@@ -716,4 +716,14 @@ export default {
 	color: #fff;
 	background: #0b58ff;
 }
+.el-month-table td.today .cell {
+    font-weight: normal;
+    color: #000 !important;
+ }
+  .el-month-table td.current:not(.disabled) .cell{
+    color: #ffffff;
+    font-weight: bold !important;
+    background-color: var(--el-datepicker-active-color);
+    border-radius: 100px;
+  }
 </style>