heyang

src/api/index.js

@@ -181,6 +181,13 @@ export function examBigViewDetailSubList(data) {
         data: data
     })
 }
-
+//首页-人员违规统计-违规原因
+export function examViolationSiteGetListByType(query) {
+    return request({
+        url: '/exam/violationSite/getListByType',
+        method: 'get',
+        params: query
+    })
+}
 
 

src/views/courtyardManage/dangerDetail.vue

@@ -58,16 +58,12 @@
         <el-table-column align="center" header-align='center' prop="levelName" label="安全分级"></el-table-column>
         <el-table-column align="center" header-align='center' prop="count" label="数量"></el-table-column>
       </el-table>
-      <el-pagination
-          style="margin-top: 14px"
-          background
-          @current-change="handleCurrentChange"
-          :page-sizes="[10, 20, 30, 40]"
-          :current-page.sync="queryParams.pageNum"
-          :page-size="queryParams.pageSize"
-          layout="total,prev, pager, next"
-          :total="totalNum">
-      </el-pagination>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  :total="total"
+                  :page.sync="queryParams.page"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
     </div>
   </div>
 </template>

src/views/courtyardManage/illegalDetail.vue

@@ -11,19 +11,16 @@
         </div>
         <div class="main_b">
             <!--查询条件-->
-            <el-form :model="editForm" ref="queryParams" class="form-box" :inline="true" style="margin:20px;">
-                <el-form-item label="实验室" prop="dangerId" label-width="98px">
-                    <el-select v-model="editForm.subId" popper-class="select-big-data" placeholder="请选择实验室">
-                        <el-option
-                                v-for="item in labList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
+            <el-form :model="queryParams" ref="queryParams" class="form-box" :inline="true" style="margin:20px;">
+              <el-form-item label="实验室" prop="dangerId" label-width="98px">
+                <el-input
+                    maxLength="30"
+                    v-model="queryParams.searchValue"
+                    placeholder="实验室/房间号"
+                />
+              </el-form-item>
                 <el-form-item label="违规原因" prop="dangerId" label-width="98px">
-                    <el-select v-model="editForm.violationType" popper-class="select-big-data" placeholder="请选择违规原因">
+                    <el-select v-model="queryParams.violationType" popper-class="select-big-data" placeholder="请选择违规原因">
                         <el-option
                                 v-for="item in causeList"
                                 :key="item.id"
@@ -51,24 +48,20 @@
                 </el-form-item>
             </el-form>
             <!--列表-->
-            <el-table :data="tableData"  style="width: 100%"  height="420" :row-class-name="tableRowClassName">
-                <el-table-column align="center" header-align='center' type="index" :index="indexMethod" label="序号" width="60"></el-table-column>
+            <el-table :data="dataList"  style="width: 100%"  height="420" :row-class-name="tableRowClassName">
+              <el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
                 <el-table-column align="center" header-align='center' prop="subName" label="实验室"></el-table-column>
                 <el-table-column align="center" header-align='center' prop="typeName" label="安全分类"></el-table-column>
                 <el-table-column align="center" header-align='center' prop="classifiedName" label="安全分级"></el-table-column>
                 <el-table-column align="center" header-align='center' prop="content" label="违规原因"></el-table-column>
                 <el-table-column align="center" header-align='center' prop="num" label="违规次数"></el-table-column>
             </el-table>
-            <el-pagination
-                    style="margin-top: 14px"
-                    background
-                    @current-change="handleCurrentChange"
-                    :page-sizes="[10, 20, 30, 40]"
-                    :current-page.sync="param.pageNum"
-                    :page-size="param.pageSize"
-                    layout="total,prev, pager, next"
-                    :total="totalNum">
-            </el-pagination>
+          <pagination :page-sizes="[20, 30, 40, 50]"
+                      :total="total"
+                      :page.sync="queryParams.page"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"
+          />
         </div>
     </div>
 </template>
@@ -82,6 +75,12 @@ import {
   getSubjectDict,
 } from "../../api/http"
 import Header from '@/components/header.vue'
+import {
+  examBigViewDetailColumnar,
+  examBigViewDetailSubList,
+  laboratoryBigViewSubHazardBarChartCount,
+  securityBigViewCheckOptionChartDetails
+} from "@/api";
 export default {
   components: {
     Header
@@ -108,11 +107,55 @@ export default {
       totalNum:0,
       tableData:[],
       labList:[],//实验室
-      endDay:new Date(2019,11,0).getDate()
+      endDay:new Date(2019,11,0).getDate(),
 
+      queryParams:{
+        page:1,
+        pageSize:10,
+        searchValue:'',
+      },
+      dataList:[],
+      total:0,
     }
+  },
+  mounted() {
+    this.getList();
+    this.examBigViewDetailColumnar();
+    //this.getAjaxData()
+    //this.getAjaxList()
+
+
   },
   methods: {
+    getList(){
+      this.$set(this,'loading',true);
+      let obj = JSON.parse(JSON.stringify(this.queryParams))
+      if(this.dateRange[0]){
+        obj.beginTimeStr = this.dateRange[0]+'T00:00:00'
+        obj.endTimeStr = this.dateRange[1]+'T23:59:59'
+      }else{
+        obj.beginTimeStr = "";
+        obj.endTimeStr = "";
+      }
+      examBigViewDetailSubList(obj).then(response => {
+        this.$set(this,'loading',false);
+        this.$set(this,'dataList',response.data.records);
+        this.$set(this,'total',response.data.total);
+      });
+    },
+    examBigViewDetailColumnar(){
+      let self=this;
+      examBigViewDetailColumnar({}).then(response => {
+        var illegalDetailData=response.data.list;
+        let dataNum=[];
+        let dataLength=illegalDetailData[0].length-1;
+        for(var i=0;i<dataLength;i++){
+          dataNum.push({ type: 'bar',barMaxWidth: "20", itemStyle: { normal: { barBorderRadius: 8}},"label": {"normal": {"show": true,"position": "top",fontSize: 14,color: '#fff',}}, },)
+        }
+        self.illegalDetailFun(illegalDetailData,dataNum)
+      });
+    },
+
     back(){
       this.$router.push('/')
     },
@@ -124,34 +167,6 @@ export default {
         return 'warning-row';
       }
     },
-    indexMethod(index) {
-      return (this.param.pageNum - 1) * this.param.pageSize + index + 1;
-    },
-    //请求列表
-    getAjaxList:function (){
-      let _this=this;
-      //列表
-      let obj={
-        'pageNum':this.editForm.pageNum,
-        'pageSize':this.editForm.pageSize,
-        'subjectId':this.editForm.subId,
-        'violationType':this.editForm.violationType,
-        'beginTimeStr':this.editForm.beginTimeStr,
-        'endTimeStr':this.editForm.endTimeStr,
-      }
-      detailSubList(obj).then((res) =>{
-        if(res.code==200){
-          let data = res.rows;
-          if(data && data.length>0){
-            _this.tableData = data;
-            _this.totalNum = res.total;
-          }else{
-            _this.tableData = [];
-            _this.totalNum = 0;
-          }
-        }
-      })
-    },
     getAjaxData: function () {
       let _this=this;
       //人员违规统计图表
@@ -373,13 +388,7 @@ export default {
     _this.editForm.beginTimeStr=_this.getdate()+'-1'
     _this.editForm.endTimeStr=_this.getdate()+'-'+_this.endDay
   },
-  mounted() {
 
-    //this.getAjaxData()
-    //this.getAjaxList()
-
-
-  },
 
 
 }