Merge remote-tracking branch 'origin/features/fuelPage' into code

# Conflicts:
#	admin.ui.plus-master/src/views/admin/statement/listOfOilEngines/index.vue

admin.ui.plus-master/src/views/admin/statement/listOfOilEngines/index.vue

@@ -177,23 +177,6 @@ const flattenObject = (obj, parentKey = '') => {
 
   return result;
 }
-/**初始化 */
-const init = async () => {
-  oilEngineData.loading = true
-  const query = flattenObject({ filterModel: oilEngineData.filterModel})
-  const res:any = await new ListOfOilEnginesApi().getPage({...oilEngineData.pageInput, filter:oilEngineData.filterModel})
-  oilEngineData.tableModel = res?.data?.list ?? []
-  oilEngineData.total = res?.data?.total ?? 0
-  oilEngineData.loading = false
-}
-/**重置查询条件 */
-const resetQuery = () => {
-  oilEngineData.filterModel.name = ''
-  oilEngineData.filterModel.gasStation = ''
-  oilEngineData.filterModel.model = ''
-  oilEngineData.filterModel.deviceStatus = ''
-  oilEngineData.filterModel.onlineStatus = ''
-}
 
 /**重置 */
 const onReset = () => {
@@ -234,6 +217,23 @@ const getOilEngineStatus = (val) => {
     return val
   }
 }
+/**初始化 */
+const init = async () => {
+  oilEngineData.loading = true
+  const query = flattenObject({ filterModel: oilEngineData.filterModel})
+  const res:any = await new ListOfOilEnginesApi().getPage({...oilEngineData.pageInput, filter:oilEngineData.filterModel})
+  oilEngineData.tableModel = res?.data?.list ?? []
+  oilEngineData.total = res?.data?.total ?? 0
+  oilEngineData.loading = false
+}
+/**重置查询条件 */
+const resetQuery = () => {
+  oilEngineData.filterModel.name = ''
+  oilEngineData.filterModel.gasStation = ''
+  oilEngineData.filterModel.model = ''
+  oilEngineData.filterModel.deviceStatus = ''
+  oilEngineData.filterModel.onlineStatus = ''
+}
 
 //设置不同设备状态、在线状态字体颜色
 const getColor = (value: string): string => {
@@ -247,6 +247,16 @@ const getColor = (value: string): string => {
     return '#F34D37'
   }
 }
+// /**油机列表 - 列表状态 */
+// const getOilEngineStatusType = (val) => {
+//   val = String(val)
+//   if(oilEngineStatusType.value?.has(val)){
+//     return oilEngineStatusType.value.get(val)
+//   }else {
+//     return val
+//   }
+// }
+
 
 onMounted(() => {
   init()