up

src/views/CompanyData.vue

@@ -1,5 +1,5 @@
 <style lang="scss">
-  .index{
+  .company_data{
       .content{
         background: #151932;
         color:#fff;
@@ -40,14 +40,14 @@
         position: relative;
         span{
           position: absolute;
-          top: 10px;
+          top: 20px;
           width: 80%;
           text-align: center;
           left: 0;
           right: 0;
           margin: auto;
-          font-size: 25px;
-          line-height: 70px;
+          font-size: 22px;
+          // line-height: 70px;
           font-weight:300;
         }
       }
@@ -175,13 +175,13 @@
   }
 </style>
 <template>
-  <section class="index">
+  <section class="index company_data">
     <div class="content" :id="fullscreen">
         <img @click="max" class="max" src="../images/max.png" alt="">
         <img @click="min" class="min" src="../images/min.png" alt="">
         <h1 class="title">
-          <img height="90px" width="100%" src="../images/bg_2.jpg" alt="">
-          <span>企业安全管控可视化系统</span>
+          <img height="90px" width="100%" src="../images/bg_1.jpg" alt="">
+          <span>{{info.name}}<br>可视化系统</span>
         </h1>
         <ul class="datas">
           <li style="width:30%;">
@@ -229,18 +229,20 @@
             <div class="li_new">
               <img class="top" src="../images/bk-1.png" alt="">
               <h4>最新告警</h4>
-              <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>{{item.monit_name}}</td><td>{{item.ctime}}</td></tr>
-              </table>
+              <div style="height:310px">
+                <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>{{item.monit_name}}</td><td>{{item.ctime}}</td></tr>
+                </table>
+              </div>
               <img class="bottom" src="../images/bk-1.png" alt="">
             </div>
             <div class="li">
               <img class="top" src="../images/bk.png" alt="">
               <h4>风险点告警TOP5</h4>
-              <div id="chart6" style="width: 100%;height:378px;"></div>
+              <div id="chart6" style="width: 100%;height:420px;"></div>
               <img class="bottom" src="../images/bk.png" alt="">
             </div>
           </li>

src/views/Data.vue

@@ -226,7 +226,7 @@
                   </p>
                   <div id="chart1" style="width: 100%;height:250px;"></div>
                 </div>
-                <div id="chart2" style="width: 100%;height:300px;"></div>
+                <div id="chart2" style="width: 100%;height:330px;"></div>
                 <img class="bottom" src="../images/bk.png" alt="">
               </div>
               <div class="li">
@@ -237,7 +237,7 @@
                     {{data.yh_data[0].value+data.yh_data[1].value}}
                        <span>总隐患数(起)</span>
                   </p>
-                  <div id="chart3" style="width: 100%;height:250px;"></div>
+                  <div id="chart3" style="width: 100%;height:285px;"></div>
                 </div>
                 <img class="bottom" src="../images/bk.png" alt="">
               </div>
@@ -255,10 +255,10 @@
                   <span class="span4">政府 {{data.goverment_count}} 个</span>
                 </p>
                 <h4>行业风险统计</h4>
-                <div id="chart4" style="width: 100%;height:315px;"></div>
+                <div id="chart4" style="width: 100%;height:330px;"></div>
                 <br><br>
                 <h4>行业隐患统计</h4>
-                <div id="chart5" style="width: 100%;height:315px;"></div>
+                <div id="chart5" style="width: 100%;height:320px;"></div>
                 <img class="bottom" src="../images/bk.png" alt="">
             </div>
           </li>

src/views/GovermentData.vue

@@ -40,15 +40,15 @@
         position: relative;
         span{
           position: absolute;
-          top: 10px;
+          top: 20px;
           width: 100%;
           text-align: center;
           left: 0;
           left: 0;
           right: 0;
           margin: auto;
-          font-size: 25px;
-          line-height: 70px;
+          font-size: 22px;
+          // line-height: 70px;
           font-weight:300;
         }
       }
@@ -213,7 +213,7 @@
         <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}}可视化系统</span>
+          <span>{{info.name}} <br>可视化系统</span>
         </h1>
         <ul class="datas">
           <li style="width:30%;">
@@ -226,7 +226,7 @@
                   </p>
                   <div id="chart1" style="width: 100%;height:250px;"></div>
                 </div>
-                <div id="chart2" style="width: 100%;height:300px;"></div>
+                <div id="chart2" style="width: 100%;height:330px;"></div>
                 <img class="bottom" src="../images/bk.png" alt="">
               </div>
               <div class="li">
@@ -237,7 +237,7 @@
                     {{data.yh_data[0].value+data.yh_data[1].value}}
                        <span>总隐患数(起)</span>
                   </p>
