From 97f070fac6aea53df2b8cc657799ee964d67283d Mon Sep 17 00:00:00 2001 From: mengfanliang Date: Fri, 30 Aug 2024 17:28:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BB=B6=E6=97=B6?= =?UTF-8?q?=E7=9B=91=E7=81=AB=E7=9A=84=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 12 ++ .../confined_space/gas/add.vue | 4 +- .../hot_work/delay_fire_monitoring/detail.vue | 97 +++++++++++++++ .../hot_work/delay_fire_monitoring/list.vue | 116 ++++++++++++++++++ pages/eight_assignments/hot_work/gas/add.vue | 104 ++++++++++++++++ pages/eight_assignments/hot_work/gas/list.vue | 72 +++++------ pages/eight_assignments/hot_work/gas/name.vue | 13 ++ pages/eight_assignments/subordinate_index.vue | 12 +- static/icon-apps/i12.png | Bin 0 -> 9032 bytes 9 files changed, 385 insertions(+), 45 deletions(-) create mode 100644 pages/eight_assignments/hot_work/delay_fire_monitoring/detail.vue create mode 100644 pages/eight_assignments/hot_work/delay_fire_monitoring/list.vue create mode 100644 static/icon-apps/i12.png diff --git a/pages.json b/pages.json index 8c913ba..b6b705e 100644 --- a/pages.json +++ b/pages.json @@ -308,6 +308,18 @@ "navigationBarTitleText": "已办" } }, + { + "path": "pages/eight_assignments/hot_work/delay_fire_monitoring/list", + "style": { + "navigationBarTitleText": "延时监火" + } + }, + { + "path": "pages/eight_assignments/hot_work/delay_fire_monitoring/detail", + "style": { + "navigationBarTitleText": "动火审批表" + } + }, { "path": "pages/eight_assignments/security_measures", "style": { diff --git a/pages/eight_assignments/confined_space/gas/add.vue b/pages/eight_assignments/confined_space/gas/add.vue index f1a8959..2093eb4 100644 --- a/pages/eight_assignments/confined_space/gas/add.vue +++ b/pages/eight_assignments/confined_space/gas/add.vue @@ -119,7 +119,9 @@ export default { }) uni.$u.toast('保存成功') setTimeout(() => { - uni.navigateBack() + uni.switchTab({ + url: '/pages/index/index' + }) }, 2000) } catch { } diff --git a/pages/eight_assignments/hot_work/delay_fire_monitoring/detail.vue b/pages/eight_assignments/hot_work/delay_fire_monitoring/detail.vue new file mode 100644 index 0000000..e995265 --- /dev/null +++ b/pages/eight_assignments/hot_work/delay_fire_monitoring/detail.vue @@ -0,0 +1,97 @@ + + + + + \ No newline at end of file diff --git a/pages/eight_assignments/hot_work/delay_fire_monitoring/list.vue b/pages/eight_assignments/hot_work/delay_fire_monitoring/list.vue new file mode 100644 index 0000000..857b122 --- /dev/null +++ b/pages/eight_assignments/hot_work/delay_fire_monitoring/list.vue @@ -0,0 +1,116 @@ + + + + + + \ No newline at end of file diff --git a/pages/eight_assignments/hot_work/gas/add.vue b/pages/eight_assignments/hot_work/gas/add.vue index e69de29..264dab6 100644 --- a/pages/eight_assignments/hot_work/gas/add.vue +++ b/pages/eight_assignments/hot_work/gas/add.vue @@ -0,0 +1,104 @@ + + + + + \ No newline at end of file diff --git a/pages/eight_assignments/hot_work/gas/list.vue b/pages/eight_assignments/hot_work/gas/list.vue index deecb28..9d23ee6 100644 --- a/pages/eight_assignments/hot_work/gas/list.vue +++ b/pages/eight_assignments/hot_work/gas/list.vue @@ -3,34 +3,21 @@ - 分析时间:{{ item.ANALYZE_TIME }} + 动火分析时间: {{ item.GAS_TIME }} - 分析地点:{{ item.ANALYZE_PLACE }} - - - {{ GAS_NAME1 }}:{{ item.DATA1 }} - - - {{ GAS_NAME2 }}:{{ item.DATA2 }} - - - {{ GAS_NAME3 }}:{{ item.DATA3 }} - - - {{ GAS_NAME4 }}:{{ item.DATA4 }} + 分析点名称: {{ item.GAS_NAME }} - 含氧量:{{ item.OXYGEN_CONTENT }} + 分析数据(%LEL): {{ item.GAS_NUMBER }} - 分析人:{{ item.ANALYZE_USER_NAME }} + 分析人:{{ item.userName }} - + @@ -45,34 +32,28 @@ import { getHotWorkGasInfo, getHotWorkGasDelete } from "@/api"; export default { data() { return { - GAS_NAME1: '', - GAS_NAME2: '', - GAS_NAME3: '', - GAS_NAME4: '', - EW_RU_TASK_ID: '', - EW_RU_JOB_ID: '', list: [] } }, onLoad(query) { - this.GAS_NAME1 = query.GAS_NAME1; - this.GAS_NAME2 = query.GAS_NAME2; - this.GAS_NAME3 = query.GAS_NAME3; - this.GAS_NAME4 = query.GAS_NAME4; - this.EW_RU_TASK_ID = query.EW_RU_TASK_ID; - this.EW_RU_JOB_ID = query.EW_RU_JOB_ID; + // this.GAS_NAME1 = query.GAS_NAME1; + // this.GAS_NAME2 = query.GAS_NAME2; + // this.GAS_NAME3 = query.GAS_NAME3; + // this.GAS_NAME4 = query.GAS_NAME4; + // this.EW_RU_TASK_ID = query.EW_RU_TASK_ID; + // this.EW_RU_JOB_ID = query.EW_RU_JOB_ID; }, onNavigationBarButtonTap(e) { if (e.index === 0) { uni.$u.route({ url: '/pages/eight_assignments/hot_work/gas/add', params: { - GAS_NAME1: this.GAS_NAME1, - GAS_NAME2: this.GAS_NAME2, - GAS_NAME3: this.GAS_NAME3, - GAS_NAME4: this.GAS_NAME4, - EW_RU_TASK_ID: this.EW_RU_TASK_ID, - EW_RU_JOB_ID: this.EW_RU_JOB_ID, + // GAS_NAME1: this.GAS_NAME1, + // GAS_NAME2: this.GAS_NAME2, + // GAS_NAME3: this.GAS_NAME3, + // GAS_NAME4: this.GAS_NAME4, + // EW_RU_TASK_ID: this.EW_RU_TASK_ID, + // EW_RU_JOB_ID: this.EW_RU_JOB_ID, } }) } @@ -82,12 +63,19 @@ export default { }, methods: { async getData() { - let resData = await getHotWorkGasInfo({ - EW_RU_JOB_ID: this.EW_RU_JOB_ID, - EW_RU_TASK_ID: this.EW_RU_TASK_ID, - postMethod: 'application/json', - }); - this.list = [...this.list, ...resData.data.main]; + // let resData = await getHotWorkGasInfo({ + // EW_RU_JOB_ID: this.EW_RU_JOB_ID, + // EW_RU_TASK_ID: this.EW_RU_TASK_ID, + // postMethod: 'application/json', + // }); + let mockData = [{ + // Number(new Date()) + GAS_TIME: '2024-08-30 15:23:43', + GAS_NAME: '234', + GAS_NUMBER: 'fasf', + userName: 'zhangxiao' + }] + this.list = [...this.list, ...mockData]; }, resetList() { this.list = [] diff --git a/pages/eight_assignments/hot_work/gas/name.vue b/pages/eight_assignments/hot_work/gas/name.vue index e69de29..c302ea5 100644 --- a/pages/eight_assignments/hot_work/gas/name.vue +++ b/pages/eight_assignments/hot_work/gas/name.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/pages/eight_assignments/subordinate_index.vue b/pages/eight_assignments/subordinate_index.vue index 106f5d1..c23dcf5 100644 --- a/pages/eight_assignments/subordinate_index.vue +++ b/pages/eight_assignments/subordinate_index.vue @@ -2,7 +2,7 @@ - + {{ item.title }} @@ -43,7 +43,15 @@ export default { this.title = query.title; uni.setNavigationBarTitle({ title: this.title - }) + }); + // 若得到的 type 类型为 [动火作业],为baseList动态添加 [延时监火] 模块 + if (query.type === "hotWork") { + this.baseList.push({ + img: require('../../static/icon-apps/i12.png'), + title: '延时监火', + url: '/pages/eight_assignments/hot_work/delay_fire_monitoring/list' + }) + } }, methods: { fnNavigator(e) { diff --git a/static/icon-apps/i12.png b/static/icon-apps/i12.png new file mode 100644 index 0000000000000000000000000000000000000000..10fb431c25f821c36ccd1140dc32777da1c2129c GIT binary patch literal 9032 zcmaJ{WmFv7md4#(gL^|aPUG$_3GR)BMjD3@EVw%af`;H8G)NI5no2gn==bXLvxA(VY)v9%>Vs*7u@NsBxkdTn@)l?PrpGK#r%NYyf={_s#fc7*{ zdn*}x8@M}o``N%CNOJb>wh%@&sEs2;A7W!4;Q19IiG+m8?rdo6ZLFm!Zs!i=v-wMh z&mZdXghoP=l=1hlv3m*eX0(MkI=e|RpM2_NW^}ffVtyg41=8|RfH*m;2Erf)f!c<4 zfiLaA_RKQUjFSH1PX?e6ZyQE`sH>ZoxW5$hzwC-X&HoYunHm43;{8&J`M*gSYw0p7 zxWgcf!h9mUcKkxZjG|yZei1<-Fc`on0OA(|g2aIQg1r19;zA&C0RhIp59TLtFnb4a zeMRNJeLbzDn4P@6J;Z@PKR-V{KS4fsm?MxM3Vt!)!-yuLfw6y+h*v;$jL_MVp=x^fz5X#7WQFT(&22v8s5T_<;McP}S*4@L!rzp4dh4Dhew{;y*HBYNtfzo!3g-KWLBn;+u#)bX&V))q>3XhlL|XjfB|GxT5F zwg^a}{~YibxY~G9dp*5xUW`l6=xvQmQV!9?ina%NQiEDO=_ItxGY7sh4Au>Leuk8D zKMeENz1JkzGCb_Z6v1%)hBK6pg0`80_QSykNV2F9*roZOypxB{XxG4Yls@^sp7ETes*h!7i;z=y%B+iq8h8^$TkYT#GvJ-E!*FNz zK2*6ezyDUxoX|Re7I9#_mYA5daq=3FX}l+e>*I2W=oy9+0an_NxXnZG5K!a%`8n;W zD0$om2&8fOgD|Y|`#}2xaTaC6rR}={LFC^-wp(n(7_Zw^d+`~oeY6&;1$ zj0_u}t9#>j3L7LtuhRE$sCtjzXcJvo3k`{!2`GmS)U`ZATo`Mwx4OHm4|XfFEb11z zIA#8kOI+C!ZG0`id>8ltP=m*a$<#J7$f9%dfo3X(R{0YW`6*g45gPgL%8tBE9cf9a zRPp#e`Ca23n$+zA#7BjB4HfKG>(k$emn`bjRtC~$SqG%{29RaFGs9_2X~o8i{OEHH zFl*@IEa0C#n=V0{E)nBs%~!+Fv^+gRHSWF7*HdNn$44EiX?C<5yTLyjISY-|@SL{y zyh2d70)}B&2ucHF)I>Dk6Ns>O@`VAz225f-OSuO_~dXf7`hOn#|ld6V&cxFB6 zV$~wy#TVimIwshWr#Na@ErDMC z4^7?*9B|K-x>)r`>bhmX-r2wal)aTT0=K2>kKSkqx&@h_?maf;tC=LH2-5nm=^mD% zaknqbs&P6_L(%J8P-=d^OBLj*_z;zE6WpwHX=IDeWM46xBDgOyL?i0uxcjIBP9H2V z;ko6`+cnjew|)gZdJSN>p>J}WL?&G;unG3*{qae0&et{y+3@6|(E88unmAZNiLkRo zH;`{zlceaFB3LC&PxpS*mZK-7dh#SPUr)jkIYM8L>@z#3Z7)WFse3}cntpHcui}$| zcu!Z6u++sjAt6&9EenBo!n4W-+0Wb1D+0uSPoglrlHu3UR4oC?(tkrg7`SNE90X^R zrqj%?gjg6O@Gk*oNuCx*_=FYV2BFnQ#%c!-GbVNd&Y)gp3a0Gp>YJ9@c;R9c#s*%E~&g z`brP}3pbGDF81gF4=3W5E1|J7*r>GSqewhUxYfgYjX%0A66qJBo&|F28=tCB1>QNv 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 i^so<$*N^1ZNH6z&1cL&)Q~vt5MNLUtu}