From 7fe7b6182c2d407d28c2c9da1c070c3ce964e3e7 Mon Sep 17 00:00:00 2001 From: zhuguifei <zhuguifei@zhuguifeideiMac.local> Date: 星期二, 20 五月 2025 10:49:14 +0800 Subject: [PATCH] 1.移动端添加自定义navbar导航栏 --- eims-ui-mobile/src/pages/inspect/insp-st.vue | 48 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 13 deletions(-) diff --git a/eims-ui-mobile/src/pages/inspect/insp-st.vue b/eims-ui-mobile/src/pages/inspect/insp-st.vue index 2499379..9e495be 100644 --- a/eims-ui-mobile/src/pages/inspect/insp-st.vue +++ b/eims-ui-mobile/src/pages/inspect/insp-st.vue @@ -1,6 +1,7 @@ <route lang="json5" type="page"> { layout: 'default', + needLogin: true, style: { navigationBarTitleText: '鐐规姹囨��', }, @@ -12,12 +13,15 @@ <template #top> <wd-drop-menu> <wd-drop-menu-item v-model="viewMode" :options="viewModeList" @change="handleViewMode" /> + <wd-drop-menu-item + v-model="filterDate" + :options="filterDateList" + @change="handleFilterDate" + /> <wd-drop-menu-item v-model="equName" :options="equList" @change="handleEquName" /> </wd-drop-menu> - <wd-divider></wd-divider> </template> <view class="bg-base"> - <view class="w-full h-[24rpx]"></view> <wd-card type="rectangle" v-for="(item, index) in dataList" :key="item.id"> <template #title> <view class="flex justify-between"> @@ -36,7 +40,7 @@ </view> </view> </template> - <view class="flex h-[100rpx]" items-center> + <view class="flex h-[140rpx]" items-center> <image class="slot-img text-center" src="/static/images/camera.png" /> <view class="flex-1"> <view class="text-color-gray text-xs mt-1 flex"> @@ -54,7 +58,7 @@ <view class="text-color-gray text-xs mt-2 flex"> <text>鐘舵�侊細</text> <template v-if="item.recordCount === item.checkCount"> - <wd-icon class="icon-color-success" name="check-outline" size="40rpx"></wd-icon> + <wd-icon class="icon-color-success" name="check-outline" size="34rpx"></wd-icon> <text class="ml-1">宸插畬鎴�</text> </template> <template v-else> @@ -62,6 +66,7 @@ <text class="ml-1">杩涜涓�</text> </template> </view> + <view class="text-color-gray text-xs mt-2 flex">鍒涘缓鏃堕棿: {{ item.createTime }}</view> </view> <wd-button size="small" icon="edit-outline" @click.stop="itemClick(item)">鏄庣粏</wd-button> </view> @@ -73,15 +78,21 @@ <script setup lang="ts"> import { ref } from 'vue' import { getInspStList } from '@/service/inspect' -import { onShow } from '@dcloudio/uni-app' +import dayjs from 'dayjs' const viewMode = ref<string>('Day') const equName = ref<string>('鎵�鏈夎澶�') +const filterDate = ref<string>('1') const viewModeList = ref<Record<string, any>[]>([ { label: '鏃ヨ鍥�', value: 'Day' }, { label: '鏈堣鍥�', value: 'Month' }, ]) +const filterDateList = ref<Record<string, any>[]>([ + { label: '鎵�鏈夋暟鎹�', value: '0' }, + { label: '褰撳ぉ(鏈�)鏁版嵁', value: '1' }, +]) + const equList = ref<Record<string, any>[]>([{ label: '鎵�鏈夎澶�', value: '鎵�鏈夎澶�' }]) function handleViewMode({ value }) { reloadData() @@ -89,17 +100,28 @@ function handleEquName({ value }) { console.log(value) } +function handleFilterDate({ value }) { + reloadData() +} const paging = ref(null) const dataList = ref([]) const queryList = (pageNum?: number, pageSize?: number) => { - // 杩欓噷鐨刾ageNo鍜宲ageSize浼氳嚜鍔ㄨ绠楀ソ锛岀洿鎺ヤ紶缁欐湇鍔″櫒鍗冲彲 - // 杩欓噷鐨勮姹傚彧鏄紨绀猴紝璇锋浛鎹㈡垚鑷繁鐨勯」鐩殑缃戠粶璇锋眰锛屽苟鍦ㄧ綉缁滆姹傚洖璋冧腑閫氳繃paging.value.complete(璇锋眰鍥炴潵鐨勬暟缁�)灏嗚姹傜粨鏋滀紶缁檢-paging - getInspStList({ pageNum, pageSize, viewMode: viewMode.value }) + const params: any = { + pageNum, + pageSize, + viewMode: viewMode.value, + } + if (filterDate.value === '1') { + params.planTime = dayjs().format('YYYY-MM-DD') + } else { + delete params.planTime + } + getInspStList(params) .then((res: any) => { // 璇峰嬁鍦ㄧ綉缁滆姹傚洖璋冧腑缁檇ataList璧嬪�硷紒锛佸彧闇�瑕佽皟鐢╟omplete灏卞彲浠ヤ簡 - paging.value.complete(res.rows) + paging.value.completeByTotal(res.rows, res.total) }) .catch((res) => { // 濡傛灉璇锋眰澶辫触鍐檖aging.value.complete(false)锛屼細鑷姩灞曠ず閿欒椤甸潰 @@ -110,9 +132,10 @@ } function itemClick(item) { - const inspCode = `${item.equId}_${item.planTime}_${viewMode.value}` + // const inspCode = `${item.equId}_${item.planTime}_${viewMode.value}` uni.navigateTo({ - url: `/pages/inspect/insp-record?id=${item.id}&inspCode=${inspCode}&specialNote=${item.specialNote ?? ''}&equName=${item.equName ?? ''}&assetNo=${item.assetNo ?? ''}&planTimeStr=${item.planTimeStr ?? ''}`, + // url: `/pages/inspect/insp-record?id=${item.id}&createTime=${item.createTime}&inspCode=${inspCode}&specialNote=${item.specialNote ?? ''}&equName=${item.equName ?? ''}&assetNo=${item.assetNo ?? ''}&planTimeStr=${item.planTimeStr ?? ''}`, + url: `/pages/inspect/insp-record?id=${item.id}&viewMode=${viewMode.value}`, }) } @@ -120,11 +143,10 @@ paging.value.reload() } onLoad(() => { - queryList() uni.$on('insp-st-refresh', reloadData) }) onUnload(() => { - uni.$off('insp-st-refres', reloadData) + uni.$off('insp-st-refresh', reloadData) }) </script> -- Gitblit v1.9.3