no message

webConfig/src/components/header.vue

@@ -26,7 +26,7 @@
                             <div class="nav_li" @click="linkToFun('/userManagement')" :class="{'select':routerStr == '/userManagement'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">User Management</span></div>
                             <!-- <div class="nav_li"><i class="iconfont icon-daohangjiantou"></i><span class="span">User Management</span></div> -->
                             <div class="nav_li" @click="linkToFun('/operationLog')" :class="{'select':routerStr == '/operationLog'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">Operation Log</span></div>
-                            <div class="nav_li" @click="linkToFun('/companyManagement')" :class="{'select':routerStr == '/companyManagement'}" v-if="role == 1"><i class="iconfont icon-daohangjiantou"></i><span class="span">Company management</span></div>
+                            <div class="nav_li" @click="linkToFun('/companyManagement')" :class="{'select':routerStr == '/companyManagement'}" v-if="username == 'admin'"><i class="iconfont icon-daohangjiantou"></i><span class="span">Company management</span></div>
                         </div>
                     </div>
                     <div class="nav_right">

webConfig/src/components/sideBar_idcol.vue

@@ -43,7 +43,7 @@
                         </p>
                         <div v-if="obj.isOpen" class="sideBar_project_box">
                             <div v-for="item in obj.sectionList"  :key="item.id" class="sideBar_project">
-                                <div class="sideBar_project_text" :class="{'sideBar_project_select':roadId==item.name}" @click.stop="click5(obj,item,{})">
+                                <div class="sideBar_project_text" :class="{'sideBar_project_select':roadId==item.name&&projectId==obj.id}" @click.stop="click5(obj,item,{})">
                                     <span :title="item.name">
                                         <span class="span1">{{item.name}}</span> 
                                     </span>
@@ -68,7 +68,7 @@
                                     <i class="el-icon-arrow-up" :style="{'transform':item.isOpen?'rotate(180deg)':''}"></i>
                                 </div>
                                 <template v-if="item.isOpen">
-                                    <div v-for="d in item.sectionList" :key="d.id" class="sideBar_road_text" :class="{'sideBar_road_select':roadId==d.name}" @click.stop="click5(obj,item,d)">
+                                    <div v-for="d in item.sectionList" :key="d.id" class="sideBar_road_text" :class="{'sideBar_road_select':roadId==d.name&&projectId==item.id}" @click.stop="click5(obj,item,d)">
                                         <span>{{d.name}}</span>
                                     </div>
                                 </template>

webConfig/src/views/projectManagement.vue

@@ -480,8 +480,11 @@
                     <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'protocoltype'"  @keyup.native="lampKeydown($event)">
                         <el-option :key="0" label="mqtt" :value="0"></el-option>
                     </el-select>
-                    <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'companyName'"  @keyup.native="lampKeydown($event)">
-                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in companyNav"></el-option>
+                    <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'poName'"  @keyup.native="lampKeydown($event)">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in companyNavPO"></el-option>
+                    </el-select>
+                    <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'supplierName'"  @keyup.native="lampKeydown($event)">
+                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in companyNavSupplier"></el-option>
                     </el-select>
 
                     <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'loadtype'"  @keyup.native="lampKeydown($event)">
@@ -1041,7 +1044,8 @@
                 fieldList:[],
 
                 /*参数弹框*/
-                companyNav:[],
+                companyNavPO:[],
+                companyNavSupplier:[],
                 detailsDialog:false,
                 detailsNavSelect:'lamp_info_log',
                 detailsNavList:[{model:'lamp_info_log',label:'路灯'},{model:'lampinfo',label:'配置'},{model:'system_info_log',label:'系统'},{model:'solar_info_log',label:'太阳能板'},{model:'battery_info_log',label:'蓄电池'}],
@@ -1083,13 +1087,16 @@
                     loadpower:'',
                     longitude:'',
                     latitude:'',
