| bim/station/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| map/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| monitor/station/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| monitor/station/index.wxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| project.private.config.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
bim/station/index.js
@@ -27,7 +27,7 @@ stationID = 3; } // console.log(stationID,userInfo.CorpID) var url = 'https://www.beng35.com/BIM/miniProgram/stationsimple.html?id=' + stationID + '&corpid='+ userInfo.CorpID + "&V=20220704"; var url = 'https://www.beng35.com/BIM/miniProgram/stationsimple.html?id=' + stationID + '&corpid='+ userInfo.CorpID + "&V=20221028"; console.log(url,31) this.setData({ webViewUrl: url map/index.js
@@ -150,7 +150,7 @@ }, //请求失败 success: function (res) { wx.hideLoading(); console.log(res.data,150) console.log(res.data,150) var result = res.data; if (result.Code != 0) { wx.showModal({ @@ -237,14 +237,15 @@ } for (var i = 0; i < allStation.length; i++) { var item = allStation[i]; console.log(item,24) var mark = {}; var callout = {}; mark.longitude = item.Position.Point.X; mark.latitude = item.Position.Point.Y; mark.title = item.ObjectName; stationIDs.push(parseInt(item.ObjectID)); mark.id = parseInt(item.ObjectID); stationIDs.push("1575029532937818112"); mark.id = +item.ObjectID ; mark.content = item.Position.Address; mark.width = 32; mark.height = 32; @@ -337,41 +338,6 @@ latitude: item.Position.Point.Y }); } // if (result.Data.QualityMeter == null) { // result.Data.QualityMeter = [] // } // for (var i = 0; i < result.Data.QualityMeter.length; i++) { // var item = result.Data.QualityMeter[i]; // var mark = {}; // var callout = {}; // mark.longitude = item.PosiX; // mark.latitude = item.PosiY; // mark.title = item.Name; // mark.id = item.ID; // mark.content = item.Address; // mark.width = 32; // mark.height = 32; // mark.iconPath = "/images/map/shuizhiyi_blue.png"; // mark.zIndex = 10; // mark.markerType = 'QualityMeter' // mark.markerInfo = item // callout.content = item.Name; // callout.display = 'ALWAYS'; // callout.padding = 5; // callout.borderRadius = 10; // callout.borderWidth = 1; // callout.borderColor = '#999'; // mark.callout = callout; // markers.push(mark); // QualityMeter.push(mark); // pointsList.push({ // longitude: item.PosiX, // latitude: item.PosiY // }); // } that.setData({ 'mapInfo.Station': allProduct, @@ -393,7 +359,7 @@ // that.setIncludePoints(); //获取工单 that.getRepairFormList() // that.getRepairFormList() } }); }, @@ -492,8 +458,11 @@ }, //点击地图marker tapMapMark: function (e) { // console.log(e,484) var id = e.detail.markerId; console.log(e,484) // var id = e.detail.markerId; //20221028 thl var id = "1575029532937818112";//暂时写死 // console.log(id) //console.log(e) this.showMapTipInBottomPanel(id); @@ -512,7 +481,7 @@ //显示marker信息面板 async showMapTipInBottomPanel(id, label) { // console.log(id) console.log(id) var markerTipInfo = null; var that = this; var markers = that.data.mapInfo.markers; @@ -562,14 +531,15 @@ }, //获取泵站kpi getKpiByStationID(stationID){ let that = this let that = this console.log(that.data.currentCorpID,stationID,2,567) return new Promise(function (resolve, reject){ Request({ url: Constant.BASE_SERVER_URL + "Monitor/MonitorPoint/Mobile/GetKpiByStationID@V1.0", method: 'GET', data: { CorpID: that.data.currentCorpID, StationID :stationID, StationID :stationID, Count:2 }, header: { monitor/station/index.js
@@ -1015,12 +1015,21 @@ dialogModalVisible: true }) }, //监听开关机模式切换 //监听开关机控制模式切换 handlCloseOrOpen(e){ this.setData({ "kpiParas.operationModel":e.detail.value }) }, //监听开关机控制模式切换 handlCloseOrOpenCtrl(e){ //1 点击后先弹出 输入密码模态款 //2 输入密码后才调用api // api 入参中 ReadOnly：表示是否修改 IsRemote：表示是否为远程 }, //监听自动停止模式选择 handleOperationModelRadio(e){ // console.log(e,1012) monitor/station/index.wxml
@@ -35,11 +35,12 @@ <view class="kpiText"><text>故障:({{kpiParas.alarmNumber}})</text></view> </view> <view class="y_c_list"> <view class="operation_model" style="width: 103px;height: 36px;"> <switch class="cyan sm radius switch-open" val checked="{{kpiParas.operationModel}}" bindchange="handlCloseOrOpen"></switch> <view class="operation_model" style="width: 103px;height: 36px;" bindtap="handlCloseOrOpenCtrl"> <switch class="cyan sm radius switch-open" checked="{{kpiParas.operationModel}}" bindchange="handlCloseOrOpen"> </switch> </view> <view class="kpiText" wx:if="{{kpiParas.operationModel}}"><text>远程开关机</text></view> <view class="kpiText" wx:else><text>手动开关机</text></view> <view class="kpiText" wx:if="{{kpiParas.operationModel}}"><text>远程控制</text></view> <view class="kpiText" wx:else><text>本地控制</text></view> </view> </view> @@ -257,7 +258,7 @@ <radio-group bindchange="handleOperationModelRadio"> <radio class="cyan radio" checked="{{true}}" value="{{1}}" color="#16b5cb" style="margin-right: 10rpx;"></radio><text>按时长</text> <radio class="cyan radio" value="{{2}}" disabled="{{true}}" style="margin:0 10rpx;"></radio><text>按流量</text> <radio class="cyan radio" value="{{0}}" style="margin:0 10rpx;"></radio><text>按功率</text> <radio class="cyan radio" value="{{0}}" disabled="{{true}}" style="margin:0 10rpx;"></radio><text>按功率</text> <radio class="cyan radio" value="{{3}}" style="margin:0 10rpx;"></radio><text>手动关机</text> </radio-group> </view> project.private.config.json
@@ -2,7 +2,7 @@ "projectname": "Wxxcx.NTNY.V4.1", "setting": { "compileHotReLoad": false, "urlCheck": false "urlCheck": true }, "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "libVersion": "2.26.2"