-                  <div id="chart3" style="width: 100%;height:250px;"></div>
+                  <div id="chart3" style="width: 100%;height:285px;"></div>
                 </div>
                 <img class="bottom" src="../images/bk.png" alt="">
               </div>
@@ -254,10 +254,10 @@
                   <span class="span4">管控任务 {{data.monittask_count}} 个</span><br>
                 </p>
                 <h4>行业风险统计</h4>
-                <div id="chart4" style="width: 100%;height:315px;"></div>
-                <br><br>
+                <div id="chart4" style="width: 100%;height:340px;"></div>
+                <br><br><br>
                 <h4>行业隐患统计</h4>
-                <div id="chart5" style="width: 100%;height:315px;"></div>
+                <div id="chart5" style="width: 100%;height:340px;"></div>
                 <img class="bottom" src="../images/bk.png" alt="">
             </div>
           </li>
@@ -321,7 +321,7 @@ export default {
   },
   methods:{
     getData(){   
-      this.$api.getChartData({type:'pt'}).then(res=>{
+      this.$api.getChartData({type:'zf'}).then(res=>{
           this.data=res.data.data
           var data=res.data.data;
           let count=0;
@@ -572,8 +572,11 @@ export default {
       };
       //企业风险
       let qy_fx_data=[],qy_fx_name=[];
-      for(let j=0;j<data.enterprise_fx_data[0].data.length;j++){
-              qy_fx_name.push(data.enterprise_fx_data[0].data[j].enterprise_name)
+      for(let j=0;j<data.enterprise_fx_data[1].data.length;j++){
+        let text=data.enterprise_fx_data[1].data[j].enterprise_name;
+        let length=text.length/3
+        let br_text=text.slice(0,length)+'\n'+text.slice(length,length*2)+'\n'+text.slice(length*2,text.length)
+        qy_fx_name.push(br_text)
       }
       for(let i=0;i<data.enterprise_fx_data.length;i++){
             let _data=data.enterprise_fx_data[i].data,array=[];
@@ -629,7 +632,11 @@ export default {
       //企业隐患
       let qy_yh_data=[],qy_yh_name=[];
       for(let j=0;j<data.enterprise_yh_data[0].data.length;j++){
-              qy_yh_name.push(data.enterprise_yh_data[0].data[j].enterprise_name)
+
+              let text=data.enterprise_yh_data[0].data[j].enterprise_name;
+              let length=text.length/3
+              let br_text=text.slice(0,length)+'\n'+text.slice(length,length*2)+'\n'+text.slice(length*2,text.length)
+              qy_yh_name.push(br_text)
       }
       for(let i=0;i<data.enterprise_yh_data.length;i++){
             let _data=data.enterprise_yh_data[i].data,array=[];

src/views/company/Add.vue

@@ -56,7 +56,7 @@
                     <el-form-item label="密码" class="req">
                         <el-input clearable placeholder="请输入密码" type="password" v-model="form.password"></el-input>
                     </el-form-item>
-                    <el-form-item label="账号状态" class="">
+                    <el-form-item label="账号状态" class="" v-if='utype!=2'>
                         <el-switch
                         v-model="form.is_active"
                         active-text="启用"
@@ -160,7 +160,8 @@ export default {
       },
       category:[],
       area:[],
-      company:[]
+      company:[],
+      utype:0
     }
   },
   methods:{
@@ -257,6 +258,7 @@ export default {
             this.id=this.$route.query.id
         }
         this.getData()
+        this.utype=localStorage.getItem('utype')
   }
 }
 </script>

src/views/company/Company.vue

@@ -21,7 +21,7 @@
                 </el-form-item>
                 <el-form-item>
                        <el-button @click="form.page=1,getData()" type="primary" icon="el-icon-search">搜索</el-button>
-                       <el-button icon="el-icon-plus" @click="$router.push({path:'/company/add'})"  type="primary">创建公司</el-button>
+                       <el-button v-if='utype!=2' icon="el-icon-plus" @click="$router.push({path:'/company/add'})"  type="primary">创建公司</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -74,7 +74,7 @@
                 prop="zip"  width="320"
                 label="操作">
                 <template slot-scope="scope">
-                    <el-button icon="el-icon-view" size="mini" @click="$router.push({path:'/monitjob',query:{id:scope.row.id}})"  type="success" v-if='permission("巡检记录")'>查看巡检记录</el-button>
+                    <el-button icon="el-icon-view" size="mini" @click="$router.push({path:'/monitjob',query:{id:scope.row.id}})"  type="success">查看巡检记录</el-button>
                     <el-button icon="el-icon-view" size="mini" @click="detail(scope.row.id)"  type="success">查看</el-button>
                     <el-button icon="el-icon-edit" @click="$router.push({path:'/company/add',query:{id:scope.row.id}})" size="mini" type="warning">编辑</el-button>
                     <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
@@ -99,7 +99,7 @@ export default {
       loading:false,
       category:[],
       area:[],
-      info:{}
+      utype:0
     }
   },
   methods:{
@@ -166,9 +166,7 @@ export default {
             this.form.page_size = Number(page_size);
         }
       this.getData()
-      this.$api.getInfo().then(res=>{
-		this.info=res.data.data
-	  })
+      this.utype=localStorage.getItem('utype')
   }
 }
 </script>

src/views/company/Department.vue

@@ -66,13 +66,13 @@
                 </el-tree>
             </li>
             <li class="staff_list">
-                    <el-form label-width="70px" :inline="true" size="small" label-position="left">
+                    <el-form  v-if='utype!=2' label-width="70px" :inline="true" size="small" label-position="left">
                         <!-- <el-form-item label="公司名称">
                                 <el-input clearable placeholder="请输入公司名称" v-model="form.name"></el-input>
                         </el-form-item> -->
                         <el-form-item>
                             <!-- <el-button @click="form.page=1,getData()" type="primary" icon="el-icon-search">搜索</el-button> -->
-                            <el-button icon="el-icon-plus" @click="dialogFormVisible=true,dpt={enterprise_id:'',staffusers:[]}"  type="primary">新增部门</el-button>
+                            <el-button  icon="el-icon-plus" @click="dialogFormVisible=true,dpt={enterprise_id:'',staffusers:[]}"  type="primary">新增部门</el-button>
                         </el-form-item>
                     </el-form>
                 <el-table
@@ -221,7 +221,8 @@ export default {
             enterprise_name:'',
             name:'',
             staff:{},
-            staffList:[]
+            staffList:[],
+            utype:0
 		};
 	},
 	methods: {
@@ -376,6 +377,7 @@ export default {
     },
 	created(){
         this.getData()
+        this.utype=localStorage.getItem('utype')
 	}
 };
 </script>

src/views/material/BillList.vue

@@ -31,6 +31,10 @@
                 label="名称">
                 </el-table-column>
                 <el-table-column
+                prop="enterprise_name" 
+                label="公司">
+                </el-table-column>
+                <el-table-column
                 prop="ctime"  width="200"
                 label="时间">
                 </el-table-column>
@@ -52,6 +56,11 @@
                 <el-form-item label="标题">
                     <el-input clearable   v-model="doc.name"></el-input>
                 </el-form-item>
+                <el-form-item label="公司">
+                            <el-select clearable filterable v-model="doc.enterprise_id" placeholder="请选择">
+                                <el-option v-for="(item,index) in company" :key="index" :label="item.name" :value="item.id"></el-option>
+                            </el-select>
+                </el-form-item>
                 <el-form-item label="附件">
                      <input @change="upload('fileurl')" id='fileurl' type="file">
                 </el-form-item>
@@ -78,7 +87,8 @@ export default {
       list:[{name:'2333'}],
       loading:false,
       dialogVisible:false,
-      doc:{}
+      doc:{},
+      company:[]
     }
   },
   methods:{
@@ -130,6 +140,8 @@ export default {
         },
         add(){
             let parm=this.doc;
+            let list=this.company;
+            parm.enterprise_name=list.filter(item=>item.id==parm.enterprise_id)[0].name
             this.$api.saveBill(parm).then(res=>{
                     if(res.data.code==0){
                         this.$message({message: '添加成功！',type: 'success'});
@@ -144,6 +156,9 @@ export default {
   },
   created(){
       this.getData()
+      this.$api.getEnterpriseAll().then(res=>{
+            this.company=res.data.data;
+      })
   }
 }
 </script>

src/views/material/Frendlink.vue

@@ -29,6 +29,9 @@
                 <el-table-column
                 prop="name" 
                 label="名称">
+                <template slot-scope="scope">
+                      <el-link :href="scope.row.url" target="_blank">{{scope.row.name}}</el-link>
+                </template>
                 </el-table-column>
                 <el-table-column
                 prop="url" 

src/views/message/Index.vue

@@ -39,6 +39,18 @@
                 label="消息内容">
                 </el-table-column>
                 <el-table-column
+                prop="area" 
+                label="区域">
+                </el-table-column>
+                <el-table-column
+                prop="category" 
+                label="公司类型">
+                </el-table-column>
+                <el-table-column
+                prop="receiver_names" 
+                label="接收者">
+                </el-table-column>
+                <el-table-column
                 prop="ctime"  
                 label="发送时间">
                 <!-- <template>
@@ -49,7 +61,7 @@
                 prop="zip"  width="220"
                 label="操作">
                 <template slot-scope="scope">
-                    <el-button icon="el-icon-view" @click="open(scope.row.title,scope.row.content)" size="mini"  type="success">查看</el-button>
+                    <el-button icon="el-icon-view" @click="open(scope.row)" size="mini"  type="success">查看</el-button>
                     <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
                 </template>
                 </el-table-column>
@@ -92,6 +104,25 @@
                 <el-button size="small" type="primary" @click="send">确 定</el-button>
             </div>
         </el-dialog>
+        <el-dialog title="消息详情" :visible.sync="dialogFormVisible1" width="500px" :close-on-click-modal='false' :close-on-press-escape='false'>
+            <el-form  label-width="100px">
+                <el-form-item label="发送者">
+                    {{detail.sender_user_name}}
+                </el-form-item>
+                <el-form-item label="公司">
+                    {{detail.area}} {{detail.category}}
+                </el-form-item>
+                <el-form-item label="标题">
+                    {{detail.title}}
+                </el-form-item>
+                <el-form-item label="内容">
+                    {{detail.content}}
+                </el-form-item>
+                <el-form-item label="接收者">
+                    {{detail.receiver_names}}
+                </el-form-item>
+            </el-form>
+        </el-dialog>
     </section>
 </template>
 <script>
@@ -103,7 +134,9 @@ export default {
   data(){
     return{
       dialogFormVisible:false,
+      dialogFormVisible1:false,
       form:{name:'',page:1,page_size:20,message_type:'notice'},
+      detail:{},
       message:{send_type:1},
       activeName:"1",
       total:1,
@@ -176,10 +209,9 @@ export default {
                     }
             })
         },
-        open(title,text) {
-            this.$alert(text, title, {
-            confirmButtonText: '确定',
-            });
+        open(data) {
+            this.detail=data
+            this.dialogFormVisible1=true
         }
   },
   created(){

src/views/message/System.vue

@@ -39,6 +39,10 @@
                 label="消息内容">
                 </el-table-column>
                 <el-table-column
+                prop="receiver_names" 
+                label="接收者">
+                </el-table-column>
+                <el-table-column
                 prop="ctime"  
                 label="发送时间">
                 <!-- <template>

src/views/message/Warning.vue

@@ -39,6 +39,10 @@
                 label="消息内容">
                 </el-table-column>
                 <el-table-column
+                prop="receiver_names" 
+                label="接收者">
+                </el-table-column>
+                <el-table-column
                 prop="ctime"  
                 label="发送时间">
                 <!-- <template>

src/views/task/Danger.vue

@@ -92,7 +92,7 @@
                         <span v-if='data.type=="ent"' class="label_name"><i  class="el-icon-office-building"></i>  {{ node.label }}</span> 
                         <span v-if='data.type=="rsk"' class="label_name rsk"><img  width="15" src="../../images/rsk2.png" alt="">  {{ node.label }}</span>                           
                         <span v-if='!data.type' class="label_name rsk" style="color:#F49C0B;"><img  width="15" src="../../images/rsk1.png" alt="">  {{ node.label }}</span>  
-                        <span class="edit">
+                        <span class="edit" v-if='utype!=2'>
                             <el-button
                                 type="text"
                                 size="mini"
@@ -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>
+                    <el-form-item v-if='utype!=2'>
                         <el-button @click="save" type="primary">保存</el-button>
                         <el-button @click="form={}" type="info">取消</el-button>
                     </el-form-item>
@@ -284,6 +284,7 @@ export default {
     },
 	created(){
         this.getData();
+        this.utype=localStorage.getItem('utype')
 	}
 };
 </script>

src/views/task/DangerTask.vue

@@ -136,8 +136,8 @@
                         </el-form-item>
                         <el-form-item>
                             <el-button @click="form.page=1,getData()" type="primary" icon="el-icon-search">搜索</el-button>
-                            <el-button  @click="addTask"  type="primary">创建任务</el-button>
-                            <el-button  @click="dialogVisible=true"  type="primary">批量导入任务</el-button>
+                            <el-button v-if="utype!=2" @click="addTask"  type="primary">创建任务</el-button>
+                            <el-button v-if="utype!=2" @click="dialogVisible=true"  type="primary">批量导入任务</el-button>
                         </el-form-item>
                     </el-form>
                     <el-table
@@ -177,7 +177,7 @@
                                 <el-table-column prop="cycle" label="管控周期"></el-table-column>
                             </el-table-column>
                             <el-table-column fixed="right"
-                            prop="zip"  width="150"
+                            prop="zip"  width="150" v-if="utype!=2"
                             label="操作">
                             <template slot-scope="scope">
                                 <!-- <el-button icon="el-icon-view" size="mini"  type="success">查看</el-button> -->
@@ -539,6 +539,7 @@ export default {
 	created(){
         this.getRisk()
         this.getData()
+        this.utype=localStorage.getItem('utype')
 	}
 };
 </script>