src/assets/css/main.css

@@ -1,7 +1,6 @@
 @charset "UTF-8";
 .scroll, .el-dropdown-menu, .index .index-content > .left, .index .index-content > .right.right-page .page-content, .formula .page-content, .realTime, .realTime .page-content .realTime-bottom.weather .left-view-new, .history .page-content .el-table--scrollable-x .el-table__body-wrapper, .vrcode-model .el-dialog, .el-table .el-table__body-wrapper {
   overflow-y: auto;
-  flex-wrap: nowrap !important;
 }
 
 .scroll::-webkit-scrollbar, .el-dropdown-menu::-webkit-scrollbar, .index .index-content > .left::-webkit-scrollbar, .index .index-content > .right.right-page .page-content::-webkit-scrollbar, .formula .page-content::-webkit-scrollbar, .realTime::-webkit-scrollbar, .realTime .page-content .realTime-bottom.weather .left-view-new::-webkit-scrollbar, .history .page-content .el-table--scrollable-x .el-table__body-wrapper::-webkit-scrollbar, .vrcode-model .el-dialog::-webkit-scrollbar, .el-table .el-table__body-wrapper::-webkit-scrollbar {
@@ -3958,6 +3957,10 @@
   border: 2px solid rgba(0, 186, 255, 0.2);
 }
 
