From d469229a6f6720d476bae80e36106971b4529752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zhaobing=E2=80=99?= Date: Tue, 24 Oct 2023 16:50:43 +0800 Subject: [PATCH] feat:fix bugs --- .../controllers/patrolManage/patrolRecord.js | 8 +- weapp/app.json | 3 +- weapp/images/device5.png | Bin 0 -> 943 bytes weapp/images/deviceStatus.png | Bin 0 -> 26352 bytes weapp/images/rectangle.png | Bin 0 -> 3762 bytes weapp/images/shield.png | Bin 0 -> 27329 bytes .../deviceBigdataGraph/deviceBigdataGraph.js | 6 +- .../deviceBigdataGraph.wxml | 3 +- .../lifeWarning/lifeWarning.js | 123 +++++++++++++ .../lifeWarning/lifeWarning.json | 10 ++ .../lifeWarning/lifeWarning.wxml | 91 ++++++++++ .../lifeWarning/lifeWarning.wxss | 170 ++++++++++++++++++ .../statusDetail/statusDetail.js | 43 +++-- .../statusDetail/statusDetail.wxml | 58 +++--- .../statusDetail/statusDetail.wxss | 41 +++-- weapp/package/report/report.js | 58 +++--- weapp/utils/getApiUrl.js | 8 +- 17 files changed, 527 insertions(+), 95 deletions(-) create mode 100644 weapp/images/device5.png create mode 100644 weapp/images/deviceStatus.png create mode 100644 weapp/images/rectangle.png create mode 100644 weapp/images/shield.png create mode 100644 weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.js create mode 100644 weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.json create mode 100644 weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.wxml create mode 100644 weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.wxss diff --git a/api/app/lib/controllers/patrolManage/patrolRecord.js b/api/app/lib/controllers/patrolManage/patrolRecord.js index 3129d0f..d150068 100644 --- a/api/app/lib/controllers/patrolManage/patrolRecord.js +++ b/api/app/lib/controllers/patrolManage/patrolRecord.js @@ -587,8 +587,8 @@ function getPointInfo(opts) { try{ let rslt=[] const models = ctx.fs.dc.models; - const {keywords}=ctx.query - let generalInclude = [{model:models.Project,where:{subType :{$like: `%${keywords}%`}}},{model:models.Device}] + const {projectId}=ctx.query + let generalInclude = [{model:models.Project,where:{id :projectId}},{model:models.Device}] rslt=await models.Point.findAll({ include:generalInclude }) @@ -617,11 +617,11 @@ function getTemplate(opts){ try{ let rslt=[] const models = ctx.fs.dc.models; - const {keywords}=ctx.query + const {projectId}=ctx.query rslt=await models.PatrolPlan.findAll({ include:[ {model:models.Project, - where:{subType:{$like: `%${keywords}%`}}}, + where:{id:projectId}}, {model:models.PatrolTemplate}] }) let userInfo = ctx.fs.api.userInfo; diff --git a/weapp/app.json b/weapp/app.json index bd34db5..8ca6b87 100644 --- a/weapp/app.json +++ b/weapp/app.json @@ -27,7 +27,8 @@ "riskManagement/riskCalendar/riskCalendar", "deviceBigdataGraph/deviceBigdataGraph", "deviceBigdataGraph/statusDetail/statusDetail", - "report/report" + "report/report", + "deviceBigdataGraph/lifeWarning/lifeWarning" ] } ], diff --git a/weapp/images/device5.png b/weapp/images/device5.png new file mode 100644 index 0000000000000000000000000000000000000000..4345bf4f54932ae4982b0f4b4a080540230a17b9 GIT binary patch literal 943 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 D&Y(?7 literal 0 HcmV?d00001 diff --git a/weapp/images/rectangle.png b/weapp/images/rectangle.png new file mode 100644 index 0000000000000000000000000000000000000000..667caf22e5fa1031970d500ffbbdb5f0d6fb5547 GIT binary patch literal 3762 zcmV;j4o&fiP)Px@Y)M2xRA@uxT3e4@$yNSVRqflk^wqbqXFTrqcyKHd7#tEs@GudKARfpIcqIM+ zkq}QvNW7pp;sx;lZ%E+}AdTTA%5*>j$~=IgL@^1mRaDhRp$_9To>PF>0Vuai_EMxpY`Ya&5oQJvOycvKr1m_a7 zz-6dQZ&CJpf4B8(_jmAaZm|TeJRQz{H!hch)BUhpHWEH_5pGW>%f3x*Z{fxeDm@)v~UanPB zdm8umYx}%x7JL~SoN_7HZ}|2*|NiF-fA|kq;4Q8rtwOAzgJaE?ZovE1CgeX~O^$x| zYVw1AE|2n%HTz9x{Qall(S9S$;=z9X_ImFE(g{GrHxGXQ*Tb*;!I|*EPkS&wdIh;- zj}s4i8xYYI1m{-a{oB>v$#;IL|D%_RxiXq70U5`9f2ZnUIIZ=5?`Ms$AFuX%KW4W8 zr|FxWH(&F9^S3|WymM_Gd3+w}TYx1OQdh1(-EAQ}JBQ#0H~TNI{Ve-_H&yKsI3t6O zOogZo2wHuvME29Lrm|VmewzJ}-tWICWsBMVRrbqf4xDz7cP@M(`07_qH$HrS2kD6} zlJn=G3vjMogLf}{63vUn=z|CGsek=h@@^;bTGPNesB@o@b|pAr-u;~~gm1ihG`hWQ zpTx(L#rWJg45mrp~)LTt@GS^hkcNI=G zHjMg~t2gbcm{$+tSvJdzQogM-Wzue)%@f)+1m}&<2fusfXmsn|)^^;N^Sx`Ap{WvM zk?k}W=Do(9kLlEVA0*%V|HT~Lef?bUwUfvA_SSaZxBgtuiE<4bG#BR4_~>r3@}D=- zwNC1_>IKMtFPBKNR4OT%h5*_DLtAn*Rh+3>ua*3|pd%dZN@X*LU{&h)k1 zLpbI%{Ji_xO0Yk3?mtLYesU*Wi*tW0tcCzRRT*(WHa#z!CAxcEMZ$@^y!+b8;KH%} z!pebj_2YCcGr=INO7e{DtZJ)KvSxIZ^BiTPVv|>FHV4co`7u=AD$Oo}| za9@l0DUo$Q_kw=_=4>P@*Y9R)7A~xc^Ms<#8ID%~wR`0!eV)_^cXTk)!y2=O%RhbP zXW1QQ&uK>zmCfOR!0LnLe!Y^w5#J^Jn6TDD8s5uAcHJ2u~MU&ru2T49R~MPB62)ayR)S! zhi7#S8Ou1+qr9FC%k!#nrjD!LFnh9Prd(&;Q%AiE#~R_St!$4v=l({ra_3>b*6@SY zz~^e*>HHZg>X_p0mm+3t9tPdUSNA}Ax9^e0SVkGH7`we?oMqjYj_e1{Agt~_)@$w1 zZw<~=$4iJR`_$@|!8vCw9Tn%Eqmh>J-ATxDh z-92$w?86)%jfcJD)ZGpHy~UQ-5~7xKXJvp%eVJs^c;?=HB0A0PESqCOJHfK?46vKI zQ#8y$WGvHWH|xH*tiE=n8Qz{6Rtp)LVjc|_R`)mgog;HzdkD_hwzkrU`pVXsGIn0F z`>1Sk+dasBBaIl?sw(iovX9j%_4E5#;8&G)p$+5y4TRCvC~TPN;da(Jwk+Rt*~)IC zzcp=d6$Np#-^Ys|Zt!=GFM5Z3No*Y!)ADIO$funzOunC7*}bySH0D%3Oaphk1{~L@ zDVkWhCJ3AvrhA+Dlc8T8SzKcGg_gP(B0`eP`<`efDWAUenE$@v(@V=O z$&n8V6j?b)?JoTlVAU8ibbrdKPhzv{o0yvK!?u%boVc$?T`8?2dXF_F6kxc&u9dN% zR71oW^G455FSQ@79uj{N26QvaZ4Y6%eLO*Y*&TKjU&~yB*YY>Rz(#FtamzXLFAZg>lX zbx+w38lL#YLS%2ZoAj`y(lyPX@oV{EhQZz6sDb(rB-Gly@(Qv#9QiCcLn z+hnQ5Y?@M#l#)3VN-GIAZ2avmEo>+JVkZ`-lN_J3jMGx!c;u1a41oEDzb3UYx=UcobNoLxB604OlM8>iql06pO^%Bz&b5U1Y#E(uPFTR>7wT#7;E0CS& zQ6T*&GFml_6%Fz!WKck?Jya@MG#he zMeSAqT4)fKnhvxg9IbR~1(0*pv8&LJF;OmbqRwi$>O*j zA5PDock?P2)qz8o0nxevHD}=Ggdmf#i<-bN`NC2Oj(~*KiXA)*1#6@O$Jy|FHlcu4 z3NV)Z%^od1>G8>(Se;2TJ`2#Qk~rE7NI9^Uo4|4lXotjs$JVjQWyR{>G-uICKpQ<^ zqg#T}OId4!2Mnx-KHi^;^!3Fi-C1h#rWBlMC?uIyc}B(0XB;>X(tx1JI(U>Oivk=g zIG4m(2AldOiakcUBawAqfxhTiL&Yg*dDQ`ueJFnpUS_(!GSY(~1&Cc+TElYVc+la;!DbNg=fZ!zCk@hJ<5=)-XyJqZ??F zFxm;D^H#IY6-*#mXPS-Bky~D^(rwd;=8f#b_;WDr4Vd+H*va4M>?(fUcjqqrU6>ty z5A^5=M9T*qX+mxYkm*21YD<`8K^hM-%KDNWn-rA{a_~5&DJsH{Z5fJ=QMv$2OE{4S z;7i!Rs3`FtMGRwv*7@@UeND(3erU(;VGJzaCg0;|Y zd05AO!^j*)hFd1q3s$yamM!>U52l-e4?l!`^g6f*qk<~4e!NsqrL|BSd~}*bb+8sf zh|VTN5ou(224x z}m||bij@o*8u)z`J;hd?AU9%PY2GVr5af7l>=<`3PcovKJ-BqyP5$+9&AaI zNa?G#K;BozBU!P_YDgm>$Sor?OA9L$OvMVBvw_#pneJE_8snu4rk7&KikCBR9D~=- z!#W_GFP{dC$?5&?z}X`dC)xFI9wJii=N=H9ClES(BE#OI&;ev7yTVUhXf*-!kOgdg z)3PdsNt#crN)}Cf5w?@U#u|KN8+MWvB`Icy$X*PY_3oL2vumIlyS`Zp{Zw|je!hA{ znLb>se5Dn2R$K)5ThE9U2LbE(gL43Oxh78RtENsT+~-Owo(C)b&w?|{F;|E_>(Dp| c2(#M!56h3Wn{2UsH~;_u07*qoM6N<$f{Bhw_y7O^ literal 0 HcmV?d00001 diff --git a/weapp/images/shield.png b/weapp/images/shield.png new file mode 100644 index 0000000000000000000000000000000000000000..12c0e0380d47604625ffd3edd230f3570f5a26b0 GIT binary patch literal 27329 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 literal 0 HcmV?d00001 diff --git a/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js b/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js index 579c700..74df8da 100644 --- a/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js +++ b/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js @@ -36,7 +36,11 @@ Page({ wx.navigateTo({ url: '/package/deviceBigdataGraph/statusDetail/statusDetail', }) - console.log('xxxxxx',e) + }, + navigatorToLifeWarning(e) { + wx.navigateTo({ + url: '/package/deviceBigdataGraph/lifeWarning/lifeWarning', + }) }, /** * 生命周期函数--监听页面加载 diff --git a/weapp/package/deviceBigdataGraph/deviceBigdataGraph.wxml b/weapp/package/deviceBigdataGraph/deviceBigdataGraph.wxml index e932950..57a70a7 100644 --- a/weapp/package/deviceBigdataGraph/deviceBigdataGraph.wxml +++ b/weapp/package/deviceBigdataGraph/deviceBigdataGraph.wxml @@ -9,8 +9,9 @@ 质保图谱 - 查看详情 + 查看详情 + 过保比率: diff --git a/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.js b/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.js new file mode 100644 index 0000000..8c0c266 --- /dev/null +++ b/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.js @@ -0,0 +1,123 @@ +// package/deviceBigdataGraph/lifeWarning/lifeWarning.js +import * as echarts from '../../components/ec-canvas/echarts'; +function setOption(chart, data) { + const option = { + grid: { + top: '5%', + left: '3%', + right: '4%', + bottom: '3%', + containLabel: true + }, + xAxis: { + type: 'category', + data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + }, + yAxis: { + type: 'value', + }, + series: [ + { + data: data, + type: 'line' + }, + ] + }; + chart.setOption(option); + } +Page({ + + /** + * 页面的初始数据 + */ + data: { + ec: { + // onInit: initChart, + lazyLoad: true, // 将 lazyLoad 设为 true 后,需要手动初始化图表 + }, + isLoaded: false, + list: [1,2,3] + }, + initChart: function (data) { + this.ecComponent = this.selectComponent('#device-status-chart'); + this.ecComponent.init((canvas, width, height, dpr) => { + const chart = echarts.init(canvas, null, { + width: width, + height: height, + devicePixelRatio: dpr // new + }); + setOption(chart, data); + + // 将图表实例绑定到 this 上,可以在其他成员函数中访问 + this.chart = chart; + + this.setData({ + isLoaded: true, + }); + + // 注意这里一定要返回 chart 实例,否则会影响事件处理等 + return chart; + }); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const {windowHeight}=wx.getSystemInfoSync() + const pageHeight=windowHeight - 48 + setTimeout(() => { + this.initChart([1,2,3,4,5,6]) + }, 1000) + const that = this + that.setData({pageHeight:pageHeight+'px'}) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.json b/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.json new file mode 100644 index 0000000..a5e8f69 --- /dev/null +++ b/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.json @@ -0,0 +1,10 @@ +{ + "navigationBarBackgroundColor": "#1979ff", + "navigationBarTextStyle": "white", + "navigationBarTitleText": "寿命预警", + "enablePullDownRefresh": false, + "usingComponents": { + "ec-canvas": "../../components/ec-canvas/ec-canvas", + "van-divider": "@vant/weapp/divider/index" + } +} \ No newline at end of file diff --git a/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.wxml b/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.wxml new file mode 100644 index 0000000..a85595e --- /dev/null +++ b/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.wxml @@ -0,0 +1,91 @@ + + + + + + + + + 设备总数 + + 300个 + + + + + + 过保个数 + {{86}} + + + 质保个数 + {{300}} + + + + + + + + + 寿命预警 + + + + + + + + + + + + + 数据概览 + + + + + 30天内你有1000个设备即将过保,请及时更换设备 + + + + + + 设备A + + + 所属结构物 + 管廊A + + + 安装时间 + 2022-02-11 + + + 质保期 + 2022-02-11 + + + + + + 设备A + + + 所属结构物 + 管廊A + + + 安装时间 + 2022-02-11 + + + 质保期 + 2022-02-11 + + + + + + \ No newline at end of file diff --git a/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.wxss b/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.wxss new file mode 100644 index 0000000..892be7d --- /dev/null +++ b/weapp/package/deviceBigdataGraph/lifeWarning/lifeWarning.wxss @@ -0,0 +1,170 @@ +/* package/deviceBigdataGraph/lifeWarning/lifeWarning.wxss */ +.status-detail { + height: 100vh; + background-image: linear-gradient(179deg, #006BE3 0%, #4E87FF 16%, #4e87ff00 93%); + padding: 0 15px; +} + +.icon { + width: 61px; + height: 31.86px; + position: relative; + padding: 0 10px; +} + +.icon-text { + width: 100%; + /* height: 17px; */ + font-family: PingFangSC-Medium; + font-weight: 500; + font-size: 12px; + color: #FFFFFF; + position: absolute; + top: 0; + left: 0; + text-align: center; +} + +.fontStyle { + width: 100%; + height: 33px; + font-family: PingFangSC-Medium; + font-weight: 500; + font-size: 24px; + color: #FFFFFF; + padding: 0 10px; +} + +.title-item { + color: #ffffffd9; +} + +.title-num { + font-size: 20px; + color: #FFFFFF; +} + +.title-unit { + font-size: 10px; + color: #FFFFFE; + margin-left: 10px; +} + +.card { + background: #FFFFFF; + box-shadow: 2px 2px 11px 0 #00000008, 0 0 4px 0 #00000012; + border-radius: 4px; + padding: 12px; + margin-top: 12px; + /* height: 100vh; */ + /* height: 300px; */ +} + +.card-img { + width: 18px; + height: 18px; + margin-right: 13px; +} + +.card-title { + font-weight: 500; + font-size: 16px; + color: #383A3B; +} + +.card-link { + font-weight: 500; + font-size: 14px; + color: #1684FF; +} + +.chart { + width: 100%; + height: 250px; + margin-top: 20px; +} + +.list { + margin-top: 10px; + padding: 10px 7px; + background-color: #F1F7FF; +} + +.backStyle { + width: 61px; + height: 31.86px; +} + +.firstRow { + display: flex; + justify-content: space-between; + position: relative; + height: 120px; +} + +.deviceImgStyle { + width: 161.05px; + height: 166.86px; + position: absolute; + right: 15px; +} + +.secondRow { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 10px; +} + +.describeStyle { + margin: 5px 2px; + width: 100%; + height: 25px; + opacity: 0.33; + background-image: linear-gradient(269deg, #FFD9AD 0%, #FF9416 98%); + border-radius: 13px; +} +.font{ + /* width: 255px; */ + height: 17px; + font-family: PingFangSC-Medium; + font-weight: 500; + font-size: 12px; + color: #000000; + text-align: center; + font-weight: bold; + +} +.center-content { + display: flex; + justify-content: center; /* 水平居中 */ + align-items: center; /* 垂直居中 */ + height: 100%; /* 或者根据实际需求设置高度 */ + } + .detail{ + /* height: 124px; */ + background: #F1F7FF; + border-radius: 4px; + margin-bottom: 10px; + /* position: relative; */ + } + .deviceStyle{ + width: 41px; + height: 21px; + font-family: PingFangSC-Medium; + font-weight: 500; + font-size: 15px; + color: #1684FF; + margin: 10px 10px; + } + .chineseStyle{ + width: 60px; + height: 17px; + font-family: PingFangSC-Regular; + font-weight: 400; + font-size: 12px; + color: #31373ed9; + } + .custom-class van-divider { + margin: 0px!important; /* 设置分割线的高度为2px */ + } \ No newline at end of file diff --git a/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js b/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js index ca20416..519c8f9 100644 --- a/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js +++ b/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js @@ -1,7 +1,19 @@ // package/deviceBigdataGraph/detail/detail.js import * as echarts from '../../components/ec-canvas/echarts'; -function setOption(chart, data) { +function setOption(chart, data1,data2) { const option = { + legend: { + data: ['设备故障率', '设备完好率'], + top:'-5px' + }, + title:{ + text:'单位%', + top:'-5px', + textStyle:{ + fontSize:'10px', + fontWeight:'normal' + } + }, grid: { top: '5%', left: '3%', @@ -14,11 +26,17 @@ function setOption(chart, data) { data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] }, yAxis: { - type: 'value' + type: 'value', }, series: [ { - data: data, + name:'设备完好率', + data: data1, + type: 'line' + }, + { + name:'设备故障率', + data: data2, type: 'line' } ] @@ -26,6 +44,8 @@ function setOption(chart, data) { chart.setOption(option); } + + Page({ /** @@ -43,19 +63,16 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(options) { - setTimeout(() => { - this.initChart([250, 300, 100, 147, 260, 123, 311]) - }, 1000) - }, - initChart: function (data) { + initChart: function (data1,data2) { + this.ecComponent = this.selectComponent('#device-status-chart'); + this.ecComponent.init((canvas, width, height, dpr) => { const chart = echarts.init(canvas, null, { width: width, height: height, devicePixelRatio: dpr // new }); - setOption(chart, data); + setOption(chart, data1,data2); // 将图表实例绑定到 this 上,可以在其他成员函数中访问 this.chart = chart; @@ -68,6 +85,12 @@ Page({ return chart; }); }, + onLoad(options) { + setTimeout(() => { + this.initChart([1,2,3,4,5,6],[1,2,3,10,1]) + }, 1000) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.wxml b/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.wxml index 6f3320e..a542d23 100644 --- a/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.wxml +++ b/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.wxml @@ -1,26 +1,40 @@ - 设备总数 - 300 - - - 设备故障率 - {{86}}% + + + + + + + 设备总数 + + 300个 + + + + + + 设备故障率 + {{86}}% + + + 完好率 + {{300}}% + + - - 完好率 - {{300}}% + + + + + + 设备状态 + + 近七天 + + + + + - - - - - - - 历史风险趋势 - - - - - - + \ No newline at end of file diff --git a/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.wxss b/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.wxss index 241dadd..3ffc2d0 100644 --- a/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.wxss +++ b/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.wxss @@ -3,26 +3,37 @@ height: 100vh; background-image: linear-gradient(179deg, #006BE3 0%, #4E87FF 16%, #4e87ff00 93%); padding: 0 15px; - } - - .icon { +} + +.icon { width: 61px; height: 31.86px; - background-image: linear-gradient(0deg, #EAF2FF 5%, #2578F0 100%); - box-shadow: 0 3px 4px 1px #bfdbfa4f; - } - - .icon-text { - width: 48px; - height: 17px; + position: relative; + padding: 0 10px; +} + +.icon-text { + width: 100%; + /* height: 17px; */ font-family: PingFangSC-Medium; font-weight: 500; font-size: 12px; color: #FFFFFF; + position: absolute; + top: 0; + left: 0; + text-align: center; + } + .fontStyle{ + width: 100%; + height: 33px; + font-family: PingFangSC-Medium; + font-weight: 500; + font-size: 24px; + color: #FFFFFF; + padding: 0 10px; } - .title-item { - width: 150px; color: #ffffffd9; } @@ -43,6 +54,8 @@ border-radius: 4px; padding: 12px; margin-top: 12px; + /* height: 100vh; */ + /* height: 300px; */ } .card-img { @@ -62,10 +75,10 @@ font-size: 14px; color: #1684FF; } - + .chart { width: 100%; - height: 195px; + height: 250px; margin-top: 20px; } diff --git a/weapp/package/report/report.js b/weapp/package/report/report.js index c9194a4..edb5c7f 100644 --- a/weapp/package/report/report.js +++ b/weapp/package/report/report.js @@ -1,47 +1,13 @@ // package/report/report.js -import { getPointList,getPatrolTemplate,getTemplates,reportQuest,getPatrolPlan } from "../../utils/getApiUrl"; +import { getPointList,getPatrolTemplate,getTemplates,reportQuest,getPatrolPlan,getStructuresList } from "../../utils/getApiUrl"; import {Request} from "../../common"; const moment = require("../../utils/moment"); Page({ data: { isPlanState: false, - structList: [{ - id: 0, - name: '指挥中心' - }, { - id: 1, - name: '管廊' - }, - { - id: 2, - name: '电梯系统' - }, { - id: 3, - name: '供配电系统' - }, { - id: 4, - name: '燃气仓' - }, - { - id: 5, - name: '给水仓' - }, { - id: 6, - name: '防雷与接地系统' - }, { - id: 7, - name: '电气仓' - }, - { - id: 8, - name: '高压电力仓' - }, { - id: 9, - name: '安防系统' - } - ], + structList: [],//结构物列表 data:[],//巡检计划的数据(包括点位,设备等等) structListIndex: undefined,//结构物id pointList:[],//点位列表 @@ -120,8 +86,8 @@ Page({ pointList:[],//选择结构物后先置空先前的点位列表 }) - const keywords=that.data?.structList[event.detail.value]?.name - const query={keywords} + const projectId=that.data?.structList[event.detail.value]?.id + const query={projectId} Request.get(getTemplates(query)).then(res=>{ if(res){ @@ -463,7 +429,23 @@ Page({ wx.setNavigationBarTitle({ title: options.key, }); + Request.get(getStructuresList()).then(res=>{ + if(res){ + const list=res.rows + if(list&&list.length){ + const res= list.filter(item=>item.type=='管廊') + that.setData({structList:res.map(item=>{ + return { + name:item.name, + id:item.id + } + })}) + } + }else{ + wx.hideLoading(); + } + }) }, onStructListPicker() { this.setData({ diff --git a/weapp/utils/getApiUrl.js b/weapp/utils/getApiUrl.js index 85d372f..607fe47 100644 --- a/weapp/utils/getApiUrl.js +++ b/weapp/utils/getApiUrl.js @@ -52,8 +52,8 @@ exports.getSubSystemPatrolAbout = (query) => { // 获取点位信息 exports.getPointList = (query) => { - const {keywords } = query; - return `/patrolRecord/pointInfo?keywords=${keywords}` + const {projectId } = query; + return `/patrolRecord/pointInfo?projectId=${projectId}` } // 获取点位最新一条巡检记录 @@ -67,8 +67,8 @@ exports.getPatrolTemplate = (id) => { } //根据结构物获取巡检模板 exports.getTemplates = (query) => { - const {keywords } = query; - return `/patrolRecord/getTemplate?keywords=${keywords}` + const {projectId } = query; + return `/patrolRecord/getTemplate?projectId=${projectId}` } exports.getPatrolRecordIssueHandle = () => {