设备管理

src/views/equipment/analysis/efficiency/index.vue

@@ -13,14 +13,21 @@
 			ref="search-bar"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<el-row>
+		<base-table
+			class="base-table__margin"
+			:table-props="tableProps"
+			:page="1"
+			:limit="10"
+			:table-data="list"
+			@emitFun="handleEmitFun" />
+
+		<!-- <el-row>
 			<el-col class="custom-tabs">
 				<el-tabs
 					v-model="activeName"
 					:stretch="true"
 					@tab-click="handleTabClick">
 					<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
-						<!-- 列表 -->
 						<base-table
 							class="base-table__margin"
 							:table-props="tableProps"
@@ -74,14 +81,13 @@
 										v-for="item in list"
 										:key="item.id"
 										:value="item" />
-									<!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
 								</div>
 							</div>
 						</div>
 					</el-tab-pane>
 				</el-tabs>
 			</el-col>
-		</el-row>
+		</el-row> -->
 	</div>
 </template>
 
@@ -132,7 +138,7 @@ export default {
 							width: 128,
 							prop: 'workRate',
 							label: '百分比[%]',
-							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+							filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 						},
 					],
 				},
@@ -161,7 +167,7 @@ export default {
 							width: 128,
 							prop: 'timeEfficiency',
 							label: '时间开动率',
-							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+							filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 						},
 					],
 				},
@@ -182,19 +188,19 @@ export default {
 							width: 128,
 							prop: 'peEfficiency',
 							label: '速度开动率',
-							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+							filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 						},
 					],
 				},
 				{
 					prop: 'oee',
 					label: 'OEE',
-					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+					filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 				},
 				{
 					prop: 'teep',
 					label: 'TEEP',
-					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+					filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 				},
 				// {
 				// 	_action: 'view-trend',
@@ -332,7 +338,7 @@ export default {
 		/** 准备工厂数据 */
 		async getFactory() {
 			const { code, data } = await this.$axios({
-				url: '/base/factory/listAll',
+				url: '/base/core-factory/listAll',
 				method: 'get',
 			});
 			if (code == 0) {
@@ -348,7 +354,7 @@ export default {
 		/** 准备产线数据 */
 		async getLine() {
 			const { code, data } = await this.$axios({
-				url: '/base/production-line/listAll',
+				url: '/base/core-production-line/listAll',
 				method: 'get',
 			});
 			if (code == 0) {