diff --git a/components/u-calendar/u-calendar.vue b/components/u-calendar/u-calendar.vue index 354379ba..24d71377 100644 --- a/components/u-calendar/u-calendar.vue +++ b/components/u-calendar/u-calendar.vue @@ -476,7 +476,21 @@ // switch: show //是否是切换年月操作 }); } else { - if (!this.startDate || !this.endDate) return; + if (!this.startDate || !this.endDate) { + this.$emit('change', { + startYear: this.startYear, + startMonth: this.startMonth, + startDay: this.startDay, + startDate: null, + startWeek: null, + endYear: this.endYear, + endMonth: this.endMonth, + endDay: this.endDay, + endDate: null, + endWeek: null + }); + return + }; let startMonth = this.formatNum(this.startMonth); let startDay = this.formatNum(this.startDay); let startDate = `${this.startYear}-${startMonth}-${startDay}`; diff --git a/js_sdk/u-charts/config-ucharts.js b/js_sdk/u-charts/config-ucharts.js index 979c7a04..34891db3 100644 --- a/js_sdk/u-charts/config-ucharts.js +++ b/js_sdk/u-charts/config-ucharts.js @@ -81,6 +81,9 @@ module.exports = { // } // return month + "月"; }, + "defaultTooltip": function(val, rowName) { + return `${rowName}:${val.data}`; + }, }, //这里演示了自定义您的图表类型的option,可以随意命名,之后在组件上 type="demotype" 后,组件会调用这个花括号里的option,如果组件上还存在opts参数,会将demotype与opts中option合并后渲染图表。 "demotype": { diff --git a/main.js b/main.js index 8f868693..f1ecab36 100644 --- a/main.js +++ b/main.js @@ -1,6 +1,8 @@ import Vue from 'vue' import App from './App' -import { _chooseImage } from "@/common/permissionTips.js"; +import { + _chooseImage +} from "@/common/permissionTips.js"; // import VueResource from "vue-resource"; // main.js import uView from "uview-ui"; @@ -23,160 +25,165 @@ Vue.use(uView); // // const vConsole = new VConsole()//h5控制台 // // Vue.use(vConsole)//h5控制台 Vue.config.productionTip = false - // Vue.use(VueResource) +// Vue.use(VueResource) App.mpType = 'app' - // import UniIcons from './uni_modules/uni-icons/components/uni-icons/uni-icons.vue' - // Vue.use('UniIcons') - // 由于引入的icons的命名会跟项目文件里的冲突,所以随便往命名加了个2,区分开来 +// import UniIcons from './uni_modules/uni-icons/components/uni-icons/uni-icons.vue' +// Vue.use('UniIcons') +// 由于引入的icons的命名会跟项目文件里的冲突,所以随便往命名加了个2,区分开来 import uniIcons2 from './uni_modules/uni-icons/components/uni-icons/uni-icons.vue' Vue.component('uni-icons2', uniIcons2) - //全局变量 - // Vue.prototype.mobileTopHeight = uni.getMenuButtonBoundingClientRect()?uni.getMenuButtonBoundingClientRect().top:0; - // Vue.prototype.url_config = '' - // Vue.prototype.COMPANY = "longguang" - // Vue.prototype.COMPANY = "nanchang" - // Vue.prototype.COMPANY = "sanjiang" //(部署三江h5需要打开/pages/projectManage/projectManage,页面onload内容) - // Vue.prototype.COMPANY = "zjwj" - // Vue.prototype.COMPANY = "sccr" - // Vue.prototype.COMPANY = "agjt" // 鞍钢集团环境 - // Vue.prototype.COMPANY = "cpgs" // 成平高速环境 +//全局变量 +// Vue.prototype.mobileTopHeight = uni.getMenuButtonBoundingClientRect()?uni.getMenuButtonBoundingClientRect().top:0; +// Vue.prototype.url_config = '' +// Vue.prototype.COMPANY = "longguang" +// Vue.prototype.COMPANY = "nanchang" +// Vue.prototype.COMPANY = "sanjiang" //(部署三江h5需要打开/pages/projectManage/projectManage,页面onload内容) +// Vue.prototype.COMPANY = "zjwj" +// Vue.prototype.COMPANY = "sccr" +// Vue.prototype.COMPANY = "agjt" // 鞍钢集团环境 +// Vue.prototype.COMPANY = "cpgs" // 成平高速环境 Vue.prototype.COMPANY = "xjw" // 新金湾 || 潮州环境 - // Vue.prototype.COMPANY = "" // 标准版 +// Vue.prototype.COMPANY = "" // 标准版 if (process.env.NODE_ENV === 'development') { - // 开发环境 - console.log('开发环境') - // Vue.prototype.url_config = 'http://121.37.106.37:9809/' // 121测试环境 - // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:30250/'// 演示平台H5 - // Vue.prototype.work_url = 'http://jxj.zhgdyun.com:33983' // 演示平台工作流地址 - // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址(弃用) - // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址 - // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 - // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 - // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 - // Vue.prototype.url_config = 'http://192.168.34.221:28890/' //郭圣雄本地 - // Vue.prototype.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地 - Vue.prototype.url_config = 'http://192.168.34.221:8111/' //郭圣雄本地 - // Vue.prototype.url_config = 'http://192.168.34.221:19112/' //郭圣雄本地 - // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地 - // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 - // Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目 - // Vue.prototype.url_config = 'http://192.168.34.155:28890/' //彭洁本地 - // Vue.prototype.work_url = 'http://192.168.34.216:5173' // jiayu工作流地址 - // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用) - // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 - // Vue.prototype.work_url = 'http://192.168.34.175:5173' // 工作流地址 - // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 - // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 - // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 - // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 - // Vue.prototype.url_config = 'http://139.9.66.234:5173/' - // Vue.prototype.url_config = 'http://192.168.34.125:6023/' - // Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通 - // Vue.prototype.url_config = 'http://124.71.67.160:8088/'//中建四局 - // Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地 - // Vue.prototype.url_config = 'http://223.82.100.80:9000/' - // Vue.prototype.url_config = 'http://120.236.247.200:9000/' - // Vue.prototype.url_config = 'http://zhgd.loganwy.com/' - // Vue.prototype.url_config = 'http://183.60.227.61:30249/' - // Vue.prototype.url_config = 'http://183.60.227.61:30249/' - // Vue.prototype.url_config = 'http://124.71.178.44:9000/' - // Vue.prototype.url_config = "http://58.34.63.88:9090/" - // Vue.prototype.url_config = "http://183.95.84.34:7185/" - // Vue.prototype.url_config = "http://218.92.215.138:9090/" //新佳城小区 123456 - // Vue.prototype.url_config = "http://36.137.53.203:9090/" //南昌地铁 gdjt 123456 - // Vue.prototype.url_config = 'http://124.71.178.44:8/' - // Vue.prototype.url_config = 'http://124.71.87.250/' - // Vue.prototype.url_config = 'http://124.71.178.44:8012' // 河南 - // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 - // Vue.prototype.url_config = 'http://192.168.34.116:6023/'//邱平毅本地 - // Vue.prototype.url_config = 'http://182.90.224.147:18170'//瑞士恒通 - // Vue.prototype.url_config = 'https://jxjzhgd.yyvtl.com:8443/'//三江 - // Vue.prototype.url_config = 'http://192.168.34.221:30002'//郭圣熊本地 - // Vue.prototype.url_config = 'http://192.168.34.221:8188'//中建四局本地 - // Vue.prototype.url_config = 'http://101.43.164.214:12350'//中建五局 - // Vue.prototype.url_config = 'http://42.194.144.62:8088'//新中建四局地址 - // Vue.prototype.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地 - // Vue.prototype.url_config = 'http://182.90.224.147:15551'//成润线上 - // Vue.prototype.url_config = 'http://118.121.198.147:23232'//成润正式 - // Vue.prototype.url_config = 'http://huli.zjzhiliao.com/jxjgdapi'//金林湾测试 - // Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信 - // Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段 - Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/'// 测试环境h5 - // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' // 潮州项目h5 + // 开发环境 + console.log('开发环境') + // Vue.prototype.url_config = 'http://121.37.106.37:9809/' // 121测试环境 + // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:30250/'// 演示平台H5 + // Vue.prototype.work_url = 'http://jxj.zhgdyun.com:33983' // 演示平台工作流地址 + // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址(弃用) + // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址 + // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 + // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 + // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 + // Vue.prototype.url_config = 'http://192.168.34.221:28890/' //郭圣雄本地 + // Vue.prototype.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地 + Vue.prototype.url_config = 'http://192.168.34.221:8111/' //郭圣雄本地 + // Vue.prototype.url_config = 'http://192.168.34.221:19112/' //郭圣雄本地 + // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地 + // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 + // Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目 + // Vue.prototype.url_config = 'http://192.168.34.155:28890/' //彭洁本地 + // Vue.prototype.work_url = 'http://192.168.34.216:5173' // jiayu工作流地址 + // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用) + // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 + // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + // Vue.prototype.work_url = 'http://192.168.34.175:5173' // 工作流地址 + // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 + // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 + // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 + // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 + // Vue.prototype.url_config = 'http://139.9.66.234:5173/' + // Vue.prototype.url_config = 'http://192.168.34.125:6023/' + // Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通 + // Vue.prototype.url_config = 'http://124.71.67.160:8088/'//中建四局 + // Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地 + // Vue.prototype.url_config = 'http://223.82.100.80:9000/' + // Vue.prototype.url_config = 'http://120.236.247.200:9000/' + // Vue.prototype.url_config = 'http://zhgd.loganwy.com/' + // Vue.prototype.url_config = 'http://183.60.227.61:30249/' + // Vue.prototype.url_config = 'http://183.60.227.61:30249/' + // Vue.prototype.url_config = 'http://124.71.178.44:9000/' + // Vue.prototype.url_config = "http://58.34.63.88:9090/" + // Vue.prototype.url_config = "http://183.95.84.34:7185/" + // Vue.prototype.url_config = "http://218.92.215.138:9090/" //新佳城小区 123456 + // Vue.prototype.url_config = "http://36.137.53.203:9090/" //南昌地铁 gdjt 123456 + // Vue.prototype.url_config = 'http://124.71.178.44:8/' + // Vue.prototype.url_config = 'http://124.71.87.250/' + // Vue.prototype.url_config = 'http://124.71.178.44:8012' // 河南 + // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 + // Vue.prototype.url_config = 'http://192.168.34.116:6023/'//邱平毅本地 + // Vue.prototype.url_config = 'http://182.90.224.147:18170'//瑞士恒通 + // Vue.prototype.url_config = 'https://jxjzhgd.yyvtl.com:8443/'//三江 + // Vue.prototype.url_config = 'http://192.168.34.221:30002'//郭圣熊本地 + // Vue.prototype.url_config = 'http://192.168.34.221:8188'//中建四局本地 + // Vue.prototype.url_config = 'http://101.43.164.214:12350'//中建五局 + // Vue.prototype.url_config = 'http://42.194.144.62:8088'//新中建四局地址 + // Vue.prototype.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地 + // Vue.prototype.url_config = 'http://182.90.224.147:15551'//成润线上 + // Vue.prototype.url_config = 'http://118.121.198.147:23232'//成润正式 + // Vue.prototype.url_config = 'http://huli.zjzhiliao.com/jxjgdapi'//金林湾测试 + // Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信 + // Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段 + // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/'// 测试环境h5 + // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:1667/' // 测试环境h5 + // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' // 潮州项目h5 + } else { - // 生产环境 - console.log('生产环境') - // Vue.prototype.url_config = 'http://121.37.106.37:9840/' - // Vue.prototype.url_config = 'http://jxjzw.zhgdyun.com:100/' // 演示平台 - // Vue.prototype.work_url = 'http://jxj.zhgdyun.com:33983'// 工作流地址 演示平台 - // Vue.prototype.url_config = 'http://117.146.73.156:9809/'// 中新建项目 - // Vue.prototype.work_url = 'http://117.146.73.156:19997'// 工作流地址 通用 - // Vue.prototype.url_config = 'http://121.37.106.37:9809/' // 测试环境 - // Vue.prototype.url_config = 'http://101.43.164.214:11111/' - // Vue.prototype.work_url = 'http://101.43.164.214:11131'// 工作流地址 通用 - // Vue.prototype.url_config = 'http://117.146.73.156:9809/' // 中新建地址(外网) - // Vue.prototype.work_url = 'http://117.146.73.156:19997' // 中新建工作流地址(外网) - // Vue.prototype.url_config = 'http://121.37.106.37:19999/'// 新能源智慧基建管理平台 - // Vue.prototype.work_url = 'http://121.37.106.37:19997'// 新能源智慧基建管理平台工作流地址 + // 生产环境 + console.log('生产环境') + // Vue.prototype.url_config = 'http://121.37.106.37:9840/' + // Vue.prototype.url_config = 'http://jxjzw.zhgdyun.com:100/' // 演示平台 + // Vue.prototype.work_url = 'http://jxj.zhgdyun.com:33983'// 工作流地址 演示平台 + // Vue.prototype.url_config = 'http://117.146.73.156:9809/'// 中新建项目 + // Vue.prototype.work_url = 'http://117.146.73.156:19997'// 工作流地址 通用 + // Vue.prototype.url_config = 'http://121.37.106.37:9809/' // 测试环境 + // Vue.prototype.url_config = 'http://101.43.164.214:11111/' + // Vue.prototype.work_url = 'http://101.43.164.214:11131'// 工作流地址 通用 + // Vue.prototype.url_config = 'http://117.146.73.156:9809/' // 中新建地址(外网) + // Vue.prototype.work_url = 'http://117.146.73.156:19997' // 中新建工作流地址(外网) + // Vue.prototype.url_config = 'http://121.37.106.37:19999/'// 新能源智慧基建管理平台 + // Vue.prototype.work_url = 'http://121.37.106.37:19997'// 新能源智慧基建管理平台工作流地址 - // Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色通用 - Vue.prototype.work_url = 'http://101.43.164.214:11131' // 工作流地址 通用 - // Vue.prototype.url_config = 'http://101.43.164.214:11112/'// 新金湾 - // Vue.prototype.work_url = 'http://101.43.164.214:11137'// 新金湾地址 通用 + // Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色通用 + Vue.prototype.work_url = 'http://101.43.164.214:11131' // 工作流地址 通用 + // Vue.prototype.url_config = 'http://101.43.164.214:11112/'// 新金湾 + // Vue.prototype.work_url = 'http://101.43.164.214:11137'// 新金湾地址 通用 - Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/' // 测试环境h5 - // Vue.prototype.url_config = 'https://192.168.1.2/'// 青海中水北方 - // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' // 潮州项目h5 + Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/' // 测试环境h5 + // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:1667/' // 测试环境h5 + // Vue.prototype.url_config = 'http://10.36.27.195:9809/' // 敦煌环境h5 - // Vue.prototype.url_config = 'http://222.80.185.228:6090/' // 木垒县新能源工程线上地址 - // Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址 - // Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址 - // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址(弃用) - // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址 - // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址 - // Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段 - // Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段 - // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用) - // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 - // Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址 - // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 - // Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南 - // Vue.prototype.url_config = 'http://8.142.139.165:7080/' //湖里 - // Vue.prototype.url_config = 'http://139.9.66.234:8/' - // Vue.prototype.url_config = 'http://192.168.34.125:6023/' - // Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通 - // Vue.prototype.url_config = 'http://124.71.67.160:8088/' //中建四局 - // Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地 - // Vue.prototype.url_config = 'http://223.82.100.80:9000/' - // Vue.prototype.url_config = 'http://120.236.247.200:9000/' - // Vue.prototype.url_config = "http://58.34.63.88:9090/" - // Vue.prototype.url_config = 'http://124.71.178.44:9000/' - // Vue.prototype.url_config = "http://183.95.84.34:7185/" - // Vue.prototype.url_config = "http://36.137.53.203:9090/" - // Vue.prototype.url_config = 'http://192.168.34.125:6023/' - // Vue.prototype.url_config = 'http://183.60.227.61:30249/' - // Vue.prototype.url_config = 'http://zhgd.loganwy.com/' - // Vue.prototype.url_config = "http://36.137.53.203:9090/" - // Vue.prototype.url_config = 'http://124.71.87.250/' - // Vue.prototype.url_config = 'http://192.168.34.116:6023/'//邱平毅本地 - // Vue.prototype.url_config = 'http://182.90.224.147:18170/'//瑞士恒通 - // Vue.prototype.url_config = 'https://jxjzhgd.yyvtl.com:8443/'//三江 - // Vue.prototype.url_config = 'http://192.168.34.221:8188/'//中建四局本地 - // Vue.prototype.url_config= 'http://101.43.164.214:12350/'//中建五局 - // Vue.prototype.url_config = 'http://42.194.144.62:8088/'//新中建四局地址 - // Vue.prototype.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地 - // Vue.prototype.url_config = 'http://182.90.224.147:15551/'//成润线上 - // Vue.prototype.url_config = 'http://118.121.198.147:23232/'//成润正式 - // Vue.prototype.url_config = 'http://192.168.34.221:30002/'//郭圣雄本地 - // Vue.prototype.url_config = 'http://101.43.164.214:45022/'//盘锦 - // Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目 - // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:30250/'// 演示平台H5 - // Vue.prototype.work_url = 'http://jxj.zhgdyun.com:33983' // 演示平台工作流地址 - // Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段 - // Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信 + // Vue.prototype.url_config = 'https://192.168.1.2/'// 青海中水北方 + // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' // 潮州项目h5 + + // Vue.prototype.url_config = 'http://222.80.185.228:6090/' // 木垒县新能源工程线上地址 + // Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址 + // Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址 + // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址(弃用) + // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址 + // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址 + // Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段 + // Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段 + // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用) + // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 + // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + // Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址 + // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 + // Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南 + // Vue.prototype.url_config = 'http://8.142.139.165:7080/' //湖里 + // Vue.prototype.url_config = 'http://139.9.66.234:8/' + // Vue.prototype.url_config = 'http://192.168.34.125:6023/' + // Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通 + // Vue.prototype.url_config = 'http://124.71.67.160:8088/' //中建四局 + // Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地 + // Vue.prototype.url_config = 'http://223.82.100.80:9000/' + // Vue.prototype.url_config = 'http://120.236.247.200:9000/' + // Vue.prototype.url_config = "http://58.34.63.88:9090/" + // Vue.prototype.url_config = 'http://124.71.178.44:9000/' + // Vue.prototype.url_config = "http://183.95.84.34:7185/" + // Vue.prototype.url_config = "http://36.137.53.203:9090/" + // Vue.prototype.url_config = 'http://192.168.34.125:6023/' + // Vue.prototype.url_config = 'http://183.60.227.61:30249/' + // Vue.prototype.url_config = 'http://zhgd.loganwy.com/' + // Vue.prototype.url_config = "http://36.137.53.203:9090/" + // Vue.prototype.url_config = 'http://124.71.87.250/' + // Vue.prototype.url_config = 'http://192.168.34.116:6023/'//邱平毅本地 + // Vue.prototype.url_config = 'http://182.90.224.147:18170/'//瑞士恒通 + // Vue.prototype.url_config = 'https://jxjzhgd.yyvtl.com:8443/'//三江 + // Vue.prototype.url_config = 'http://192.168.34.221:8188/'//中建四局本地 + // Vue.prototype.url_config= 'http://101.43.164.214:12350/'//中建五局 + // Vue.prototype.url_config = 'http://42.194.144.62:8088/'//新中建四局地址 + // Vue.prototype.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地 + // Vue.prototype.url_config = 'http://182.90.224.147:15551/'//成润线上 + // Vue.prototype.url_config = 'http://118.121.198.147:23232/'//成润正式 + // Vue.prototype.url_config = 'http://192.168.34.221:30002/'//郭圣雄本地 + // Vue.prototype.url_config = 'http://101.43.164.214:45022/'//盘锦 + // Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目 + // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:30250/'// 演示平台H5 + // Vue.prototype.work_url = 'http://jxj.zhgdyun.com:33983' // 演示平台工作流地址 + // Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段 + // Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信 } Vue.prototype.$formatDates = formatDates; @@ -184,211 +191,211 @@ Vue.prototype.$chooseImage = _chooseImage; //时间戳转换方法 date:时间戳数字 function formatDates(date, fmt = 'yyyy-MM-dd HH:mm:ss') { - if (!date) { - return '' - } - if (date.length == 10) { - date = date * 1000; - } - if (typeof date === 'string') { - date = date.replace('T', ' ').replace('Z', ''); - date = new Date(date.replace(/-/g, '/')) - } - if (typeof date === 'number') { - date = new Date(date) - } - var o = { - 'M+': date.getMonth() + 1, - 'd+': date.getDate(), - 'h+': date.getHours() % 12 === 0 ? 12 : date.getHours() % 12, - 'H+': date.getHours(), - 'm+': date.getMinutes(), - 's+': date.getSeconds(), - 'q+': Math.floor((date.getMonth() + 3) / 3), - 'S': date.getMilliseconds() - } - var week = { - '0': '\u65e5', - '1': '\u4e00', - '2': '\u4e8c', - '3': '\u4e09', - '4': '\u56db', - '5': '\u4e94', - '6': '\u516d' - } - if (/(y+)/.test(fmt)) { - fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length)) - } - if (/(E+)/.test(fmt)) { - fmt = fmt.replace(RegExp.$1, ((RegExp.$1.length > 1) ? (RegExp.$1.length > 2 ? '\u661f\u671f' : '\u5468') : - '') + - week[date.getDay() + '']) - } - for (var k in o) { - if (new RegExp('(' + k + ')').test(fmt)) { - fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length))) - } - } - return fmt + if (!date) { + return '' + } + if (date.length == 10) { + date = date * 1000; + } + if (typeof date === 'string') { + date = date.replace('T', ' ').replace('Z', ''); + date = new Date(date.replace(/-/g, '/')) + } + if (typeof date === 'number') { + date = new Date(date) + } + var o = { + 'M+': date.getMonth() + 1, + 'd+': date.getDate(), + 'h+': date.getHours() % 12 === 0 ? 12 : date.getHours() % 12, + 'H+': date.getHours(), + 'm+': date.getMinutes(), + 's+': date.getSeconds(), + 'q+': Math.floor((date.getMonth() + 3) / 3), + 'S': date.getMilliseconds() + } + var week = { + '0': '\u65e5', + '1': '\u4e00', + '2': '\u4e8c', + '3': '\u4e09', + '4': '\u56db', + '5': '\u4e94', + '6': '\u516d' + } + if (/(y+)/.test(fmt)) { + fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length)) + } + if (/(E+)/.test(fmt)) { + fmt = fmt.replace(RegExp.$1, ((RegExp.$1.length > 1) ? (RegExp.$1.length > 2 ? '\u661f\u671f' : '\u5468') : + '') + + week[date.getDay() + '']) + } + for (var k in o) { + if (new RegExp('(' + k + ')').test(fmt)) { + fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length))) + } + } + return fmt } Vue.prototype.$dayjs = dayjs; let reqNum = 0; Vue.prototype.sendRequest = function(param) { - var _self = this, - url = param.url, - method = param.method, - header = param.header || { - 'content-type': "application/json" - }, + var _self = this, + url = param.url, + method = param.method, + header = param.header || { + 'content-type': "application/json" + }, - data = param.data || {}, - token = "", - isalert = param.isalert || false, - hideLoading = param.hideLoading || false; + data = param.data || {}, + token = "", + isalert = param.isalert || false, + hideLoading = param.hideLoading || false; - //拼接完整请求地址 - var requestUrl = Vue.prototype.url_config + url + '?lang=' + uni.getStorageSync('language'); - if (uni.getStorageSync('userInfo') && url != 'xmgl/base/login' && url != - 'xmgl/wirelessEducationQuestionSubject/getDeviceRandomEducationQuestion' && url != - 'xmgl/wirelessEducationQuestionAnswer/add' && url != - 'xmgl/safeEducationQuestionAnswer/getAnswerWorkerInfo' && url != 'xmgl/safeEducationQuestionAnswer/add' && - url != 'xmgl/safeEducationQuestion/selectSafeEducationQuestionInfo') { - if (JSON.parse(uni.getStorageSync('userInfo')).token) { - token = "Bearer " + JSON.parse(uni.getStorageSync('userInfo')).token; - header["Authorization"] = token - console.log("网络请求 token :" + token); - } - } + //拼接完整请求地址 + var requestUrl = Vue.prototype.url_config + url + '?lang=' + uni.getStorageSync('language'); + if (uni.getStorageSync('userInfo') && url != 'xmgl/base/login' && url != + 'xmgl/wirelessEducationQuestionSubject/getDeviceRandomEducationQuestion' && url != + 'xmgl/wirelessEducationQuestionAnswer/add' && url != + 'xmgl/safeEducationQuestionAnswer/getAnswerWorkerInfo' && url != 'xmgl/safeEducationQuestionAnswer/add' && + url != 'xmgl/safeEducationQuestion/selectSafeEducationQuestionInfo') { + if (JSON.parse(uni.getStorageSync('userInfo')).token) { + token = "Bearer " + JSON.parse(uni.getStorageSync('userInfo')).token; + header["Authorization"] = token + console.log("网络请求 token :" + token); + } + } - // var timestamp = Date.parse(new Date());//时间戳 - // data["timestamp"] = timestamp; - // #ifdef MP-WEIXIN - // data["device"] = "wxapp"; - // data["ver"] = "1.1.30"; - // #endif - // #ifdef APP-PLUS || H5 - // data["device"] = "iosapp"; - // data["ver"] = "1.0.0"; - // #endif - if (method) { - method = method.toUpperCase(); //小写改为大写 - } - //加密sessionStorage.getItem("loginData") - // if (uni.getStorageSync("loginData") && data != {}) { - // console.log(url+"参数"); - // console.log(data); - // data = encryptByDES(data); - // } - //用户交互:加载圈 - if (!hideLoading && reqNum == 0) { - uni.showLoading({ - title: '加载中...' - }); - } - reqNum++; - // console.log(requestUrl, "网络请求start"); - // console.log(data, "网络请求data===================="); - //网络请求 - uni.request({ - url: requestUrl, - method: method, - header: header, - data: data, - success: res => { - // console.log("网络请求success:" + JSON.stringify(res.data)); + // var timestamp = Date.parse(new Date());//时间戳 + // data["timestamp"] = timestamp; + // #ifdef MP-WEIXIN + // data["device"] = "wxapp"; + // data["ver"] = "1.1.30"; + // #endif + // #ifdef APP-PLUS || H5 + // data["device"] = "iosapp"; + // data["ver"] = "1.0.0"; + // #endif + if (method) { + method = method.toUpperCase(); //小写改为大写 + } + //加密sessionStorage.getItem("loginData") + // if (uni.getStorageSync("loginData") && data != {}) { + // console.log(url+"参数"); + // console.log(data); + // data = encryptByDES(data); + // } + //用户交互:加载圈 + if (!hideLoading && reqNum == 0) { + uni.showLoading({ + title: '加载中...' + }); + } + reqNum++; + // console.log(requestUrl, "网络请求start"); + // console.log(data, "网络请求data===================="); + //网络请求 + uni.request({ + url: requestUrl, + method: method, + header: header, + data: data, + success: res => { + // console.log("网络请求success:" + JSON.stringify(res.data)); - if (res.data.code && res.data.code != 200) { - if (res.data.code == 401 || res.data.code == 403) { - uni.showToast({ - title: '登录过期,请重新登录', - icon: "none" - }) - setTimeout(function() { - uni.removeStorageSync('userInfo') - uni.redirectTo({ - url: '/pages/login/login.vue' - }) - }, 1000) - } else { - setTimeout(function() { - if (!isalert) { - uni.showToast({ - title: res.data.message, - icon: "none" - }) - } - }, 200) - } + if (res.data.code && res.data.code != 200) { + if (res.data.code == 401 || res.data.code == 403) { + uni.showToast({ + title: '登录过期,请重新登录', + icon: "none" + }) + setTimeout(function() { + uni.removeStorageSync('userInfo') + uni.redirectTo({ + url: '/pages/login/login.vue' + }) + }, 1000) + } else { + setTimeout(function() { + if (!isalert) { + uni.showToast({ + title: res.data.message, + icon: "none" + }) + } + }, 200) + } - typeof param.error == "function" && param.error(Data); - return; - } - let Data = res.data; - // if (res.data.data && res.data.data.requestData) { - // let data = decryptByDES( - // res.data.data.requestData, - // res.data.data.encrypted - // ); - // Data.data = JSON.parse(data); - // console.log(url + "解密后的数据"); - // console.log(Data); - // } - typeof param.success == "function" && param.success(Data); - }, - fail: (e) => { - console.log("网络请求fail:" + JSON.stringify(e)); - console.log(requestUrl, "requestUrl"); - // uni.showModal({ - // content: "" + e.errMsg - // }); - uni.showToast({ - title: '服务器开小差了呢,请您稍后再试', - icon: 'none' - }) - typeof param.fail == "function" && param.fail(e.data); - }, - complete: () => { - typeof param.complete == "function" && param.complete(); - if (reqNum <= 0) return; - reqNum--; - if (!hideLoading && reqNum == 0) { - uni.hideLoading(); - } - return; - } - }); - } - // 判断按钮权限的函数 + typeof param.error == "function" && param.error(Data); + return; + } + let Data = res.data; + // if (res.data.data && res.data.data.requestData) { + // let data = decryptByDES( + // res.data.data.requestData, + // res.data.data.encrypted + // ); + // Data.data = JSON.parse(data); + // console.log(url + "解密后的数据"); + // console.log(Data); + // } + typeof param.success == "function" && param.success(Data); + }, + fail: (e) => { + console.log("网络请求fail:" + JSON.stringify(e)); + console.log(requestUrl, "requestUrl"); + // uni.showModal({ + // content: "" + e.errMsg + // }); + uni.showToast({ + title: '服务器开小差了呢,请您稍后再试', + icon: 'none' + }) + typeof param.fail == "function" && param.fail(e.data); + }, + complete: () => { + typeof param.complete == "function" && param.complete(); + if (reqNum <= 0) return; + reqNum--; + if (!hideLoading && reqNum == 0) { + uni.hideLoading(); + } + return; + } + }); +} +// 判断按钮权限的函数 Vue.prototype.checkBtnPermission = function(permission) { - var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList; - // var permissions = store.state.userInfo.menuAuthority.menuList; - permissions = permissions.filter( - (x) => x.path == permission.menuPath - )[0]; - console.log(permissions, '按钮权限') - if (!permissions || !permissions.actionList) { - return false; - } - let index = permissions.actionList.findIndex( - (x) => x.actionCode == permission.key - ) - return index != -1 ? true : false; + var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList; + // var permissions = store.state.userInfo.menuAuthority.menuList; + permissions = permissions.filter( + (x) => x.path == permission.menuPath + )[0]; + console.log(permissions, '按钮权限') + if (!permissions || !permissions.actionList) { + return false; + } + let index = permissions.actionList.findIndex( + (x) => x.actionCode == permission.key + ) + return index != -1 ? true : false; } Vue.prototype.checkMenuPermission = function(permission) { - var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList; - // var permissions = store.state.userInfo.menuAuthority.menuList; - permissions = permissions.filter( - (x) => x.path == permission.menuPath - )[0]; - if (!permissions) { - return false; - } else { - return true; - } + var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList; + // var permissions = store.state.userInfo.menuAuthority.menuList; + permissions = permissions.filter( + (x) => x.path == permission.menuPath + )[0]; + if (!permissions) { + return false; + } else { + return true; + } } const app = new Vue({ - ...App + ...App }) app.$mount() \ No newline at end of file diff --git a/pages.json b/pages.json index ac154fe5..b7879a14 100644 --- a/pages.json +++ b/pages.json @@ -3253,6 +3253,13 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/projectEnd/bridgeCraneMonitor/index", + "style" : + { + "navigationBarTitleText" : "" + } } ], // "subPackages":[{ diff --git a/pages/projectEnd/bridgeCraneMonitor/index.vue b/pages/projectEnd/bridgeCraneMonitor/index.vue new file mode 100644 index 00000000..ad029fb6 --- /dev/null +++ b/pages/projectEnd/bridgeCraneMonitor/index.vue @@ -0,0 +1,1654 @@ + + + + + \ No newline at end of file diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue index 64a39bf1..9fdc7afa 100644 --- a/pages/projectEnd/projectIndex/projectIndex.vue +++ b/pages/projectEnd/projectIndex/projectIndex.vue @@ -745,6 +745,11 @@ url: '../betonManage/index' }) break + case 'bridgeCraneMonitor': + uni.navigateTo({ + url: '../bridgeCraneMonitor/index' + }) + break case 'progressManage': uni.navigateTo({ url: '../progressManagement/index' diff --git a/pages/projectEnd/workTicketManage/addWorkTicket.vue b/pages/projectEnd/workTicketManage/addWorkTicket.vue index 8bf774d3..d2a223a3 100644 --- a/pages/projectEnd/workTicketManage/addWorkTicket.vue +++ b/pages/projectEnd/workTicketManage/addWorkTicket.vue @@ -538,7 +538,7 @@ if (res.result) { const resultInfo = JSON.parse(res.result); that.policeCameraItemInfo = that.policeCameraItemList.find(item => item - .devSn == resultInfo); + .devSn == resultInfo.devSn); that.submitShow = true; } } diff --git a/pages/projectEnd/workTicketManage/index.vue b/pages/projectEnd/workTicketManage/index.vue index 55ea352c..03c29303 100644 --- a/pages/projectEnd/workTicketManage/index.vue +++ b/pages/projectEnd/workTicketManage/index.vue @@ -165,6 +165,7 @@ this.getWorkTicketTypeListFn(); }, onShow() { + this.checkedIds = []; this.getWorkTicketCountWorkTicketFn(); this.getWorkTicketListFn(); }, diff --git a/pages/projectEnd/workTicketManage/workTicketDetail.vue b/pages/projectEnd/workTicketManage/workTicketDetail.vue index 2921ff0c..5b699c67 100644 --- a/pages/projectEnd/workTicketManage/workTicketDetail.vue +++ b/pages/projectEnd/workTicketManage/workTicketDetail.vue @@ -9,14 +9,17 @@ - + - - + + - + 暂无数据... @@ -250,6 +253,7 @@ }, lineHeightFlag1: false, lineHeightFlag2: false, + dropdownFlag: true } }, onLoad(opts) { @@ -274,6 +278,14 @@ }, 500) }, methods: { + onOpen(index) { + this.$refs.uDropdown.highlight(); + this.dropdownFlag = false; + }, + onClose(index) { + this.$refs.uDropdown.highlight(index); + this.dropdownFlag = true; + }, getLineCount() { const that = this; uni.createSelectorQuery().in(this).select('#box-content_detail1').boundingClientRect(rect => { @@ -529,6 +541,10 @@