Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/baianxi_admin

src/store.js

@@ -4,11 +4,22 @@ import axios from 'axios';
 let store = {
   area:[],
   categorys:[],
+  enterprise_id:'',
   getDefault:function(){
       axios.get(`${baseURL}/api/admin/getdefault`).then(res=>{
         this.area=res.data.data.areas;
         this.categorys=res.data.data.categorys;
       })
+  },
+  mutations:{
+    setId(state,id){
+      state.enterprise_id = id;
+    }
+  },
+  getters:{
+    getId(state){
+      return state.enterprise_id
+    }
   }
 }
 store.getDefault();

src/views/CompanyData.vue

@@ -39,7 +39,20 @@
         margin-bottom: 30px;
         position: relative;
         span{
-          position: absolute;
+          // position: absolute;
+          top: 15px;
+          width: 80%;
+          text-align: center;
+          left: 0;
+          right: 0;
+          margin: auto;
+          font-size: 22px;
+          line-height: inherit;
+          font-weight:300;
+          // position: absolute;
+        }
+        .normal{
+          // position: absolute;
           top: 15px;
           width: 80%;
           text-align: center;
@@ -49,6 +62,13 @@
           font-size: 22px;
           line-height: inherit;
           font-weight:300;
+          position: absolute;
+        }
+        .el-dropdown{
+          position: absolute;
+          left:33%;
+          top:15px;
+          color:#fff;
         }
       }
       .datas{
@@ -182,7 +202,15 @@
         <img @click="min" class="min" src="../images/min.png" alt="">
         <h1 class="title">
           <img height="90px" width="100%" src="../images/bg_1.jpg" alt="">
-          <span>{{info.name}}<br>可视化系统</span>
+          <el-dropdown v-if="data.enterprise_children" >
+					  <span>{{info.name}} <i class="el-icon-arrow-down"></i><br>可视化系统</span>
+            <el-dropdown-menu slot="dropdown">
+              <div v-for='(item,i) in data.enterprise_children' :key='i'  @click='getDataAgain(item)'>
+                <el-dropdown-item>{{item.name}}</el-dropdown-item>
+              </div>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <span class="normal" v-else>{{info.name}}<br>可视化系统</span>
         </h1>
         <ul class="datas">
           <li style="width:30%;">
@@ -234,7 +262,7 @@
                 <table cellpadding='0' cellspacing='0'>
                   <!-- <thead><td>序号</td><td>企业名称</td><td>告警次数</td></thead> -->
                   <tr v-for="(item,index) in data.latest_warning" :key='index'>
-                    <td style="width:40px">{{item.riskpoint_name}}</td>
+                    <td style="width:100px">{{item.riskpoint_name}}</td>
                     <td>{{item.monit_name}}</td><td>{{item.ctime}}</td></tr>
                 </table>
               </div>
@@ -259,12 +287,14 @@ export default {
       fullscreen:'',
       info:{},
       count:0,
-      data:{}
+      data:{},
+      enterprise_id:null
     }
   },
   methods:{
     getData(){  
-      this.$api.getChartData({type:'qy'}).then(res=>{
+      // enterprise_id
+      this.$api.getChartData({type:'qy',enterprise_id:this.enterprise_id}).then(res=>{
               this.data=res.data.data
               var data=res.data.data;
               let count=0;
@@ -394,6 +424,7 @@ export default {
             for(let i=0;i<data.riskpoint_count_data.length;i++){
               fxd_name.push(data.riskpoint_count_data[i].name)
             }
+            //风险点任务
             var option4 = {
                 backgroundColor:'rgba(0,0,0,0)',
                 // color:['#3398dc'],
@@ -569,6 +600,11 @@ export default {
     },
     goTo(path){
       this.$router.push(path)
+    },
+    getDataAgain(item){
+      this.enterprise_id = item.id
+      this.getData()
+      this.info.name = item.name
     }
   },
   mounted(){

src/views/Home.vue

@@ -7,6 +7,22 @@
 	float:left;
 	margin:10px;
 }
+.settings{
+	ul{
+		position:relative;
+		left:50px;
+		top:-11px;
+		z-index:4;
+		background-color:#eee;
+		border-radius:5px;
+		list-style: none;
+		color:#000;
+		li{
+			height:40px;
+			line-height:40px;
+		}
+	}
+}
 </style>
 
 <template>
@@ -21,6 +37,15 @@
 					<i class="el-icon-s-custom"></i>
 					{{info.name}}
 				</span>
+				<!-- <el-dropdown >
+					<span> <i class="el-icon-s-custom"></i>{{checkedCompany?checkedCompany:info.name}} <i class="el-icon-arrow-down"></i></span>
+					<el-dropdown-menu slot="dropdown">
+						<div v-for='(item,i) in info.enterprise_children' :key='i'  @click='getDataAgain(item)'>
+							<el-dropdown-item>{{item.name}}</el-dropdown-item>
+						</div>
+						
+					</el-dropdown-menu>
+				</el-dropdown> -->
         <span class="logout" @click="logout"><i class="el-icon-switch-button"></i> 退出登录</span>
 			</div>
 		</el-header>
@@ -52,7 +77,7 @@
 				<el-main>			
 					
 						<transition name="fade" mode="out-in">
-						<router-view  :info='info' :community='community'></router-view>
+						<router-view  :info='info' :community='community' v-if='isShow'></router-view>
 						</transition>
 				</el-main>
 				<!-- <el-footer>Footer</el-footer> -->
@@ -66,13 +91,15 @@ export default {
 	name: 'home',
 	data() {
 		return {
+			checkedCompany:'',
 			menuList:[],
 			path:'',
 			info:{},
 			community_list:[],
 			community:{},
 			menu:[],
-			now:(new Date()).toLocaleDateString()+" "+(new Date()).toLocaleTimeString()
+			now:(new Date()).toLocaleDateString()+" "+(new Date()).toLocaleTimeString(),
+			isShow:true
 		};
 	},
 	methods: {
@@ -102,6 +129,22 @@ export default {
 			this.$api.getInfo().then(res=>{
 				this.info=res.data.data
 			})
+		},
+		getDataAgain(item){
+			console.log(111,this.store)
+			this.checkedCompany = item.name;
+			this.$router.push({path:`/companyData`,query:{
+				enterprise_id:item.id
+			}})
+			this.relode()
+			// this.$store.commit("setId",item.id)
+			// console.log(this.$store.getters.getId)
+		},
+		relode(){
+			this.isShow = false;
+			this.$nextTick(()=>{
+				this.isShow = true;
+			})
 		}
 	},
 	created(){

src/views/Login.vue

@@ -4,7 +4,7 @@
     background: url(../images/bg.png) no-repeat;
   }
   .zf_login{
-    background: url(../images/zfbg.png) no-repeat;
+    background: url(../images/bg.png) no-repeat;
   }
   .login{
     height: 100vh;
@@ -129,7 +129,7 @@ export default {
         password:'root',
         imgcode_id:'',
         imgcode:'',
-        utype:0
+        utype:2
       }
     }
   },

src/views/task/Danger.vue

@@ -129,7 +129,7 @@
                     <el-form-item label="备注">
                         <el-input :rows="4" type="textarea" v-model="form.remark"></el-input>
                     </el-form-item>
-                    <el-form-item label="二维码" v-if='curNode.children.length<=0'>
+                    <el-form-item label="二维码">
                         <img  width="150" :src="form.qrcode" alt="">
                     </el-form-item>
                     <el-form-item v-if='utype!=2'>