-                    companyName:'',
+                    poName:'',
+                    supplierName:'',
                     protocoltype:'',
                     loadtype:'0',
                 },
                 lightControlListEN:[
                     {model:'lamp_no',label:'Lamp number',unit:''},
-                    {model:'companyName',label:'Company name',type:'select',unit:''},{model:'network_id',label:'Network',type:"select",unit:''},
+                    {model:'poName',label:'PO name',type:'select',unit:''},
+                    {model:'supplierName',label:'Supplier name',type:'select',unit:''},
+                    {model:'network_id',label:'Network',type:"select",unit:''},
                     {model:'protocoltype',label:'Network protocol type',type:"select",unit:''},{model:'section',label:'Road',unit:''},{model:'address',label:'Wireless module address',unit:''},
                     // {model:'poleheight',label:'Lamp-post length',unit:'(m)'},
                     // {model:'polediameter',label:'Lamp-post diameter',unit:'(mm)'},
@@ -1102,7 +1109,8 @@
                 ],
                 lightControlListEN_for:[
                     {model:'lamp_no',label:'Lamp number',unit:''},
-                    {model:'companyName',label:'Company name',type:'select',unit:''},
+                    {model:'poName',label:'PO name',type:'select',unit:''},
+                    {model:'supplierName',label:'Supplier name',type:'select',unit:''},
                     {model:'protocoltype',label:'Network protocol type',type:"select",unit:''},{model:'section',label:'Road',unit:''},{model:'address',label:'Wireless module address',unit:''},
                     // {model:'poleheight',label:'Lamp-post length',unit:'(m)'},
                     // {model:'polediameter',label:'Lamp-post diameter',unit:'(mm)'},
@@ -2854,7 +2862,7 @@
                 this)
             },
             /*公司下拉列表*/
-            getCompanyNav(){
+            getCompanyNav(type){
                 console.log(this.sideBarCompanyType)
                 baseApi.ajax_post(
                     allUrl.user.company_nav,
@@ -2862,11 +2870,16 @@
                         username:this.username,
                         client_key:this.client_key,
                         token:this.token,
-                        type:this.sideBarCompanyType,
+                        type:type,
                     },
                     {},
                     data =>{
-                        this.companyNav = data.data.list;
+                        if(type == 3){
+                            this.companyNavSupplier = data.data.list;
+                        }
+                        if(type == 4){
+                            this.companyNavPO = data.data.list;
+                        }
                     },
                 this)
             },
@@ -3295,7 +3308,8 @@
             },
             /*添加灯控*/
             addLightControlFun(value){
-                this.getCompanyNav();
+                this.getCompanyNav(3);
+                this.getCompanyNav(4);
                 this.lightControlTitle = 'Add Lamp';
                 this.lightControlButton = 'Create it now';  
                 
@@ -3311,7 +3325,8 @@
             },
             /*编辑灯控*/
             editFun(data){
-                this.getCompanyNav();
+                this.getCompanyNav(3);
+                this.getCompanyNav(4);
                 this.lampId = data.id;
                 this.lampLoadtype = data.loadtype;
                 if(this.lampLoadtype == '1'){
@@ -3356,18 +3371,8 @@
                 }else if(this.lightControlTitle == 'Edit Lamp' ||this.lightControlTitle == 'Edit Insect trap'){
                     lamp_id = this.lampId;
                 }
-                if(this.sideBarCompanyType == 2){
-                    this.lightControlData.manu = this.lightControlData.companyName;
-                }
-                if(this.lightControlData.deviceType == 3){
-                    this.lightControlData.supplier = this.lightControlData.companyName;
-                }
-                if(this.lightControlData.deviceType == 4){
-                    this.lightControlData.PO = this.lightControlData.companyName;
-                }
-                if(this.lightControlData.deviceType == 5){
-                    this.lightControlData.upazilla = this.lightControlData.companyName;
-                }
+                this.lightControlData.PO = this.lightControlData.poName;
+                this.lightControlData.supplier = this.lightControlData.supplierName;
                 this.$refs['lightControlData'].validate((valid) => {
                     if(valid){
                         baseApi.ajax_post(