no message

webConfig/src/App.vue

@@ -8,6 +8,25 @@
 </template>
 
 <script>
+    Date.prototype.format = function(fmt) { 
+        let ret;
+        const opt = {
+            "Y+": this.getFullYear().toString(),        // 年
+            "m+": (this.getMonth() + 1).toString(),     // 月
+            "d+": this.getDate().toString(),            // 日
+            "H+": this.getHours().toString(),           // 时
+            "M+": this.getMinutes().toString(),         // 分
+            "S+": this.getSeconds().toString()          // 秒
+            // 有其他格式化字符需求可以继续添加，必须转化成字符串
+        };
+        for (let k in opt) {
+            ret = new RegExp("(" + k + ")").exec(fmt);
+            if (ret) {
+                fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+            }
+        }
+        return fmt; 
+    }
     Number.prototype.formatNumberRgx = function() {
         var parts = this.toString().split(".");
         parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
@@ -45,27 +64,92 @@
             Header
         },
         created(){
+            let data = {};
+            var storage = window.localStorage;
+            var street = window.location.href.split("/")[2];
+            let protocolStr = document.location.protocol;
+            let subStrW = protocolStr=='https:'?'wss:':'ws:';
+            let subStrT = new RegExp('https:');//创建正则表达式对象
+            if(street == 'localhost:8080' || street == '127.0.0.1:8080'){
+                street = '120.77.179.55'
+                protocolStr = 'http:';
+                data = {
+                    avatar: "http://120.77.179.55/upload/image/73e766a761584c547ce785af826a4e6d.jpg",
+                    client_key: "23be0e4c9a2e91b330bfeb7d20229e71",
+                    id: "1",
+                    name: "admin",
+                    privilege: "",
+                    role: 1,
+                    token: "27cc9eaa89c63c65df47901692a70bc7",
+                    username: "admin",
+                    version: "0",
+                }
+                storage.setItem('userData',JSON.stringify(data))
+            }else{
+                street = url;
+            }
+            for(let i in allUel){
+                for(let key in allUel[i]){
+                    if(i == 'websocket'){
+                        allUel[i][key]=allUel[i][key].replace(new RegExp('ws:'),subStrW);
+                    }else{
+                        allUel[i][key]=allUel[i][key].replace(subStrT,protocolStr);
+                    }
+                }
+            }
+            let subStr=new RegExp('120.77.179.55');//创建正则表达式对象
+            for(let i in allUel){
+                for(let key in allUel[i]){
+                    allUel[i][key]=allUel[i][key].replace(subStr,street);
+                }
+            }
             let linkTypeArr =  window.location.href.split("/");
             let linkType = linkTypeArr[linkTypeArr.length-1].split("?")[0];
-            this.$store.commit('ROUTERSTRFUN',{
-                routerStr:'/'+linkType
-            })
-            console.log(linkType)
-            document.title = 'IDCOL-'+linkType
-            if(linkType == 'login'||linkType == 'retrievePassword'){
-                this.headersShow = false
+            if(storage.getItem('userData')){
+                data = JSON.parse(storage.getItem('userData'))
+                this.$store.commit('USERDATAFUN',{
+                    username:data.username,
+                    id:data.id,
+                    role:data.role,
+                    lastLoginTime:data.lastLoginTime,
+                    client_key:data.client_key,
+                    privilege:data.privilege,
+                    token:data.token,
+                    number:data.number,
+                    avatar:data.avatar,
+                    version:data.version,
+                })
+
+                if(linkType == '' || linkType == 'login'){
+                    linkType = 'dashboard'
+                    this.$router.push({path:'/dashboard'})
+                    document.title = 'IDCOL-dashboard'
+                }
+                this.$store.commit('ROUTERSTRFUN',{
+                    routerStr:'/'+linkType
+                })
+                document.title = 'IDCOL-'+linkType
+                if(linkType == 'login'||linkType == 'retrievePassword'){
+                    this.headersShow = false
+                }else{
+                    this.headersShow = true
+                }
             }else{
-                this.headersShow = true
+                if(linkType != 'retrievePassword'){
+                    storage.setItem('userData','')
+                    this.$store.commit('ROUTERSTRFUN',{
+                      routerStr:'/login',
+                    })
+                    this.$router.push({path:'/login'});
+                }
             }
-
             this.$router.beforeEach((to, from, next) => {
-                // console.log(to.path,'--------')
+                console.log(to.path,'--------')
                 if(to.path == '/login'||to.path == '/retrievePassword'){
                     this.headersShow = false
                 }else{
                     this.headersShow = true
                 }
-                console.log(this.headersShow)
                 this.$store.commit('ROUTERSTRFUN',{
                     routerStr:to.path
                 })
@@ -106,95 +190,7 @@
                 })
             }
 
-            // var storage = window.localStorage;
-            // var url = window.location.hash.split("?")[1]; //获取url中"?"符后的字串
-            // var theRequest = new Object();
-            var street = window.location.href.split("/")[2];
-            let protocolStr = document.location.protocol;
-            let subStrW = protocolStr=='https:'?'wss:':'ws:';
-            let subStrT = new RegExp('https:');//创建正则表达式对象
-            if(street == 'localhost:8080' || street == '127.0.0.1:8080'){
-                street = '120.77.179.55'
-                // this.webType = 2;
-                protocolStr = 'http:';
-                // this.webType = 1;
-            }else if(street == 'solar.iotena.com'){
-                street = 'new.solar-iot.com'
-            }else if(street == 'www.gammausa.solar-iot.com'){
-                /*en*/
-                this.webType = 2;
-            }else if(street == 'www.solar.flyingsmart.net'){
-                /*正翔科技*/
-                this.webType = 1;
-            }
-            for(let i in allUel){
-                for(let key in allUel[i]){
-                    if(i == 'websocket'){
-                        allUel[i][key]=allUel[i][key].replace(new RegExp('ws:'),subStrW);
-                    }else{
-                        allUel[i][key]=allUel[i][key].replace(subStrT,protocolStr);
-                    }
-                }
-            }
-            let subStr=new RegExp('120.77.179.55');//创建正则表达式对象
-            for(let i in allUel){
-                for(let key in allUel[i]){
-                    allUel[i][key]=allUel[i][key].replace(subStr,street);
-                }
-            }
-            // this.login();
-
-            var storage = window.localStorage;
-            let data = {
-                data:{
-                    avatar: "http://120.77.179.55/upload/image/73e766a761584c547ce785af826a4e6d.jpg",
-                    client_key: "23be0e4c9a2e91b330bfeb7d20229e71",
-                    id: "1",
-                    name: "admin",
-                    role: 1,
-                    token: "27cc9eaa89c63c65df47901692a70bc7",
-                    username: "admin",
-                    version: "0",
-                    privilege:'',
-                }
-                // data:{
-                //     avatar: "",
-                //     client_key: "23be0e4c9a2e91b330bfeb7d20229e71",
-                //     id: "78",
-                //     name: "plm",
-                //     role: 2,
-                //     token: "9e7a6e106700edab6102740ea89eb7c7",
-                //     username: "plm",
-                //     version: "0",
-                // }
-            }
-            data.data.version = this.version;
-            this.$store.commit('USERDATAFUN',{
-                username:data.data.username,
-                id:data.data.id,
-                role:data.data.role,
-                lastLoginTime:data.data.lastLoginTime,
-                client_key:data.data.client_key,
-                privilege:data.data.privilege,
-                token:data.data.token,
-                number:data.data.number,
-                avatar:data.data.avatar,
-                version:data.data.version,
-            })
-            // this.$router.push({path:'/dashboard'})
-            // this.$store.commit('ROUTERSTRFUN',{
-            //   routerStr:'/dashboard',
-            // })
-            storage.setItem('userData',JSON.stringify(data.data))
-            if(this.checkboxRememberPassword){
-              storage.setItem('rememberPassword','true');
-              storage.setItem('udfn',this.username);
-              storage.setItem('udfp',jqueryK.base64Encode(this.password));
-            }
             
-            this.$store.commit('HEADERIDFUN',{
-                headerUpdate: this.headerUpdate+1,
-            })
         },
         methods:{
             login(){

webConfig/src/api/allUel.js

@@ -1,6 +1,6 @@
 const urls={
     websocket:{
-        ws:'ws://120.77.179.55/wss',
+        wss:'ws://120.77.179.55/wss',
     },
     login:{
         get_code_image:'https://120.77.179.55/api/common/get_code_image',/*获取验证码图片*/
@@ -34,22 +34,22 @@ const urls={
        lampcontrolViewloglist:'https://120.77.179.55/api/lampcontrol/viewloglist',/*设备数据*/
        lampcontrolHistorylist:'https://120.77.179.55/api/lampcontrol/historylist',/*设备历史数据*/
        lampHistoryData:'https://120.77.179.55/api/lampcontrol/lamp_history_data',/*设备历史数据*/
-       
+
         workmode:'https://120.77.179.55/api/common/workmode',/*路灯负载模式下拉列表*/
-        loadSetting:'https://120.77.179.55/api/device/lampcontrol/load_setting',/*读取灯控负载设置*/
-        modbusGetLoad:'https://120.77.179.55/api/device/lampcontrol/modbus_get_load',/*读取新的灯控负载设置*/
-        setLoad:'https://120.77.179.55/api/device/lampcontrol/set_load',/*路灯负载设置*/
-        modbusSetLoad:'https://120.77.179.55/api/device/lampcontrol/modbus_set_load',/*新的路灯负载设置*/
+        loadSetting:'https://120.77.179.55/api/lampcontrol/load_setting',/*读取灯控负载设置*/
+        modbusGetLoad:'https://120.77.179.55/api/lampcontrol/modbus_get_load',/*读取新的灯控负载设置*/
+        setLoad:'https://120.77.179.55/api/lampcontrol/set_load',/*路灯负载设置*/
+        modbusSetLoad:'https://120.77.179.55/api/lampcontrol/modbus_set_load',/*新的路灯负载设置*/
 
-        projectSetPramData:'https://120.77.179.55/api/device/project/set_pram_data',/*路灯项目负载设置*/
-        batterySetting:'https://120.77.179.55/api/device/lampcontrol/battery_setting',/*读取灯控蓄电池设置*/
-        modbusGetBattery:'https://120.77.179.55/api/device/lampcontrol/modbus_get_battery',/*读取新的灯控蓄电池设置*/
+        projectSetPramData:'https://120.77.179.55/api/project/set_pram_data',/*路灯项目负载设置*/
+        batterySetting:'https://120.77.179.55/api/lampcontrol/battery_setting',/*读取灯控蓄电池设置*/
+        modbusGetBattery:'https://120.77.179.55/api/lampcontrol/modbus_get_battery',/*读取新的灯控蓄电池设置*/
 
-        setBattery:'https://120.77.179.55/api/device/lampcontrol/set_battery',/*蓄电池参数设置*/
-        modbusSetBattery:'https://120.77.179.55/api/device/lampcontrol/modbus_set_battery',/*新的蓄电池参数设置*/
+        setBattery:'https://120.77.179.55/api/lampcontrol/set_battery',/*蓄电池参数设置*/
+        modbusSetBattery:'https://120.77.179.55/api/lampcontrol/modbus_set_battery',/*新的蓄电池参数设置*/
 
-        lampcontrolGetData:'https://120.77.179.55/api/device/lampcontrol/get_data',/*获取默认参数设置*/
-        modbusGetData:'https://120.77.179.55/api/device/lampcontrol/modbus_get_data',/*获取新控制器默认参数设置*/
+        lampcontrolGetData:'https://120.77.179.55/api/lampcontrol/get_data',/*获取默认参数设置*/
+        modbusGetData:'https://120.77.179.55/api/lampcontrol/modbus_get_data',/*获取新控制器默认参数设置*/
     },
     /*概览信息*/
     dashboard:{
@@ -79,7 +79,7 @@ const urls={
       reportData:'https://120.77.179.55/api/report/data',/*各项报表数据*/
     },
     alarm:{
-        setPatrolCmd:'https://120.77.179.55/api/device/lampcontrol/set_patrol_cmd',
+        setPatrolCmd:'https://120.77.179.55/api/lampcontrol/set_patrol_cmd',
 
         alarmGet:'https://120.77.179.55/api/alarm/get',/*告警信息列表*/
         alarmSet:'https://120.77.179.55/api/alarm/set',/*更改故障状态*/
@@ -99,13 +99,13 @@ const urls={
         delRepairInfo:'https://120.77.179.55/api/repair/del_repair_info',/*删除维修信息*/
         alarmDel:'https://120.77.179.55/api/alarm/del',/*删除/清除故障信息*/
 
-        networkGet:'https://120.77.179.55/api/device/network/get',/*网络下拉列表*/
-        networkSectionList:'https://120.77.179.55/api/device/network/network_section_list',/*网络路段列表*/
+        networkGet:'https://120.77.179.55/api/network/get',/*网络下拉列表*/
+        networkSectionList:'https://120.77.179.55/api/network/network_section_list',/*网络路段列表*/
         lampList:'https://120.77.179.55/api/home/lamp_list',/*路灯下拉列表*/
         userList:'https://120.77.179.55/api/repair/user_list',/*维修人员下拉列表*/
         alarmTypeList:'https://120.77.179.55/api/home/alarm_type_list',/*告警状态下拉列表*/
 
-        patrolPost:'https://120.77.179.55/api/device/project/patrol',/*巡检设置*/
+        patrolPost:'https://120.77.179.55/api/project/patrol',/*巡检设置*/
     },
     gisMap:{
         mapGet:'https://120.77.179.55/api/map/get',/*地图首页数据*/
@@ -114,7 +114,7 @@ const urls={
         projectInfo:'https://120.77.179.55/api/map/project_info',/*项目信息*/
         projectListUrl:'https://120.77.179.55/api/map/project_list',/*项目列表*/
         monitorInfo:'https://120.77.179.55/api/map/monitor_info',/*监控信息*/
-        lampcontrolDimming:'https://120.77.179.55/api/device/lampcontrol/dimming',/*灯控调光*/
+        lampcontrolDimming:'https://120.77.179.55/api/lampcontrol/dimming',/*灯控调光*/
         dataList:'https://120.77.179.55/api/map/data_list',/*项目信息查看列表*/
         faultInfo:'https://120.77.179.55/api/map/fault_info',
         grouplist:'https://120.77.179.55/api/policy/grouplist',/*获取分组列表*/

webConfig/src/api/base.js

@@ -109,7 +109,7 @@ export default{
     websocket1: (url, callback, error, this_) => {
         console.log(url)
         // let isTrue = true;
-        url = window.location.protocol == 'https:' ? url.replace('wss','wss') : url.replace('wss','ws');
+        // url = window.location.protocol == 'https:' ? url.replace('wss','wss') : url.replace('wss','ws');
         let websocket = null
         if ("WebSocket" in window) {
             // websocket = new WebSocket("ws://"+url);

webConfig/src/components/sideBar_idcol.vue

@@ -35,18 +35,35 @@
                         <div class="li" :class="{'select':screeningCheckList.indexOf('Upa')!=-1}" @click="screeningCheckListFun('Upa')"><span>Upa</span></div>
                     </div>
                 </div> -->
-                <div class="sideBar_list_box scrollbar_style">
+                <div class="sideBar_list_box scrollbar_style" v-if="searchType == 0">
                     <div class="sideBar_list" v-for="obj in sideBarList" :key="obj.id">
-                        <p @click="click1(obj)" class="company_name" :class="{'select':projectId==obj.id}">
+                        <p @click="click2(obj)" class="company_name" :class="{'select':projectId==obj.id}">
                             <span class="text" :title="obj.projectname"><i class="iconfont icon-celan-fenzhi"></i><span class="span1">{{obj.projectname}}</span><span class="span2">({{obj.number}})</span></span>
                             <i class="el-icon-arrow-up" :style="{'transform':obj.isOpen?'rotate(180deg)':''}"></i>
                         </p>
                         <div v-if="obj.isOpen" class="sideBar_project_box">
-                            <div v-for="item in obj.sectionList"  :key="item.id" @click="click2(item,obj.sectionList)" class="sideBar_project">
-                                <div class="sideBar_project_text">
-                                    <!-- sideBar_project_select -->
-                                    <span :title="item.name" :id="'sideBar_projectId_'+item.id">
+                            <div v-for="item in obj.sectionList"  :key="item.id" class="sideBar_project">
+                                <div class="sideBar_project_text" :class="{'sideBar_project_select':roadId==item}" @click.stop="click5(obj,item)">
+                                    <span :title="item.name">
                                         <span class="span1">{{item.name}}</span> 
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="sideBar_list_box scrollbar_style" v-if="searchType != 0">
+                    <div class="sideBar_list" v-for="obj in sideBarList" :key="obj.id">
+                        <p @click="click1(obj)" class="company_name" :class="{'select':projectId==obj.id}">
+                            <span class="text" :title="obj.projectname"><i class="iconfont icon-celan-fenzhi"></i><span class="span1">{{obj.company}}</span><span class="span2">({{obj.number}})</span></span>
+                            <i class="el-icon-arrow-up" :style="{'transform':obj.isOpen?'rotate(180deg)':''}"></i>
+                        </p>
+                        <div v-if="obj.isOpen" class="sideBar_project_box">
+                            <div v-for="item in obj.projectList"  :key="item.id" class="sideBar_project">
+                                <div class="sideBar_project_text"  @click="click2(item,obj.projectList)">
+                                    <!-- sideBar_project_select -->
+                                    <span :title="item.projectname" :id="'sideBar_projectId_'+item.id">
+                                        <span class="span1">{{item.projectname}}</span> 
                                         <!-- <span class="span2">({{item.lampcount}})</span> -->
                                     </span>
                                     <!-- <i class="el-icon-arrow-up" :style="{'transform':item.isOpen?'rotate(180deg)':''}"></i> -->
@@ -107,6 +124,7 @@
         },
         props:['sideBarList','projectId','roadId','sideBarListIsOpen','projectSelectFun','roadSelectFun','sideBarIsOn','sideBarType','reportType','sideBarCompanyList','projectAll'],
         mounted(){
+            this.searchType = 0;
             var storage = window.localStorage;
             let searchType = storage.getItem("searchType");
             if(searchType){
@@ -137,15 +155,15 @@
             },
             /*侧边栏打开关闭*/
             click1(data){
-                this.sideBarListIsOpen(data)
+                this.sideBarListIsOpen(this.searchType,data)
             },
             /*侧边栏里展开收起*/
-            click2(data,list){
+            click2(data){
                 // console.log(this.sideBarList,'-===-=')
-                if(this.searchType == 0){
-                    return
-                }
-                this.projectSelectFun(data,list)
+                // if(this.searchType == 0){
+                //     return
+                // }
+                this.projectSelectFun(this.searchType,data)
             },
             click3(){
                 this.sideBarIsOn()
@@ -167,9 +185,9 @@
             click4(){
                 this.projectAll();
             },
-            click5(data,obj,d){
+            click5(data,obj){
                 // console.log(data,obj,d,'--------------------')
-                this.roadSelectFun(data,obj,d)
+                this.roadSelectFun(this.searchType,data,obj)
             },
             getLightListKeyUp(e){
                 if(e.key == 'Enter'){
@@ -191,7 +209,7 @@
 
 <style type="text/css" lang="less">
     .side_bar_box{
-        z-index: 1999;
+        z-index: 2001;
         display: flex;
         &.open{
             left:1.3rem;

webConfig/src/views/GISMap.vue

@@ -1208,7 +1208,8 @@
                 lampEdit:'lampEdit',
                 version:'version',
                 remRatio:'remRatio',
-                GoogleJS_frequency:'GoogleJS_frequency'
+                GoogleJS_frequency:'GoogleJS_frequency',
+                role:'role'
             })
         },
         components:{sideBarIdcol},

webConfig/src/views/dashboard.vue

@@ -370,17 +370,19 @@
 
             // "Barisal", "Chittagong", "Rajshahi", "Rangpur", "Dhaka", "Sylhet", "Mymensingh", "Khulna"
             // let barisalArr = [];
+            // let j = 0;
+            // /*00000001*/
             // for(let d of bangladesh.features){
             //     d.properties.name = d.properties.Divi_name;
             //     if(d.properties.Divi_name == 'Barisal'){
             //         if(barisalArr.length ==0){
             //             barisalArr = d.geometry.coordinates[0][0];
-            //             console.log(barisalArr)
+            //             // console.log(barisalArr)
             //         }else{
             //             for(let dd of d.geometry.coordinates[0][0]){
             //                 let isTrue = false,i = 0;
             //                 for(let key in  barisalArr){
-            //                     if(Math.abs(dd[0] - barisalArr[key][0])+Math.abs(dd[1] - barisalArr[key][1]) < 0.00000010){
+            //                     if(Math.abs(dd[0] - barisalArr[key][0])+Math.abs(dd[1] - barisalArr[key][1]) < 0.0001){
             //                         isTrue = true;
             //                         i = key;
             //                         break;
@@ -393,8 +395,9 @@
             //                 }
             //             }
             //         }
-                    
             //     }
+            //     j++;
+            //     console.log(j)
             // }
             // console.log(barisalArr);
             // let tj1 = false;

webConfig/src/views/historicalData/historicalData.vue

@@ -272,6 +272,7 @@
                 client_key:'client_key',
                 projectsId:'projectsId',
                 version:'version',
+                role:'role',
           })
         },
         mounted(){

webConfig/src/views/login.vue

@@ -248,7 +248,7 @@
                 align-items: center;
                 margin-top: 9rem;
                 height: 3.33rem;line-height: 3.33rem;
-                width: 13rem;
+                width: 16rem;
                 background-color: #F6F8FA;
                 border-radius: 3.33rem;
                 .icon-quanxian1{

webConfig/src/views/userManagement.vue

@@ -221,16 +221,16 @@
                     <div class="form form1">
                         <div class="form_item">
                             <span class="laber">Account type</span>
-                            <!-- <el-input v-model="accountForm.role" placeholder=""></el-input> -->
-                            <el-dropdown @command="commandDropdown" trigger="click" @visible-change="commandHide('dropdown_projectManagement_roleName')" v-if="accountForm.role != 1">
+                            <!-- <el-input v-model="accountForm.roleType" placeholder=""></el-input> -->
+                            <el-dropdown @command="commandDropdown" trigger="click" @visible-change="commandHide('dropdown_projectManagement_roleName')" v-if="accountForm.roleType != 1">
                                 <span class="el-dropdown-link">
                                     <span>{{accountFormRoleName}}</span><i class="el-icon-caret-bottom el-icon--right"></i>
                                 </span>
                                 <el-dropdown-menu slot="dropdown" class="scrollbar_style dropdown_projectManagement_roleName_">
-                                    <el-dropdown-item v-for="item in roleList" :class="{'select':item.id==accountForm.role}" :command="{'key':'accountForm.role','id':item.id}" :key="item.id">{{item.name}}</el-dropdown-item>
+                                    <el-dropdown-item v-for="item in roleList" :class="{'select':item.id==accountForm.roleType}" :command="{'key':'accountForm.roleType','id':item.id}" :key="item.id">{{item.name}}</el-dropdown-item>
                                 </el-dropdown-menu>
                             </el-dropdown>
-                            <span class="text" v-if="accountForm.role == 1">Admin</span>
+                            <span class="text" v-if="accountForm.roleType == 1">Admin</span>
                         </div>
                         <div class="form_item" v-if="accountTkTitle == 'Add account'">
                             <span class="laber">Account name</span>
@@ -337,7 +337,7 @@
                     company:'',
                     password:'',
                     email:'',
-                    role:'',
+                    roleType:'',
                     privilegeIds:'',
                 },
                 accountTkTitle:'Edit account',
@@ -358,6 +358,7 @@
                 username:'username',
                 version:'version',
                 id:'id',
+                role:'role'
             }),
             role_Name(){
                 let name;
@@ -371,7 +372,7 @@
             accountFormRoleName(){
                 let name;
                 for(let d of this.roleList){
-                    if(d.id == this.accountForm.role){
+                    if(d.id == this.accountForm.roleType){
                         name = d.name;
                     }
                 }
@@ -498,7 +499,7 @@
                 for(let key in this.accountForm){
                     this.accountForm[key] = '';
                 }
-                this.accountForm.role = 2;
+                this.accountForm.roleType = 2;
                 this.accountType = '0';
                 let this_ = this;
                 this.accountTkShowbg = true;
@@ -783,7 +784,7 @@
                         token:this.token,
                         client_key:this.client_key,
                         keywords:this.keywords,
-                        role:this.role_,
+                        roleType:this.role_,
                     },
                     {},
                     data => {