xiaojincai преди 5 години
родител
ревизия
181d0998c4
променени са 5 файла, в които са добавени 26 реда и са изтрити 9 реда
  1. 2 2
      src/views/CompanyData.vue
  2. 2 2
      src/views/Data.vue
  3. 2 2
      src/views/GovermentData.vue
  4. 1 1
      src/views/Login.vue
  5. 19 2
      src/views/task/DangerTask.vue

+ 2 - 2
src/views/CompanyData.vue

@@ -95,7 +95,7 @@
               position: absolute;
               left: 0;
               right: 0;
-              top: 75px;
+              top: 80px;
               margin: auto;
               width: 100px;
               text-align: center;
@@ -202,7 +202,7 @@
                 <img class="top" src="../images/bk.png" alt="">
                 <h4>安全隐患实时统计</h4>
                 <div style="position:relative;">
-                  <p class="all" style="top:75px;" v-if='data.yh_data'>
+                  <p class="all" style="top:95px;" v-if='data.yh_data'>
                     {{data.yh_data[0].value+data.yh_data[1].value}}   <span>总隐患数(起)</span>
                   </p>
                   <div id="chart3" style="width: 100%;height:250px;"></div>

+ 2 - 2
src/views/Data.vue

@@ -95,7 +95,7 @@
               position: absolute;
               left: 0;
               right: 0;
-              top: 75px;
+              top: 80px;
               margin: auto;
               width: 100px;
               text-align: center;
@@ -241,7 +241,7 @@
                 <img class="top" src="../images/bk.png" alt="">
                 <h4>安全隐患实时统计</h4>
                 <div style="position:relative;">
-                  <p class="all" style="top:75px;" v-if='data.yh_data'>
+                  <p class="all" style="top:95px;" v-if='data.yh_data'>
                     {{data.yh_data[0].value+data.yh_data[1].value}}
                        <span>总隐患数(起)</span>
                   </p>

+ 2 - 2
src/views/GovermentData.vue

@@ -95,7 +95,7 @@
               position: absolute;
               left: 0;
               right: 0;
-              top: 75px;
+              top: 80px;
               margin: auto;
               width: 100px;
               text-align: center;
@@ -241,7 +241,7 @@
                 <img class="top" src="../images/bk.png" alt="">
                 <h4>安全隐患实时统计</h4>
                 <div style="position:relative;">
-                  <p class="all" style="top:75px;" v-if='data.yh_data'>
+                  <p class="all" style="top:95px;" v-if='data.yh_data'>
                     {{data.yh_data[0].value+data.yh_data[1].value}}
                        <span>总隐患数(起)</span>
                   </p>

+ 1 - 1
src/views/Login.vue

@@ -129,7 +129,7 @@ export default {
         password:'root',
         imgcode_id:'',
         imgcode:'',
-        utype:2
+        utype:0
       }
     }
   },

+ 19 - 2
src/views/task/DangerTask.vue

@@ -386,7 +386,7 @@ export default {
             if(data.type != 'ent'){
                 this.form.riskpoint_id=data.id;
                 this.form.enterprise_id=null;
-                this.getData()  
+                this.getData1(null)  
                 this.findRsk(data.id)            
                 //获取风险点详情
                 this.$api.getRiskpoint({id:data.id}).then(res=>{
@@ -406,7 +406,7 @@ export default {
             }else{
                 this.form.enterprise_id=data.id;
                 this.form.riskpoint_id=null;
-                this.getData()  
+                this.getData1(data.id)  
                 this.findRsk(data.id)            
                 //获取风险点详情
                 this.$api.getRiskpoint({id:data.id}).then(res=>{
@@ -442,6 +442,23 @@ export default {
                 this.loading=false
             })
         },
+        getData1(enterprise_id){
+            this.loading=true
+            var parm=this.form;
+            parm.enterprise_id = enterprise_id;
+            this.$api.getMonittaskList(parm).then(res=>{
+                let list=res.data.data.list
+                for(let i=0;i<list.length;i++){
+                    let item=list[i].riskpoint_item.split('|');
+                    list[i].riskpoint_item1=item[0]
+                    list[i].riskpoint_item2=item[1]
+                    list[i].riskpoint_item3=item[2]?item[2]:''
+                }
+                this.list=list
+                this.total=res.data.data.total
+                this.loading=false
+            })
+        },
         spreadRsk(){
             var data=this.data,all=this.allNode;
             spread(data)