1
0

6 Komitmen 59902ee816 ... 4c52a27f36

Pembuat SHA1 Pesan Tanggal
  xu 4c52a27f36 Merge remote-tracking branch 'origin/features/fuelPage' into code 1 tahun lalu
  DOVER-GLOBAL\10090792 da41db3d7d style(登录页面):增加版本号 1 tahun lalu
  DOVER-GLOBAL\10090792 706f323cbf style(数据可视化、油机SDK授权页面、油机列表):修改页面基础样式 1 tahun lalu
  DOVER-GLOBAL\10090792 1269782a92 style(油机列表):新增“加油站”搜索框,新增“设备状态”、“在线状态”搜索框下拉框选项 1 tahun lalu
  DOVER-GLOBAL\10090792 5cb977c7c0 feat(油机SDK授权页面):新增批量审核功能 1 tahun lalu
  DOVER-GLOBAL\10090792 4468b0e56c style(部件类型):修改"添加"按钮位置 1 tahun lalu

+ 27 - 17
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()