no message

webConfig/src/App.vue

@@ -49,7 +49,7 @@
             this.$store.commit('ROUTERSTRFUN',{
                 routerStr:'/'+linkType
             })
-            document.title = 'inHealth-'+linkType
+            document.title = 'IDCOL-'+linkType
 
             this.$router.beforeEach((to, from, next) => {
                 // console.log(to.path,'--------')

webConfig/src/api/allUel.js

@@ -29,8 +29,8 @@ const urls={
 
        lampcontrolGet:'http://120.77.179.55/api/lampcontrol/get',/*设备列表*/
        lampcontrolSave:'http://120.77.179.55/api/lampcontrol/save',/*添加编辑设备*/
-
-       
+       // lampcontrolDetail:'http://120.77.179.55/api/lampcontrol/detail',/*设备详情*/
+       lampcontrolViewloglist:'http://120.77.179.55/api/lampcontrol/viewloglist',/*设备叔数据*/
     },
     /*概览信息*/
     dashboard:{

webConfig/src/components/header.vue

@@ -14,7 +14,7 @@
                             <!-- <div class="nav_li"><i class="iconfont icon-daohangjiantou"></i><span class="span">Group Configuration</span></div>
                             <div class="nav_li"><i class="iconfont icon-daohangjiantou"></i><span class="span">Video Surveillance</span></div>
                             <div class="nav_li"><i class="iconfont icon-daohangjiantou"></i><span class="span">Weather Monitoring</span></div> -->
-                            <div class="nav_li" @click="linkToFun('GIS')" :class="{'select':routerStr == '/GIS'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">GIS Map</span></div>
+                            <div class="nav_li" @click="linkToFun('/GIS')" :class="{'select':routerStr == '/GIS'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">GIS Map</span></div>
                         </div>
                         <div class="nav_ul">
                             <div class="nav_title"><span class="span">Maintain</span></div> 
@@ -25,7 +25,7 @@
                             <div class="nav_title"><span class="span">Set Up</span></div>
                             <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('/operationLog')" :class="{'select':routerStr == '/operationLog'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">Operation Log</span></div>
                         </div>
                     </div>
                     <div class="nav_right">

webConfig/src/components/sideBar_idcol.vue

@@ -123,6 +123,9 @@
             },
             commandDropdown(obj){
                 this.$set(this,obj.key,obj.id)
+                if(obj.key == 'searchType'){
+                    this.sideBarCompanyList(this.keywords,this.searchType);
+                }
             },
             screeningCheckListFun(val){
                 if(this.screeningCheckList.indexOf(val) == -1){
@@ -164,7 +167,7 @@
                 this.projectAll();
             },
             click5(data,obj,d){
-                console.log(data,obj,d,'--------------------')
+                // console.log(data,obj,d,'--------------------')
                 this.roadSelectFun(data,obj,d)
             },
             getLightListKeyUp(e){

webConfig/src/views/userManagement.vue

@@ -219,6 +219,29 @@
                 </div>
                 <div class="form_box scrollbar_style" v-if="accountType == '0'">
                     <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">
+                                <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-menu>
+                            </el-dropdown>
+                            <span class="text" v-if="accountForm.role == 1">Admin</span>
+                        </div>
+                        <div class="form_item" v-if="accountTkTitle == 'Add account'">
+                            <span class="laber">Account name</span>
+                            <el-input v-model="accountForm.account" placeholder=""></el-input>
+                        </div>
+                        <div class="form_item" v-if="accountTkTitle == 'Add account'">
+                            <span class="laber">Password</span>
+                            <el-input v-model="accountForm.password" type="password" placeholder=""></el-input>
+                        </div>
+                    </div>
+                    <div class="form">
                         <div class="form_item">
                             <span class="laber">Name</span>
                             <el-input v-model="accountForm.name" placeholder=""></el-input>
@@ -236,29 +259,6 @@
                             <el-input v-model="accountForm.company" placeholder=""></el-input>
                         </div>
                     </div>
-                    <div class="form">
-                        <div class="form_item" v-if="accountTkTitle == 'Add account'">
-                            <span class="laber">Account name</span>
-                            <el-input v-model="accountForm.account" placeholder=""></el-input>
-                        </div>
-                        <div class="form_item" v-if="accountTkTitle == 'Add account'">
-                            <span class="laber">Password</span>
-                            <el-input v-model="accountForm.password" type="password" placeholder=""></el-input>
-                        </div>
-                        <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">
-                                <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-menu>
-                            </el-dropdown>
-                            <span class="text" v-if="accountForm.role == 1">Admin</span>
-                        </div>
-                    </div>
                 </div>
                 <div class="form_ul scrollbar_style" v-if="accountType == '1'">
                     <div class="form_item" :class="{'open':item.open}" v-for="item in privilegeList" :key="item.id">