+.manage-page .scroll, .manage-page .el-dropdown-menu, .manage-page .index .index-content > .left, .index .manage-page .index-content > .left, .manage-page .index .index-content > .right.right-page .page-content, .index .index-content > .right.right-page .manage-page .page-content, .manage-page .formula .page-content, .formula .manage-page .page-content, .manage-page .realTime, .manage-page .realTime .page-content .realTime-bottom.weather .left-view-new, .realTime .page-content .realTime-bottom.weather .manage-page .left-view-new, .manage-page .history .page-content .el-table--scrollable-x .el-table__body-wrapper, .history .page-content .el-table--scrollable-x .manage-page .el-table__body-wrapper, .manage-page .vrcode-model .el-dialog, .vrcode-model .manage-page .el-dialog, .manage-page .el-table .el-table__body-wrapper, .el-table .manage-page .el-table__body-wrapper {
+  flex-wrap: nowrap !important;
+}
+
 .table-title-btn {
   min-width: 100px;
   height: 40px;

src/assets/css/main.scss

@@ -1,6 +1,6 @@
 .scroll {
     overflow-y: auto;
-    flex-wrap: nowrap!important;
+
     &::-webkit-scrollbar {
         /*滚动条整体*/
         width: 10px;
@@ -4208,6 +4208,9 @@ img{
     background: rgba(0, 92, 178, 0.15);
     padding: 20px 30px;
     border: 2px solid rgba(0, 186, 255, 0.2);
+    .scroll{
+        flex-wrap: nowrap!important;
+    }
 }
 
 .table-title-btn {

src/views/index.vue

@@ -123,11 +123,6 @@ export default {
                     {deviceTypeName:'大数据设备信息',router:'dataDevice',index:4},
                     {deviceTypeName:'手机控制模块信息',router:'mobileControl',index:5},
                 ] },
-                { name: '管理员管理', routerList: [''], img: require('../assets/image/left-img0.png'), list: [
-                    {deviceTypeName:'用户信息管理',router:'userInfoControl',index:6},
-                    {deviceTypeName:'设备管理',router:'deviceManage',index:7},
-                    // {deviceTypeName:'摄像头信息管理',router:'videoManage',index:8},
-                ] },
             ],
             manageList:['deviceStatusSet',
 'deviceSet',
@@ -148,7 +143,8 @@ export default {
             IDTimer: null,
             deviceId: '',
             limitUserId: [],
-            statusData: []
+            statusData: [],
+            roleId:2,
         }
     },
     watch: {
@@ -158,7 +154,6 @@ export default {
             if (!store.equipmentName) {
                 this.getByid()
             }
-
         },
     },
     mounted() {
@@ -192,11 +187,51 @@ export default {
 
         // 获取用户id权限
         this.get_user_getjurisdiction()
+        //获取用户身份
+        this.getRole()
     },
     beforeDestroy() {
         this.IDTimer && clearInterval(this.IDTimer)
     },
     methods: {
+        getRole(){
+            var user=   JSON.parse(localStorage.getItem('userInfo'))
+      this.api.selUserbyid(user.userid).then(res=>{
+        if(res.data.code==200){
+            this.roleId=res.data.data.roleId
+            if(this.roleId==1){
+                this.leftList1= [
+                { name: '管理', img: require('../assets/image/index-icon.png'), list: [], router: 'manage', isRouter: true, },
+                { name: '用户管理', routerList: [''], img: require('../assets/image/left-img0.png'), list: [
+                    {deviceTypeName:'控制器设备状态值设置',router:'deviceStatusSet',index:0},
+                    {deviceTypeName:'控制器设备设定值设置',router:'deviceSet',index:1},
+                    {deviceTypeName:'设备信息管理',router:'deviceInfoManage',index:2},
+                    {deviceTypeName:'设备绑定气象站数据',router:'weatherData',index:3},
+                    {deviceTypeName:'大数据设备信息',router:'dataDevice',index:4},
+                    {deviceTypeName:'手机控制模块信息',router:'mobileControl',index:5},
+                ] },
+                { name: '管理员管理', routerList: [''], img: require('../assets/image/left-img0.png'), list: [
+                    {deviceTypeName:'用户信息管理',router:'userInfoControl',index:6},
+                    {deviceTypeName:'设备管理',router:'deviceManage',index:7},
+                    // {deviceTypeName:'摄像头信息管理',router:'videoManage',index:8},
+                ] },
+            ]
+            }else{
+                this.leftList1= [
+                { name: '管理', img: require('../assets/image/index-icon.png'), list: [], router: 'manage', isRouter: true, },
+                { name: '用户管理', routerList: [''], img: require('../assets/image/left-img0.png'), list: [
+                    {deviceTypeName:'控制器设备状态值设置',router:'deviceStatusSet',index:0},
+                    {deviceTypeName:'控制器设备设定值设置',router:'deviceSet',index:1},
+                    {deviceTypeName:'设备信息管理',router:'deviceInfoManage',index:2},
+                    {deviceTypeName:'设备绑定气象站数据',router:'weatherData',index:3},
+                    {deviceTypeName:'大数据设备信息',router:'dataDevice',index:4},
+                    {deviceTypeName:'手机控制模块信息',router:'mobileControl',index:5},
+                ] },
+            ]
+            }
+        }
+      })
+        },
         // 获取用户id权限
         get_user_getjurisdiction() {
             let userInfo = localStorage.getItem("userInfo") ? JSON.parse(localStorage.getItem("userInfo")) : { userid: -1 };

src/views/manage/dataDevice.vue

@@ -51,7 +51,7 @@
                         <input type="text" v-model="nowData.deviceId" placeholder="请输入设备code码">
                     </div> -->
           <div class="manage-input-sel">
-            <div class="input-title">关联气象站设备code码</div>
+            <div class="input-title">设备code码</div>
             <el-dropdown @command="handleCommand">
               <div class="el-dropdown-link">
                 <input v-model="nowData.deviceId" type="text" class="input-input" placeholder="请选择气象站设备code码">
@@ -116,6 +116,7 @@ export default {
         
         if (res.data.code == 200) {
           this.tableData = res.data.data.bigDataControls
+          this.typeSelList=[]
           res.data.data.devices.forEach((el, index) => {
             if (el.deviceName == 10) {
               this.typeSelList.push(el)

src/views/manage/mobileControl.vue

@@ -91,6 +91,10 @@ export default {
   },
   mounted() { this.dataInit() },
   methods: {
+    topChange(item,index){
+      this.active = index
+    
+    },
     openModel(item, type) {
      
         this.nowData = JSON.parse(JSON.stringify(item))

src/views/manage/userInfoControl.vue

@@ -10,7 +10,7 @@
     </div>
     <div class="flex-view ">
       <div class="manage-input  w-180">
-        <span class="input-title">关键字查询</span>
+        <span class="input-title">昵称查询</span>
         <input class="search-input" type="text" v-model="searchName" placeholder="">
       </div>
       <div class="table-title-btn blue" @click="dataInit">

src/views/manage/weatherData.vue

@@ -94,9 +94,10 @@ export default {
 
       var user = JSON.parse(localStorage.getItem('userInfo'))
       this.api.selUserbyid(user.userid).then(res => {
-        this.typeSelList=[] 
+
         if (res.data.code == 200) {
           this.tableData = res.data.data.equipments
+          this.typeSelList=[] 
           res.data.data.devices.forEach((el,index)=>{
             if(el.deviceName==10){
               this.typeSelList.push(el)