diff --git a/public/js/config.js b/public/js/config.js index 21e9d2ba..be9a2d13 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,7 +1,7 @@ var COMPANY = ''; //通用 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 -// var COMPANY='nanchang'; //南昌地铁、衢州 +var COMPANY = 'nanchang'; //南昌地铁、衢州 // var COMPANY='longguang'; //龙光地产 // var COMPANY='zhengwu' // var COMPANY='shenbai'; //沈白高铁 @@ -11,7 +11,7 @@ var COMPANY = ''; //通用 var PROJECT = { - local_test : '', // 普通版 + local_test: '', // 普通版 online_hq: 'hengqin', // 横琴 } @@ -35,63 +35,63 @@ var showNotBuyMoudle = false; //是否展示未解锁产品 var isDockingToWoer = false; //是否是和沃尔平台对接 var mqttUrl = 'ws://139.159.226.224:8083/mqtt' // var mqttUrl = 'ws://10.139.72.12:8083/mqtt' //longguang -if(COMPANY == 'longguang'){ +if (COMPANY == 'longguang') { // mqttUrl = 'ws://139.159.226.224:8083/mqtt' // mqttUrl = 'ws://10.139.72.12:8083/mqtt' // mqttUrl = 'ws://121.35.243.71:8083/mqtt' mqttUrl = 'ws://zhgdmqtt.loganwy.com:80/mqtt' -} else if(COMPANY == 'henan'){ +} else if (COMPANY == 'henan') { mqttUrl = 'ws://139.159.226.224:8083/mqtt' } var enabledProjectV2 = 2; //是否用精益建造版 1：精益建造版(黑色) 2： 最初版（白色） 3：数据看板UI蓝色版（白色） 4:湛蓝色 var CONSTRUCTIONSTAGE = [{ - 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: '主体封顶' - }, { - id: 10, - name: '装饰装修' - }, { - id: 11, - name: '景观园林' - }, { - id: 12, - name: '主体交付' - }, { - id: 13, - name: '预售证获取' - }, { - id: 14, - name: '规划验收' - }, { - id: 15, - 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: '主体封顶' +}, { + id: 10, + name: '装饰装修' +}, { + id: 11, + name: '景观园林' +}, { + id: 12, + name: '主体交付' +}, { + id: 13, + name: '预售证获取' +}, { + id: 14, + name: '规划验收' +}, { + id: 15, + name: '竣工备案完成' +} ]; //施工阶段 // if (COMPANY != '') { // LOGO = 'logo_' + COMPANY; @@ -106,38 +106,38 @@ var CONSTRUCTIONSTAGE = [{ if (COMPANY == 'hezhan') { showNotBuyMoudle = false; CONSTRUCTIONSTAGE = [{ - 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: '水电智能化安装' - }, { - id: 10, - 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: '水电智能化安装' + }, { + id: 10, + name: '竣工验收' + } ] } // if (COMPANY == 'zhongjian') { diff --git a/src/store/index.js b/src/store/index.js index 54ac5d88..c8320b65 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,16 +45,16 @@ export default new Vuex.Store({ // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // - // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // - // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 + UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时，需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', // FILEURL: 'http://124.71.178.44:100/image/', /* 2022-06-06 */ // BASEURL:'http://192.168.34.174:6023/', - UPLOADURL: 'http://192.168.34.125:6023/upload/image', - FILEURL: 'http://192.168.34.125:6023/image/', + // UPLOADURL: 'http://192.168.34.125:6023/upload/image', + // FILEURL: 'http://192.168.34.125:6023/image/', // UPLOADURL:'http://192.168.34.246:6023/upload/image', // FILEURL:'http://192.168.34.246:6023/image', diff --git a/src/views/messageV2.vue b/src/views/messageV2.vue index 6ced18ea..348b1b6f 100644 --- a/src/views/messageV2.vue +++ b/src/views/messageV2.vue @@ -111,56 +111,26 @@ export default { // label: "访客通知", // value: "18" // }], - options:[{ - label: "高空火警", - value: "8" - },{ - label: "考勤提醒", - value: "1" - },{ - label: "防疫人员通知", - value: "2" - },{ - label: "防疫车辆通知", - value: "3" - },{ - label: "访客通知", - value: "16" - },{ - label: "混凝土监测", - value: "4" - },{ - label: "卸料平台", - value: "5" - },{ - label: "配电箱", - value: "6" - },{ - label: "扬尘", - value: "7" - },{ - label: "标养室", - value: "9" - },{ - label: "安全检查", - value: "10" - },{ - label: "质量检查", - value: "11" - },{ - label: "塔吊", - value: "12" - },{ - label: "升降机", - value: "13" - },{ - label: "电表", - value: "14" - },{ - label: "水表", - value: "15" - }], - }; + // 一期 + options: [ + { label: '高空火警', value: '8' }, + { label: '考勤提醒', value: '1' }, + { label: '防疫人员通知', value: '2' }, + { label: '防疫车辆通知', value: '3' }, + { label: '访客通知', value: '16' }, + { label: '混凝土监测', value: '4' }, + { label: '卸料平台', value: '5' }, + { label: '配电箱', value: '6' }, + { label: '扬尘', value: '7' }, + { label: '标养室', value: '9' }, + { label: '安全检查', value: '10' }, + { label: '质量检查', value: '11' }, + { label: '塔吊', value: '12' }, + { label: '升降机', value: '13' }, + { label: '电表', value: '14' }, + { label: '水表', value: '15' } + ] + } }, created() { // '消息中心'