diff --git a/api/request.js b/api/request.js
index cb33253..5222963 100644
--- a/api/request.js
+++ b/api/request.js
@@ -3,11 +3,12 @@
// export const BASE_URL = "http://42.180.188.17:11211/"
//export const BASE_URL = "http://192.168.8.100:10000"
//export const BASE_URL = "http://106.13.16.28:10000"
-export const BASE_URL = "http://219.147.96.219:9809" // 包头
+// export const BASE_URL = "http://219.147.96.219:9809" // 包头
// export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://jxj.zhgdyun.com:18000" // 包头
// export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://219.147.96.219:9809" // 包头线上地址(正式)
-//是否已显示未登录弹窗
+export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://192.168.3.9:39809" // 包头线上地址(内网)
+//是否已显示未登录弹窗
let showNoLoginTip = false
/**
diff --git a/main.js b/main.js
index dfa128a..4f05cc5 100644
--- a/main.js
+++ b/main.js
@@ -1,7 +1,7 @@
import App from './App'
import {
- createSSRApp
+ createSSRApp
} from 'vue'
import './uni.promisify.adaptor'
// import VueResource from "vue-resource";
@@ -40,437 +40,440 @@ import WFormItem from '@/components/WFormItem.vue'
import RoutingPopup from '@/components/form/routingPopup/routingPopup';
import PreviewIframe from '@/components/previewIframe/previewIframe.vue';
import {
- Row,
- Col,
- Popup,
- Icon,
- Field
+ Row,
+ Col,
+ Popup,
+ Icon,
+ Field
} from 'vant';
export function createApp() {
- const app = createSSRApp(App)
- app.component('WFormItem', WFormItem);
- app.component('RoutingPopup', RoutingPopup);
- app.component('PreviewIframe', PreviewIframe);
+ const app = createSSRApp(App)
+ app.component('WFormItem', WFormItem);
+ app.component('RoutingPopup', RoutingPopup);
+ app.component('PreviewIframe', PreviewIframe);
- app.use(Popup);
- app.use(Field);
- app.use(Icon);
- app.use(Row);
- app.use(Col);
- app.use(uView);
- // 如此配置即可
- // uni.$u.config.unit = 'rpx'
- app.component('uni-icons2', uniIcons2)
+ app.use(Popup);
+ app.use(Field);
+ app.use(Icon);
+ app.use(Row);
+ app.use(Col);
+ app.use(uView);
+ // 如此配置即可
+ // uni.$u.config.unit = 'rpx'
+ app.component('uni-icons2', uniIcons2)
- //全局变量
- // app.config.globalProperties.mobileTopHeight = uni.getMenuButtonBoundingClientRect()?uni.getMenuButtonBoundingClientRect().top:0;
- // app.config.globalProperties.url_config = ''
- // app.config.globalProperties.COMPANY = "longguang"
- // app.config.globalProperties.COMPANY = "nanchang"
- // app.config.globalProperties.COMPANY = "sanjiang" //（部署三江h5需要打开/pages/projectManage/projectManage，页面onload内容）
- // app.config.globalProperties.COMPANY = "zjwj"
- // app.config.globalProperties.COMPANY = "sccr"
- // app.config.globalProperties.COMPANY = "agjt" // 鞍钢集团环境
- // app.config.globalProperties.COMPANY = "cpgs" // 成平高速环境
- app.config.globalProperties.COMPANY = "" // 标准版
+ //全局变量
+ // app.config.globalProperties.mobileTopHeight = uni.getMenuButtonBoundingClientRect()?uni.getMenuButtonBoundingClientRect().top:0;
+ // app.config.globalProperties.url_config = ''
+ // app.config.globalProperties.COMPANY = "longguang"
+ // app.config.globalProperties.COMPANY = "nanchang"
+ // app.config.globalProperties.COMPANY = "sanjiang" //（部署三江h5需要打开/pages/projectManage/projectManage，页面onload内容）
+ // app.config.globalProperties.COMPANY = "zjwj"
+ // app.config.globalProperties.COMPANY = "sccr"
+ // app.config.globalProperties.COMPANY = "agjt" // 鞍钢集团环境
+ // app.config.globalProperties.COMPANY = "cpgs" // 成平高速环境
+ app.config.globalProperties.COMPANY = "" // 标准版
- if (process.env.NODE_ENV === 'development') {
- // 开发环境
- console.log('开发环境')
- // app.config.globalProperties.url_config = "http://219.147.96.219:9809/" // 包头(正式)
- // app.config.globalProperties.work_url = "http://219.147.96.219:19997" // 包头工作流线上地址(正式)
- // app.config.globalProperties.url_config = "http://jxj.zhgdyun.com:18000/" // 包头
- // app.config.globalProperties.work_url = "http://jxj.zhgdyun.com:18004" // 工作流线上地址
- // app.config.globalProperties.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
- // app.config.globalProperties.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
- // app.config.globalProperties.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
- // app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
- // app.config.globalProperties.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
- // app.config.globalProperties.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地
- app.config.globalProperties.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
- app.config.globalProperties.work_url = 'http://192.168.34.133:5173' // 工作流地址
- // app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地
- // app.config.globalProperties.url_config = 'http://192.168.34.155:19111/' //彭洁本地
- // app.config.globalProperties.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
- // app.config.globalProperties.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
- // app.config.globalProperties.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
+ if (process.env.NODE_ENV === 'development') {
+ // 开发环境
+ console.log('开发环境')
+ // app.config.globalProperties.url_config = "http://219.147.96.219:9809/" // 包头(正式)
+ // app.config.globalProperties.work_url = "http://219.147.96.219:19997" // 包头工作流线上地址(正式)
+ // app.config.globalProperties.url_config = "http://jxj.zhgdyun.com:18000/" // 包头
+ // app.config.globalProperties.work_url = "http://jxj.zhgdyun.com:18004" // 工作流线上地址
+ // app.config.globalProperties.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
+ // app.config.globalProperties.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
+ // app.config.globalProperties.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
+ // app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
+ // app.config.globalProperties.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
+ // app.config.globalProperties.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地
+ // app.config.globalProperties.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
+ app.config.globalProperties.url_config = 'http://101.43.164.214:11000/' //包头映射
+ app.config.globalProperties.work_url = 'http://192.168.34.133:5173/wflowApp/#/' // 工作流地址
+ // app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地
+ // app.config.globalProperties.url_config = 'http://192.168.34.155:19111/' //彭洁本地
+ // app.config.globalProperties.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
+ // app.config.globalProperties.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
+ // app.config.globalProperties.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
- // app.config.globalProperties.work_url = 'http://192.168.34.138:5173' // 工作流地址
- // app.config.globalProperties.work_url = 'http://139.9.66.234:5173' // 工作流地址
+ // app.config.globalProperties.work_url = 'http://192.168.34.138:5173' // 工作流地址
+ // app.config.globalProperties.work_url = 'http://139.9.66.234:5173' // 工作流地址
- // app.config.globalProperties.work_url = 'http://192.168.34.126:5173' // 工作流地址
- // app.config.globalProperties.url_config = 'http://8.142.139.165:7080/' // 湖里
- // app.config.globalProperties.url_config = 'http://139.9.66.234:5173/'
- // app.config.globalProperties.url_config = 'http://192.168.34.125:6023/'
- // app.config.globalProperties.url_config = 'http://182.90.224.237:7000/' //广西联通
- // app.config.globalProperties.url_config = 'http://124.71.67.160:8088/'//中建四局
- // app.config.globalProperties.url_config = 'http://192.168.34.148:6023' //广西联通/本地
- // app.config.globalProperties.url_config = 'http://223.82.100.80:9000/'
- // app.config.globalProperties.url_config = 'http://120.236.247.200:9000/'
- // app.config.globalProperties.url_config = 'http://zhgd.loganwy.com/'
- // app.config.globalProperties.url_config = 'http://183.60.227.61:30249/'
- // app.config.globalProperties.url_config = 'http://183.60.227.61:30249/'
- // app.config.globalProperties.url_config = 'http://124.71.178.44:9000/'
- // app.config.globalProperties.url_config = "http://58.34.63.88:9090/"
- // app.config.globalProperties.url_config = "http://183.95.84.34:7185/"
- // app.config.globalProperties.url_config = "http://218.92.215.138:9090/" //新佳城小区 123456
- // app.config.globalProperties.url_config = "http://36.137.53.203:9090/" //南昌地铁 gdjt 123456
- // app.config.globalProperties.url_config = 'http://124.71.178.44:8/'
- // app.config.globalProperties.url_config = 'http://124.71.87.250/'
- // app.config.globalProperties.url_config = 'http://124.71.178.44:8012' // 河南
- // app.config.globalProperties.url_config = 'http://182.90.224.147:100/' //演示平台
- // app.config.globalProperties.url_config = 'http://192.168.34.116:6023/'//邱平毅本地
- // app.config.globalProperties.url_config = 'http://182.90.224.147:18170'//瑞士恒通
- // app.config.globalProperties.url_config = 'https://jxjzhgd.yyvtl.com:8443/'//三江
- // app.config.globalProperties.url_config = 'http://192.168.34.221:30002'//郭圣熊本地
- // app.config.globalProperties.url_config = 'http://192.168.34.221:8188'//中建四局本地
- // app.config.globalProperties.url_config = 'http://101.43.164.214:12350'//中建五局
- // app.config.globalProperties.url_config = 'http://42.194.144.62:8088'//新中建四局地址
- // app.config.globalProperties.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地
- // app.config.globalProperties.url_config = 'http://182.90.224.147:15551'//成润线上
- // app.config.globalProperties.url_config = 'http://118.121.198.147:23232'//成润正式
- // app.config.globalProperties.url_config = 'http://huli.zjzhiliao.com/jxjgdapi'//金林湾测试
- // app.config.globalProperties.url_config = 'http://8.136.222.164:8808/'//中科安信
- // app.config.globalProperties.url_config = 'http://101.43.164.214:11111/'// 百色三标段
+ // app.config.globalProperties.work_url = 'http://192.168.34.126:5173' // 工作流地址
+ // app.config.globalProperties.url_config = 'http://8.142.139.165:7080/' // 湖里
+ // app.config.globalProperties.url_config = 'http://139.9.66.234:5173/'
+ // app.config.globalProperties.url_config = 'http://192.168.34.125:6023/'
+ // app.config.globalProperties.url_config = 'http://182.90.224.237:7000/' //广西联通
+ // app.config.globalProperties.url_config = 'http://124.71.67.160:8088/'//中建四局
+ // app.config.globalProperties.url_config = 'http://192.168.34.148:6023' //广西联通/本地
+ // app.config.globalProperties.url_config = 'http://223.82.100.80:9000/'
+ // app.config.globalProperties.url_config = 'http://120.236.247.200:9000/'
+ // app.config.globalProperties.url_config = 'http://zhgd.loganwy.com/'
+ // app.config.globalProperties.url_config = 'http://183.60.227.61:30249/'
+ // app.config.globalProperties.url_config = 'http://183.60.227.61:30249/'
+ // app.config.globalProperties.url_config = 'http://124.71.178.44:9000/'
+ // app.config.globalProperties.url_config = "http://58.34.63.88:9090/"
+ // app.config.globalProperties.url_config = "http://183.95.84.34:7185/"
+ // app.config.globalProperties.url_config = "http://218.92.215.138:9090/" //新佳城小区 123456
+ // app.config.globalProperties.url_config = "http://36.137.53.203:9090/" //南昌地铁 gdjt 123456
+ // app.config.globalProperties.url_config = 'http://124.71.178.44:8/'
+ // app.config.globalProperties.url_config = 'http://124.71.87.250/'
+ // app.config.globalProperties.url_config = 'http://124.71.178.44:8012' // 河南
+ // app.config.globalProperties.url_config = 'http://182.90.224.147:100/' //演示平台
+ // app.config.globalProperties.url_config = 'http://192.168.34.116:6023/'//邱平毅本地
+ // app.config.globalProperties.url_config = 'http://182.90.224.147:18170'//瑞士恒通
+ // app.config.globalProperties.url_config = 'https://jxjzhgd.yyvtl.com:8443/'//三江
+ // app.config.globalProperties.url_config = 'http://192.168.34.221:30002'//郭圣熊本地
+ // app.config.globalProperties.url_config = 'http://192.168.34.221:8188'//中建四局本地
+ // app.config.globalProperties.url_config = 'http://101.43.164.214:12350'//中建五局
+ // app.config.globalProperties.url_config = 'http://42.194.144.62:8088'//新中建四局地址
+ // app.config.globalProperties.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地
+ // app.config.globalProperties.url_config = 'http://182.90.224.147:15551'//成润线上
+ // app.config.globalProperties.url_config = 'http://118.121.198.147:23232'//成润正式
+ // app.config.globalProperties.url_config = 'http://huli.zjzhiliao.com/jxjgdapi'//金林湾测试
+ // app.config.globalProperties.url_config = 'http://8.136.222.164:8808/'//中科安信
+ // app.config.globalProperties.url_config = 'http://101.43.164.214:11111/'// 百色三标段
- } else {
- // 生产环境
- console.log('生产环境')
- app.config.globalProperties.url_config = "http://219.147.96.219:9809/" // 包头(正式)
- app.config.globalProperties.work_url = "http://219.147.96.219:19997" // 包头工作流线上地址(正式)
- // app.config.globalProperties.url_config = "http://jxj.zhgdyun.com:18000/" // 包头
- // app.config.globalProperties.work_url = "http://jxj.zhgdyun.com:18004" // 包头工作流线上地址
- // app.config.globalProperties.url_config = 'http://10.168.1.105:11111/' // 线上地址
- // app.config.globalProperties.url_config = 'http://10.168.1.104:11111/' // 线上地址
- // app.config.globalProperties.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用）
- // app.config.globalProperties.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
- // app.config.globalProperties.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
- // app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' // 百色三标段
- // app.config.globalProperties.url_config = 'http://192.168.34.221:9111/' // 百色三标段
- // app.config.globalProperties.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
- // app.config.globalProperties.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
- // app.config.globalProperties.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
- // app.config.globalProperties.work_url = 'http://192.168.34.139:5173' // 工作流地址
- // app.config.globalProperties.url_config = 'http://182.90.224.147:100/' //演示平台
- // app.config.globalProperties.url_config ='http://124.71.178.44:8012/' // 河南
- // app.config.globalProperties.url_config = 'http://8.142.139.165:7080/' //湖里
- // app.config.globalProperties.url_config = 'http://139.9.66.234:8/'
- // app.config.globalProperties.url_config = 'http://192.168.34.125:6023/'
- // app.config.globalProperties.url_config = 'http://182.90.224.237:7000/' //广西联通
- // app.config.globalProperties.url_config = 'http://124.71.67.160:8088/' //中建四局
- // app.config.globalProperties.url_config = 'http://192.168.34.148:6023' //广西联通/本地
- // app.config.globalProperties.url_config = 'http://223.82.100.80:9000/'
- // app.config.globalProperties.url_config = 'http://120.236.247.200:9000/'
- // app.config.globalProperties.url_config = "http://58.34.63.88:9090/"
- // app.config.globalProperties.url_config = 'http://124.71.178.44:9000/'
- // app.config.globalProperties.url_config = "http://183.95.84.34:7185/"
- // app.config.globalProperties.url_config = "http://36.137.53.203:9090/"
- // app.config.globalProperties.url_config = 'http://192.168.34.125:6023/'
- // app.config.globalProperties.url_config = 'http://183.60.227.61:30249/'
- // app.config.globalProperties.url_config = 'http://zhgd.loganwy.com/'
- // app.config.globalProperties.url_config = "http://36.137.53.203:9090/"
- // app.config.globalProperties.url_config = 'http://124.71.87.250/'
- // app.config.globalProperties.url_config = 'http://192.168.34.116:6023/'//邱平毅本地
- // app.config.globalProperties.url_config = 'http://182.90.224.147:18170/'//瑞士恒通
- // app.config.globalProperties.url_config = 'https://jxjzhgd.yyvtl.com:8443/'//三江
- // app.config.globalProperties.url_config = 'http://192.168.34.221:8188/'//中建四局本地
- // app.config.globalProperties.url_config= 'http://101.43.164.214:12350/'//中建五局
- // app.config.globalProperties.url_config = 'http://42.194.144.62:8088/'//新中建四局地址
- // app.config.globalProperties.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地
- // app.config.globalProperties.url_config = 'http://182.90.224.147:15551/'//成润线上
- // app.config.globalProperties.url_config = 'http://118.121.198.147:23232/'//成润正式
- // app.config.globalProperties.url_config = 'http://192.168.34.221:30002/'//郭圣雄本地
- // app.config.globalProperties.url_config = 'http://101.43.164.214:45022/'//盘锦
- // app.config.globalProperties.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目
- // app.config.globalProperties.url_config = 'http://jxj.zhgdyun.com:30250/#/'// 演示平台H5
- // app.config.globalProperties.url_config = 'http://101.43.164.214:11111/'// 百色三标段
- // app.config.globalProperties.url_config = 'http://8.136.222.164:8808/'//中科安信
- }
+ } else {
+ // 生产环境
+ console.log('生产环境')
+ app.config.globalProperties.url_config = "http://192.168.3.9:39809/" // 包头(内网)
+ app.config.globalProperties.work_url = "http://192.168.3.9:39809/wflowApp/#/" // 包头工作流线上地址(内网)
+ // app.config.globalProperties.url_config = "http://219.147.96.219:9809/" // 包头(正式)
+ // app.config.globalProperties.work_url = "http://219.147.96.219:19997" // 包头工作流线上地址(正式)
+ // app.config.globalProperties.url_config = "http://jxj.zhgdyun.com:18000/" // 包头
+ // app.config.globalProperties.work_url = "http://jxj.zhgdyun.com:18004" // 包头工作流线上地址
+ // app.config.globalProperties.url_config = 'http://10.168.1.105:11111/' // 线上地址
+ // app.config.globalProperties.url_config = 'http://10.168.1.104:11111/' // 线上地址
+ // app.config.globalProperties.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用）
+ // app.config.globalProperties.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
+ // app.config.globalProperties.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
+ // app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' // 百色三标段
+ // app.config.globalProperties.url_config = 'http://192.168.34.221:9111/' // 百色三标段
+ // app.config.globalProperties.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
+ // app.config.globalProperties.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
+ // app.config.globalProperties.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
+ // app.config.globalProperties.work_url = 'http://192.168.34.139:5173' // 工作流地址
+ // app.config.globalProperties.url_config = 'http://182.90.224.147:100/' //演示平台
+ // app.config.globalProperties.url_config ='http://124.71.178.44:8012/' // 河南
+ // app.config.globalProperties.url_config = 'http://8.142.139.165:7080/' //湖里
+ // app.config.globalProperties.url_config = 'http://139.9.66.234:8/'
+ // app.config.globalProperties.url_config = 'http://192.168.34.125:6023/'
+ // app.config.globalProperties.url_config = 'http://182.90.224.237:7000/' //广西联通
+ // app.config.globalProperties.url_config = 'http://124.71.67.160:8088/' //中建四局
+ // app.config.globalProperties.url_config = 'http://192.168.34.148:6023' //广西联通/本地
+ // app.config.globalProperties.url_config = 'http://223.82.100.80:9000/'
+ // app.config.globalProperties.url_config = 'http://120.236.247.200:9000/'
+ // app.config.globalProperties.url_config = "http://58.34.63.88:9090/"
+ // app.config.globalProperties.url_config = 'http://124.71.178.44:9000/'
+ // app.config.globalProperties.url_config = "http://183.95.84.34:7185/"
+ // app.config.globalProperties.url_config = "http://36.137.53.203:9090/"
+ // app.config.globalProperties.url_config = 'http://192.168.34.125:6023/'
+ // app.config.globalProperties.url_config = 'http://183.60.227.61:30249/'
+ // app.config.globalProperties.url_config = 'http://zhgd.loganwy.com/'
+ // app.config.globalProperties.url_config = "http://36.137.53.203:9090/"
+ // app.config.globalProperties.url_config = 'http://124.71.87.250/'
+ // app.config.globalProperties.url_config = 'http://192.168.34.116:6023/'//邱平毅本地
+ // app.config.globalProperties.url_config = 'http://182.90.224.147:18170/'//瑞士恒通
+ // app.config.globalProperties.url_config = 'https://jxjzhgd.yyvtl.com:8443/'//三江
+ // app.config.globalProperties.url_config = 'http://192.168.34.221:8188/'//中建四局本地
+ // app.config.globalProperties.url_config= 'http://101.43.164.214:12350/'//中建五局
+ // app.config.globalProperties.url_config = 'http://42.194.144.62:8088/'//新中建四局地址
+ // app.config.globalProperties.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地
+ // app.config.globalProperties.url_config = 'http://182.90.224.147:15551/'//成润线上
+ // app.config.globalProperties.url_config = 'http://118.121.198.147:23232/'//成润正式
+ // app.config.globalProperties.url_config = 'http://192.168.34.221:30002/'//郭圣雄本地
+ // app.config.globalProperties.url_config = 'http://101.43.164.214:45022/'//盘锦
+ // app.config.globalProperties.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目
+ // app.config.globalProperties.url_config = 'http://jxj.zhgdyun.com:30250/#/'// 演示平台H5
+ // app.config.globalProperties.url_config = 'http://101.43.164.214:11111/'// 百色三标段
+ // app.config.globalProperties.url_config = 'http://8.136.222.164:8808/'//中科安信
+ }
- app.config.globalProperties.$formatDates = formatDates;
- //时间戳转换方法 date:时间戳数字
- function formatDates(date, fmt = 'yyyy-MM-dd HH:mm:ss') {
+ app.config.globalProperties.$formatDates = formatDates;
+ //时间戳转换方法 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
+ }
- function recursiveSearchFn(dataList, resultList = []) {
- dataList.forEach(item => {
- if (item.appShow == 1) {
- // return item;
- item.operation = true;
- resultList.push(item);
- }
- if (Array.isArray(item.menuList) && item.menuList.length > 0) {
- return recursiveSearchFn(item.menuList, resultList);
- }
- });
- return resultList;
- };
- app.config.globalProperties.$recursiveSearchFn = recursiveSearchFn;
+ function recursiveSearchFn(dataList, resultList = []) {
+ dataList.forEach(item => {
+ if (item.appShow == 1) {
+ // return item;
+ item.operation = true;
+ resultList.push(item);
+ }
+ if (Array.isArray(item.menuList) && item.menuList.length > 0) {
+ return recursiveSearchFn(item.menuList, resultList);
+ }
+ });
+ return resultList;
+ };
+ app.config.globalProperties.$recursiveSearchFn = recursiveSearchFn;
- function recursiveSearch(dataList, appPath) {
- return dataList.find(item => {
- // console.log(item.path, appPath, item.menuName)
- const path = item.path ? item.path : item.modulePath;
- if (path == appPath) {
+ function recursiveSearch(dataList, appPath) {
+ return dataList.find(item => {
+ // console.log(item.path, appPath, item.menuName)
+ const path = item.path ? item.path : item.modulePath;
+ if (path == appPath) {
- return item;
- }
- if (Array.isArray(item.menuList) && item.menuList.length > 0) {
- return recursiveSearch(item.menuList, appPath);
- }
- return false;
- });
- };
- app.config.globalProperties.$recursiveSearch = recursiveSearch;
+ return item;
+ }
+ if (Array.isArray(item.menuList) && item.menuList.length > 0) {
+ return recursiveSearch(item.menuList, appPath);
+ }
+ return false;
+ });
+ };
+ app.config.globalProperties.$recursiveSearch = recursiveSearch;
- let reqNum = 0;
- app.config.globalProperties.sendRequest = function(param) {
- var _self = this,
- url = param.url,
- method = param.method,
- header = param.header || {
- 'content-type': "application/json"
- },
+ let reqNum = 0;
+ app.config.globalProperties.sendRequest = function(param) {
+ 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 = app.config.globalProperties.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 = app.config.globalProperties.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.setLoadingOptions({
- // title: '加载中...',
- // customLoading: '
'
- // });
- uni.showLoading({
- title: '加载中...',
- });
- // return
- }
- reqNum++;
- console.log("网络请求start", reqNum);
+ // 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.setLoadingOptions({
+ // title: '加载中...',
+ // customLoading: ''
+ // });
+ uni.showLoading({
+ title: '加载中...',
+ });
+ // return
+ }
+ reqNum++;
+ console.log("网络请求start", 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));
+ // 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/compatibleLogin?type=user'
- // })
- uni.redirectTo({
- url: '/pages/login/login'
- })
- }, 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/compatibleLogin?type=user'
+ // })
+ uni.redirectTo({
+ url: '/pages/login/login'
+ })
+ }, 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();
- console.log("网络请求end", reqNum);
- if (reqNum <= 0) return;
- reqNum--;
- if (!hideLoading && reqNum == 0) {
- uni.hideLoading();
- }
- return;
- }
- });
- }
- const delayering = (dataList, newResult = []) => {
- dataList.forEach((item) => {
- if (Array.isArray(item.menuList) && item.menuList.length > 0) {
- delayering(item.menuList, newResult)
- }
- if (item.menuEquipment == 0 && item.actionList) {
- newResult.unshift(item)
- }
- })
- return newResult;
- }
- // 判断按钮权限的函数
- app.config.globalProperties.checkBtnPermission = function(permission) {
- var permissions = delayering(JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList);
- // var permissions = store.state.userInfo.menuAuthority.menuList;
- // console.log(111, permission.menuPath, permissions)
- 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;
- }
- app.config.globalProperties.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;
- }
- }
+ 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();
+ console.log("网络请求end", reqNum);
+ if (reqNum <= 0) return;
+ reqNum--;
+ if (!hideLoading && reqNum == 0) {
+ uni.hideLoading();
+ }
+ return;
+ }
+ });
+ }
+ const delayering = (dataList, newResult = []) => {
+ dataList.forEach((item) => {
+ if (Array.isArray(item.menuList) && item.menuList.length > 0) {
+ delayering(item.menuList, newResult)
+ }
+ if (item.menuEquipment == 0 && item.actionList) {
+ newResult.unshift(item)
+ }
+ })
+ return newResult;
+ }
+ // 判断按钮权限的函数
+ app.config.globalProperties.checkBtnPermission = function(permission) {
+ var permissions = delayering(JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList);
+ // var permissions = store.state.userInfo.menuAuthority.menuList;
+ // console.log(111, permission.menuPath, permissions)
+ 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;
+ }
+ app.config.globalProperties.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;
+ }
+ }
- function sizeFun() {
- let scale = 0;
- uni.getSystemInfo({
- success: function(res) {
+ function sizeFun() {
+ let scale = 0;
+ uni.getSystemInfo({
+ success: function(res) {
console.log(res.windowWidth)
const width = (res.windowWidth > 760 ? 1920 : 1520)
- scale = res.windowWidth / width;
- }
- })
- console.log(888444888, 58 * Math.min(scale, 2), scale)
- return 58 * Math.min(scale, 2)
- }
+ scale = res.windowWidth / width;
+ }
+ })
+ console.log(888444888, 58 * Math.min(scale, 2), scale)
+ return 58 * Math.min(scale, 2)
+ }
- //配置到全局方便使用
- app.config.globalProperties.$pageSize = sizeFun();
+ //配置到全局方便使用
+ app.config.globalProperties.$pageSize = sizeFun();
- return {
- app
- }
+ return {
+ app
+ }
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index e44f28e..d5f0f07 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "智慧工地系统",
"appid" : "__UNI__4AA4101",
"description" : "",
- "versionName" : "1.3.2",
- "versionCode" : 132,
+ "versionName" : "1.3.3",
+ "versionCode" : 133,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -36,10 +36,10 @@
"VideoPlayer" : {},
"Bluetooth" : {},
"SQLite" : {},
- "Push" : {},
"FaceID" : {},
"Fingerprint" : {},
- "Maps" : {}
+ "Maps" : {},
+ "Push" : {}
},
/* 应用发布信息 */
"distribute" : {
@@ -192,7 +192,8 @@
"maps" : {}
},
"router" : {
- "mode" : "hash"
+ "mode" : "hash",
+ "base" : "/app/"
},
"optimization" : {
"gpuAccelerated" : true, // 启用GPU加速
diff --git a/pages/alarmPage/indexTwo.vue b/pages/alarmPage/indexTwo.vue
index 067ea61..87f2eda 100644
--- a/pages/alarmPage/indexTwo.vue
+++ b/pages/alarmPage/indexTwo.vue
@@ -24,7 +24,7 @@
-
+
@@ -54,7 +54,7 @@
@@ -106,6 +106,7 @@
import {
GetDateStr
} from "@/static/js/util.js"
+ import dayjs from 'dayjs';
export default {
data() {
return {
@@ -157,7 +158,7 @@
userInfo: {},
personTypeIndex: 0,
searchForm: {
- personType: 1, //1、施工人员 2、管理人员
+ personType: '', //1、施工人员 2、管理人员
attendanceDate: ''
},
}
@@ -208,12 +209,14 @@
methods: {
changeDate(e) {
- this.searchForm.attendanceDate = e.target.value
+ console.log(e)
+ this.searchForm.attendanceDate = e.detail.value
this.pageNo = 1
this.getListData()
},
changePersonType(e) {
- this.personTypeIndex = e.target.value
+ console.log(e)
+ this.personTypeIndex = e.detail.value
this.searchForm.personType = this.showType[this.personTypeIndex].id
this.pageNo = 1
this.getListData()
@@ -227,8 +230,8 @@
projectSn: this.projectSn,
pageNo: this.pageNo,
pageSize: this.pageSize,
- startTime: this.searchForm.attendanceDate,
- endTime: this.searchForm.attendanceDate,
+ startTime: dayjs(this.searchForm.attendanceDate).format('YYYY-MM-DD') + ' 00:00:00',
+ endTime: dayjs(this.searchForm.attendanceDate).format('YYYY-MM-DD') + ' 23:59:59',
alarmType: this.searchForm.personType,
isPushed: 1
},
@@ -247,7 +250,14 @@
}
// console.log('--------')
// this.listData = res.result.records
- this.listData = [...this.listData, ...res.result.records]
+ const resultList = res.result.records.map(item => {
+ return {
+ ...item,
+ imageUrl: this.url_config.includes("http") ? this.url_config + 'image/' + item.imageUrl : item.imageUrl,
+ }
+ })
+ console.log('resultList', resultList)
+ this.listData = [...this.listData, ...resultList]
uni.hideLoading() //关闭加载中
}
}
diff --git a/pages/homePage/components/progressCurve.vue b/pages/homePage/components/progressCurve.vue
index 5b65073..719e3b4 100644
--- a/pages/homePage/components/progressCurve.vue
+++ b/pages/homePage/components/progressCurve.vue
@@ -78,6 +78,7 @@
pxToRpx,
dateformat
} from "@/utils/tool.js";
+ import dayjs from "dayjs";
export default {
components: {
uCharts,
diff --git a/pages/projectEnd/purchasingManage/index.vue b/pages/projectEnd/purchasingManage/index.vue
index cd3e256..4efa952 100644
--- a/pages/projectEnd/purchasingManage/index.vue
+++ b/pages/projectEnd/purchasingManage/index.vue
@@ -62,7 +62,7 @@
}, {
id: 2,
urlImage: thematicActivitie,
- appName: "监造日报",
+ appName: "监造周报",
appPath: '/project/purchasingManage/supervisionDaily'
}]
};
diff --git a/pages/projectEnd/purchasingManage/supervisionDaily/index.vue b/pages/projectEnd/purchasingManage/supervisionDaily/index.vue
index 56ce864..5a6978d 100644
--- a/pages/projectEnd/purchasingManage/supervisionDaily/index.vue
+++ b/pages/projectEnd/purchasingManage/supervisionDaily/index.vue
@@ -3,7 +3,7 @@