From 969835593bd5217b223444bae71fccfdf67a2d89 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 18 四月 2022 17:12:15 +0800
Subject: [PATCH] fix

---
 src/api/sgyhpczl/auth.js                                   |   42 
 config/index.js                                            |   10 
 src/api/sgyhpczl/baseInfo.js                               |   10 
 src/views/hiddenDangerReview/recheckCancellationNumber.vue |  548 ++++---
 src/router/index.js                                        |    2 
 src/api/sgyhpczl/initSelect.js                             |   83 +
 src/api/sgyhpczl/recheckCancellationNumber.js              |   15 
 src/api/sgyhpczl/hiddenDangerRegistration.js               |   15 
 src/views/hiddenDangerManagement/index.vue                 |  485 +++---
 src/api/sgyhpczl/hiddenDangerRectification.js              |   15 
 src/api/sgyhpczl/majorHidden.js                            |   15 
 src/views/hiddenDangerRegistration/index.vue               |  744 +++++-----
 src/api/sgyhpczl/hiddenDangerManagement.js                 |   15 
 src/views/accidentHidden/majorHidden.vue                   |  484 ++++---
 src/views/delayHiddenDangerRectification/index.vue         |  656 +++++----
 src/api/sgyhpczl/delayHiddenDangerRectification.js         |   15 
 src/views/hiddenDangerRectification/index.vue              |  844 ++++++-----
 17 files changed, 2,227 insertions(+), 1,771 deletions(-)

diff --git a/config/index.js b/config/index.js
index d087506..66ee7be 100644
--- a/config/index.js
+++ b/config/index.js
@@ -9,7 +9,15 @@
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {},
+    proxyTable: {
+        '/taboi': {
+            target: 'http://123.56.127.115:8011', // 你接口的域名
+            changeOrigin: true,
+            pathRewrite: {
+                '^/taboi': '/taboi'
+            },
+        },
+    },
 
     // Various Dev Server settings
 
diff --git a/src/api/sgyhpczl/auth.js b/src/api/sgyhpczl/auth.js
new file mode 100644
index 0000000..bb29b02
--- /dev/null
+++ b/src/api/sgyhpczl/auth.js
@@ -0,0 +1,42 @@
+import Cookies from 'js-cookie'
+import baseInfo from "@/api/sgyhpczl/baseInfo";
+
+const hiddenDangerToken = 'hiddenDangerToken'
+const hiddenDangerVerify = 'hiddenDangerVerify'
+
+export function getTokenAndVerify() {
+    let token=Cookies.get(hiddenDangerToken)
+    let verify=Cookies.get(hiddenDangerVerify)
+    if (token==null || token=='' || token =="undefined" || verify==null || verify=='' || verify=="undefined"){
+        setTokenAndVerify()
+    }
+    let response={
+        token:Cookies.get(hiddenDangerToken),
+        verify:Cookies.get(hiddenDangerVerify)
+    }
+  return response
+}
+
+export function setTokenAndVerify() {
+    $.ajax({
+        url: "/taboi/account/login_do?username="+baseInfo.username+"&password="+baseInfo.password+"&key="+baseInfo.key,
+        type: "GET",
+        contentType: "multipart/form-data",
+        async: false,
+        success(res){
+            if (res.ok==1) {
+                Cookies.set(hiddenDangerToken,res.data.token)
+                Cookies.set(hiddenDangerVerify,res.data.verify)
+            }
+        }
+    });
+}
+
+export function removeTokenAndVerify() {
+    Cookies.remove(hiddenDangerToken)
+    Cookies.remove(hiddenDangerVerify)
+}
+
+
+
+
diff --git a/src/api/sgyhpczl/baseInfo.js b/src/api/sgyhpczl/baseInfo.js
new file mode 100644
index 0000000..f417cfe
--- /dev/null
+++ b/src/api/sgyhpczl/baseInfo.js
@@ -0,0 +1,10 @@
+const baseInfo={
+    username:"admin",
+    password:"ahb9014",
+    key:"TwIMUKr3xyjWuvZfgqwb",
+
+
+}
+
+
+export default baseInfo
diff --git a/src/api/sgyhpczl/delayHiddenDangerRectification.js b/src/api/sgyhpczl/delayHiddenDangerRectification.js
new file mode 100644
index 0000000..d405237
--- /dev/null
+++ b/src/api/sgyhpczl/delayHiddenDangerRectification.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request';
+import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+
+
+export function getPageList(params) {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/danger/delay_list?page="+1+"&limit="+10,
+        method: 'GET',
+    });
+}
diff --git a/src/api/sgyhpczl/hiddenDangerManagement.js b/src/api/sgyhpczl/hiddenDangerManagement.js
new file mode 100644
index 0000000..97f91fa
--- /dev/null
+++ b/src/api/sgyhpczl/hiddenDangerManagement.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request';
+import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+
+
+export function getPageList(params) {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/danger/self_list?page="+1+"&limit="+10,
+        method: 'GET',
+    });
+}
diff --git a/src/api/sgyhpczl/hiddenDangerRectification.js b/src/api/sgyhpczl/hiddenDangerRectification.js
new file mode 100644
index 0000000..a6d22bc
--- /dev/null
+++ b/src/api/sgyhpczl/hiddenDangerRectification.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request';
+import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+
+
+export function getPageList(params) {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/danger/control_list?page="+1+"&limit="+10,
+        method: 'GET',
+    });
+}
diff --git a/src/api/sgyhpczl/hiddenDangerRegistration.js b/src/api/sgyhpczl/hiddenDangerRegistration.js
new file mode 100644
index 0000000..84a246e
--- /dev/null
+++ b/src/api/sgyhpczl/hiddenDangerRegistration.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request';
+import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+
+
+export function getPageList(params) {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/danger/register_list?page="+1+"&limit="+10,
+        method: 'GET',
+    });
+}
diff --git a/src/api/sgyhpczl/initSelect.js b/src/api/sgyhpczl/initSelect.js
new file mode 100644
index 0000000..d4c653f
--- /dev/null
+++ b/src/api/sgyhpczl/initSelect.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+
+//所有搜索条件的下拉框
+
+//隐患级别
+export function initYHJB() {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/user/option_ht_level",
+        method: 'GET',
+    });
+}
+
+//检查部门
+// 上级单位 type=1 ,否则 type=0
+export function initJCBM(type) {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/user/option_check_branch?type="+type,
+        method: 'GET',
+    });
+}
+
+//隐患类型
+export function initYHLX() {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/user/option_ht_type",
+        method: 'GET',
+    });
+}
+
+//班次
+export function initBC() {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/user/option_check_class",
+        method: 'GET',
+    });
+}
+
+//检查类别
+export function initJCLB() {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/user/option_check_type",
+        method: 'GET',
+    });
+}
+
+//隐患部门
+export function initYHBM() {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/user/option_branch",
+        method: 'GET',
+    });
+}
diff --git a/src/api/sgyhpczl/majorHidden.js b/src/api/sgyhpczl/majorHidden.js
new file mode 100644
index 0000000..57f9163
--- /dev/null
+++ b/src/api/sgyhpczl/majorHidden.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request';
+import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+
+
+export function getPageList(params) {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/danger/major_list?page="+1+"&limit="+10,
+        method: 'GET',
+    });
+}
diff --git a/src/api/sgyhpczl/recheckCancellationNumber.js b/src/api/sgyhpczl/recheckCancellationNumber.js
new file mode 100644
index 0000000..f8dcace
--- /dev/null
+++ b/src/api/sgyhpczl/recheckCancellationNumber.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request';
+import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+
+
+export function getPageList(params) {
+    return request({
+        headers:{
+            'token': getTokenAndVerify().token,
+            'verify':getTokenAndVerify().verify
+        },
+        contentType: "multipart/form-data",
+        url: "/taboi/danger/review_list?page="+1+"&limit="+10,
+        method: 'GET',
+    });
+}
diff --git a/src/router/index.js b/src/router/index.js
index 6b88c8a..9adc9f7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -116,7 +116,7 @@
       {
           id: 2,
         parentId: 0,
-        path: '/safetyproduction',
+        path: '/aqscbzh',
         component: Layout,
         name: '安全生产标准化',
         meta: { title: '安全生产标准化', icon: 'el-icon-security' },
diff --git a/src/views/accidentHidden/majorHidden.vue b/src/views/accidentHidden/majorHidden.vue
index c0b4936..e5d8dbb 100644
--- a/src/views/accidentHidden/majorHidden.vue
+++ b/src/views/accidentHidden/majorHidden.vue
@@ -1,147 +1,149 @@
 <template>
   <div class="app-container">
-<el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
-   <el-form-item label="编号">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="检查单位">
-     <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查部门">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查人">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="隐患单位">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患部门">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患类别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患级别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查类别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患地点">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="隐患内容">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="班次">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="是否关联">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="录入人">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查时间">
-      <el-col :span="11">
-      <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-    <el-col style="text-align:center" :span="2">-</el-col>
-    <el-col :span="11">
-       <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-  </el-form-item>
-   <el-form-item label="限改时间">
-      <el-col :span="11">
-      <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-    <el-col style="text-align:center" :span="2">-</el-col>
-    <el-col :span="11">
-       <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-  </el-form-item>
-   <el-form-item style="text-align:center;padding:0 50px">
-    <el-button type="primary" class="btns" size="small" icon="el-icon-search">查询</el-button>
-    <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
-  </el-form-item>
-  </el-form>
+    <el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+       <el-form-item label="编号">
+        <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input>
+      </el-form-item>
+       <el-form-item label="检查单位">
+         <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择"  @change="changeJCDW">
+        <el-option
+          v-for="item in JCDWList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="检查部门">
+           <el-select v-model="listQuery.form.check_branch" placeholder="请选择">
+        <el-option
+          v-for="item in JCBMList"
+          :key="item.value"
+          :label="item.value"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="检查人">
+        <el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
+      </el-form-item>
+       <el-form-item label="隐患单位">
+           <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="隐患部门">
+           <el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
+        <el-option
+          v-for="item in YHBMList"
+          :key="item.value"
+          :label="item.value"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="隐患类别">
+           <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+        <el-option
+          v-for="item in YHLXList"
+          :key="item.value"
+          :label="item.value"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="隐患级别">
+           <el-select v-model="listQuery.form.ht_level" placeholder="请选择">
+        <el-option
+          v-for="item in YHJBList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="检查类别">
+           <el-select v-model="listQuery.form.checktype" placeholder="请选择">
+        <el-option
+          v-for="item in JCLBList"
+          :key="item.value"
+          :label="item.value"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="隐患地点">
+        <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
+      </el-form-item>
+       <el-form-item label="隐患内容">
+        <el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
+      </el-form-item>
+       <el-form-item label="班次">
+           <el-select v-model="listQuery.form.check_class" placeholder="请选择">
+        <el-option
+          v-for="item in BCList"
+          :key="item.value"
+          :label="item.value"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="是否关联">
+           <el-select v-model="listQuery.form.number" placeholder="请选择">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="录入人">
+           <el-select v-model="listQuery.form.number" placeholder="请选择">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.value"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      </el-form-item>
+       <el-form-item label="检查时间">
+          <el-col :span="11">
+          <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+        </el-col>
+        <el-col style="text-align:center" :span="2">-</el-col>
+        <el-col :span="11">
+           <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+        </el-col>
+      </el-form-item>
+       <el-form-item label="限改时间">
+          <el-col :span="11">
+          <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+        </el-col>
+        <el-col style="text-align:center" :span="2">-</el-col>
+        <el-col :span="11">
+           <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+        </el-col>
+      </el-form-item>
+       <el-form-item style="text-align:center;padding:0 50px">
+        <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+           <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
+        <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+      </el-form-item>
+      </el-form>
     <el-row class="title-center">
       <el-col :span="10">
-        <el-radio-group v-model="radio1" style="border:none">
-      <el-radio-button label="正在整改"></el-radio-button>
-      <el-radio-button label="正在复查"></el-radio-button>
-      <el-radio-button label="整改完成"></el-radio-button>
+        <el-radio-group v-model="listQuery.form.alter_status" style="border:none">
+      <el-radio-button  label="2">正在整改</el-radio-button>
+      <el-radio-button  label="3">正在复查</el-radio-button>
+      <el-radio-button  label="end">整改完成</el-radio-button>
     </el-radio-group>
       </el-col>
       <el-col :offset="4" :span="10" style="text-align:right;">
@@ -150,53 +152,27 @@
       </el-col>
     </el-row>
     <el-table :data="tableData" style="width: 100%">
-      <el-table-column
-        type="selection"
-        width="55"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="date"
-        label="编号"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查部门"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查人"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column prop="date" label="检查类别" align="center">
+      <el-table-column type="selection" width="55" align="center"></el-table-column>
+      <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+      <el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
+      <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
+      <el-table-column prop="checktype" label="检查类别" align="center">
       </el-table-column>
       <el-table-column label="隐患项目" align="center">
-        <el-table-column label="检查时间" width="120" sortable align="center">
-        </el-table-column>
-        <el-table-column label="地点" align="center"> </el-table-column>
-        <el-table-column label="内容" align="center"> </el-table-column>
-        <el-table-column label="类别" align="center"> </el-table-column>
-        <el-table-column label="级别" align="center"> </el-table-column>
+        <el-table-column prop="check_date" label="检查时间" width="120"  align="center"></el-table-column>
+        <el-table-column prop="address" label="地点" align="center"> </el-table-column>
+        <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
+        <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
+        <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
       </el-table-column>
       <el-table-column label="整改计划" align="center">
-        <el-table-column label="整改措施" align="center"> </el-table-column>
-        <el-table-column label="隐患部门" align="center"> </el-table-column>
-        <el-table-column label="责任人" align="center"> </el-table-column>
-        <el-table-column label="限改时间" width="120" sortable align="center">
+        <el-table-column prop="measure" label="整改措施" align="center"> </el-table-column>
+        <el-table-column prop="ht_branch" label="隐患部门" align="center"> </el-table-column>
+        <el-table-column prop="duty_officer" label="责任人" align="center"> </el-table-column>
+        <el-table-column prop="alter_time" label="限改时间" width="120"  align="center">
         </el-table-column>
       </el-table-column>
-      <el-table-column label="风险等级" align="center"> </el-table-column>
+      <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column>
     </el-table>
     <div style="text-align: right">
       <el-pagination
@@ -214,34 +190,128 @@
   </div>
 </template>
 <script>
+import {getPageList} from "@/api/sgyhpczl/majorHidden";
+import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
 export default {
-  data() {
-    return {
-      form:{},
-      radio1: '正在整改',
-       options: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
-      tableData: [],
-      pageSize: 10,
-      recordTotal: 0,
-      currentPage: 1,
-    };
-  },
+    data() {
+        return {
+            options: [],
+            form:{},
+
+            JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
+            JCBMList:[],
+            YHLXList:[],
+            BCList:[],
+            JCLBList:[],
+            YHBMList:[],
+            YHJBList:[],
+            tableData: [],
+            listQuery:{
+                page:1,
+                limit:10,
+                form:{
+                },
+            },
+            currentPage: 1,
+            pageSize: 10,
+            recordTotal: 0,
+        };
+    },
+    mounted(){
+        this.getPageList()
+        this.initYHLX()
+        this.initYHJB()
+        this.initBC()
+        this.initJCLB()
+    },
     methods:{
+
+        changeYHDW(val){
+            initYHBM().then(res=>{
+                if (res.data.ok==1){
+                    this.YHBMList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        changeJCDW(val){
+            initJCBM(val).then(res=>{
+                if (res.data.ok==1){
+                    this.JCBMList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        getPageList(){
+            this.listQuery.page=1
+            getPageList(this.listQuery).then(res=>{
+                if (res.data.ok==1) {
+                    this.tableData = res.data.data
+                    // this.recordTotal=res.data.data.length
+                }else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        reset(){
+            this.listQuery.form={}
+            this.getPageList()
+        },
+        handleSizeChange(val){
+            this.listQuery.limit = val
+            this.getPageListForPagination();
+        },
+        handleCurrentChange(val){
+            this.listQuery.page = val
+            this.getPageListForPagination();
+        },
+        getPageListForPagination(){
+            getPageList(this.listQuery).then(res=>{
+                if (res.data.ok==1) {
+                    this.tableData = res.data.data
+                }else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initYHLX(){
+            initYHLX().then(res=>{
+                if (res.data.ok==1){
+                    this.YHLXList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initYHJB(){
+            initYHJB().then(res=>{
+                if (res.data.ok==1){
+                    this.YHJBList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initBC(){
+            initBC().then(res=>{
+                if (res.data.ok==1){
+                    this.BCList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initJCLB(){
+            initJCLB().then(res=>{
+                if (res.data.ok==1){
+                    this.JCLBList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
         fillProgress(){
             this.$router.push({
                 path:"/fillProgress"
diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index 7f69dac..35257bf 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -1,309 +1,363 @@
 <template>
-  <div class="app-container">
-<el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
-   <el-form-item label="编号">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="检查单位">
-     <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查部门">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查人">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="隐患单位">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患部门">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患类别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患级别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查类别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患地点">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="隐患内容">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="班次">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="是否关联">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="录入人">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查时间">
-      <el-col :span="11">
-      <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-    <el-col style="text-align:center" :span="2">-</el-col>
-    <el-col :span="11">
-       <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-  </el-form-item>
-   <el-form-item label="限改时间">
-      <el-col :span="11">
-      <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-    <el-col style="text-align:center" :span="2">-</el-col>
-    <el-col :span="11">
-       <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-  </el-form-item>
-   <el-form-item style="text-align:center;padding:0 50px">
-    <el-button type="primary" class="btns"  size="small" icon="el-icon-search">查询</el-button>
-    <el-button type="primary" class="btns"  size="small" icon="el-icon-upload2">导出excel</el-button>
-  </el-form-item>
-  </el-form>
-    <el-row class="title-center">
-      <!-- <el-col :span="10">
-        <el-radio-group v-model="radio1">
-      <el-radio-button label="上海"></el-radio-button>
-      <el-radio-button label="北京"></el-radio-button>
-      <el-radio-button label="广州"></el-radio-button>
-    </el-radio-group>
-      </el-col> -->
-      <el-col  :span="24" style="text-align:right;">
-        <el-button class="btns" type="primary" size="small">批量发送</el-button>
-      </el-col>
-    </el-row>
-    <el-table :data="tableData" style="width: 100%"  @selection-change="handleSelectionChange">
-      <el-table-column
-        type="selection"
-        width="55"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="date"
-        label="编号"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查部门"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查人"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column prop="date" label="检查类别" align="center">
-      </el-table-column>
-      <el-table-column label="隐患项目" align="center">
-        <el-table-column label="检查时间" width="120" sortable align="center">
-        </el-table-column>
-        <el-table-column label="地点" align="center"> </el-table-column>
-        <el-table-column label="内容" align="center"> </el-table-column>
-        <el-table-column label="类别" align="center"> </el-table-column>
-        <el-table-column label="级别" align="center"> </el-table-column>
-      </el-table-column>
-      <el-table-column label="整改计划" align="center">
-        <el-table-column label="整改措施" align="center"> </el-table-column>
-        <el-table-column label="隐患部门" align="center"> </el-table-column>
-        <el-table-column label="责任人" align="center"> </el-table-column>
-        <el-table-column label="限改时间" width="120" sortable align="center">
-        </el-table-column>
-        <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
-      </el-table-column>
-      <el-table-column label="整改情况" align="center">
-        <el-table-column label="完成时间" sortable width="120" align="center"> </el-table-column>
-        <el-table-column label="复查结果" align="center"> </el-table-column>
-        <el-table-column label="复查人" align="center"> </el-table-column>
-        <el-table-column label="复查时间" width="120" sortable align="center">
-        </el-table-column>
-        <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
-      </el-table-column>
-      <el-table-column label="隐患处理状态" align="center"> </el-table-column>
-      <el-table-column label="是否关联" align="center"> </el-table-column>
-      <el-table-column label="风险等级" align="center"> </el-table-column>
-      <el-table-column label="初始警情" align="center"> </el-table-column>
-      <el-table-column label="当前警情" align="center"> </el-table-column>
-      <el-table-column label="流程操作" align="center">
-          <template slot-scope="scope">
-              <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
-          </template>
-      </el-table-column>
-    </el-table>
-    <div style="text-align: right">
-      <el-pagination
-        v-show="recordTotal > 0"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="recordTotal"
-      >
-      </el-pagination>
+    <div class="app-container">
+        <el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+            <el-form-item label="编号">
+                <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="检查单位">
+                <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择"  @change="changeJCDW">
+                    <el-option
+                        v-for="item in JCDWList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查部门">
+                <el-select v-model="listQuery.form.check_branch" placeholder="请选择">
+                    <el-option
+                        v-for="item in JCBMList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查人">
+                <el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="隐患单位">
+                <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患部门">
+                <el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
+                    <el-option
+                        v-for="item in YHBMList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患类别">
+                <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+                    <el-option
+                        v-for="item in YHLXList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患级别">
+                <el-select v-model="listQuery.form.ht_level" placeholder="请选择">
+                    <el-option
+                        v-for="item in YHJBList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查类别">
+                <el-select v-model="listQuery.form.checktype" placeholder="请选择">
+                    <el-option
+                        v-for="item in JCLBList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患地点">
+                <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="隐患内容">
+                <el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="班次">
+                <el-select v-model="listQuery.form.check_class" placeholder="请选择">
+                    <el-option
+                        v-for="item in BCList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+              <el-form-item label="是否关联">
+                  <el-select v-model="listQuery.form.number" placeholder="请选择">
+                      <el-option
+                          v-for="item in options"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                      </el-option>
+                  </el-select>
+              </el-form-item>
+              <el-form-item label="录入人">
+                  <el-select v-model="listQuery.form.number" placeholder="请选择">
+                      <el-option
+                          v-for="item in options"
+                          :key="item.value"
+                          :label="item.value"
+                          :value="item.value">
+                      </el-option>
+                  </el-select>
+              </el-form-item>
+            <el-form-item label="检查时间">
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+                <el-col style="text-align:center" :span="2">-</el-col>
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+            </el-form-item>
+            <el-form-item label="限改时间">
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+                <el-col style="text-align:center" :span="2">-</el-col>
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+            </el-form-item>
+            <el-form-item style="text-align:center;padding:0 50px">
+                <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+                <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
+                <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row class="title-center">
+            <!-- <el-col :span="10">
+              <el-radio-group v-model="radio1">
+            <el-radio-button label="上海"></el-radio-button>
+            <el-radio-button label="北京"></el-radio-button>
+            <el-radio-button label="广州"></el-radio-button>
+          </el-radio-group>
+            </el-col> -->
+            <el-col  :span="24" style="text-align:right;">
+                <el-button class="btns" type="primary" size="small">批量发送</el-button>
+            </el-col>
+        </el-row>
+        <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center"></el-table-column>
+            <el-table-column prop="number" label="编号" align="center"  width="120"></el-table-column>
+            <el-table-column prop="check_branch" label="检查部门" align="center"  width="120"></el-table-column>
+            <el-table-column prop="check_man" label="检查人" align="center"  width="120"></el-table-column>
+            <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
+            <el-table-column label="隐患项目" align="center">
+                <el-table-column prop="check_date" label="检查时间" width="120"  align="center"></el-table-column>
+                <el-table-column prop="address" label="地点" align="center"> </el-table-column>
+                <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
+                <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
+                <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
+            </el-table-column>
+            <el-table-column label="整改计划" align="center">
+                <el-table-column prop="measure" label="整改措施" align="center"> </el-table-column>
+                <el-table-column prop="ht_branch" label="隐患部门" align="center"> </el-table-column>
+                <el-table-column prop="duty_officer" label="责任人" align="center"> </el-table-column>
+                <el-table-column prop="alter_time" label="限改时间" width="120"  align="center"></el-table-column>
+            </el-table-column>
+            <el-table-column label="整改情况" align="center">
+                <el-table-column prop="ACCOMPLISHTIME" label="完成时间"  width="120" align="center"> </el-table-column>
+                <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"> </el-table-column>
+                <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"> </el-table-column>
+                <el-table-column prop="CALLBACKTIME" label="复查时间" width="120"  align="center"></el-table-column>
+            </el-table-column>
+            <el-table-column  label="隐患处理状态" align="center">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.step =='1'">初始状态</span>
+                    <span v-if="scope.row.step =='2'">整改中</span>
+                    <span v-if="scope.row.step =='3'">复查中</span>
+                    <span v-if="scope.row.step =='end'">处理结束</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="是否关联" align="center"> </el-table-column>
+            <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column>
+            <el-table-column prop="date" label="初始警情" align="center"> </el-table-column>
+            <el-table-column prop="date" label="当前警情" align="center"> </el-table-column>
+            <el-table-column prop="date" label="流程操作" align="center">
+                <template slot-scope="scope">
+                    <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div style="text-align: right">
+            <el-pagination
+                v-show="recordTotal > 0"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                :page-sizes="[10, 20, 30, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="recordTotal"
+            >
+            </el-pagination>
+        </div>
     </div>
-  </div>
 </template>
 <script>
-export default {
-  data() {
-    return {
-      form:{},
-      radio1: '上海',
-       options: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
-        tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-          }],
-      multipleSelection :[],
-      pageSize: 10,
-      recordTotal: 0,
-      currentPage: 1,
-    };
-  },
-    methods:{
-      // table点击多选框返回数据
-        handleSelectionChange(val) {
-        this.multipleSelection = val;
-  console.log(val)
-      },
-        // 发送隐患单跳转
-        handleClick(){
-            this.$router.push({
-                path:"/rectificationDelayHiddenDanger"
-            })
+    import {getPageList} from "@/api/sgyhpczl/delayHiddenDangerRectification";
+    import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
+    export default {
+        data() {
+            return {
+                options: [],
+                form:{},
+                value1:"",
+
+                JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
+                JCBMList:[],
+                YHLXList:[],
+                BCList:[],
+                JCLBList:[],
+                YHBMList:[],
+                YHJBList:[],
+                tableData: [],
+                listQuery:{
+                    page:1,
+                    limit:10,
+                    form:{},
+                },
+                currentPage: 1,
+                pageSize: 10,
+                recordTotal: 0,
+            };
         },
-    }
-};
+        mounted(){
+            this.getPageList()
+            this.initYHLX()
+            this.initYHJB()
+            this.initBC()
+            this.initJCLB()
+        },
+        methods:{
+
+            changeYHDW(val){
+                initYHBM().then(res=>{
+                    if (res.data.ok==1){
+                        this.YHBMList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            changeJCDW(val){
+                initJCBM(val).then(res=>{
+                    if (res.data.ok==1){
+                        this.JCBMList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            getPageList(){
+                this.listQuery.page=1
+                getPageList(this.listQuery).then(res=>{
+                    if (res.data.ok==1) {
+                        this.tableData = res.data.data
+                        // this.recordTotal=res.data.data.length
+                    }else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            reset(){
+                this.listQuery.form={}
+                this.getPageList()
+            },
+            handleSizeChange(val){
+                this.listQuery.limit = val
+                this.getPageListForPagination();
+            },
+            handleCurrentChange(val){
+                this.listQuery.page = val
+                this.getPageListForPagination();
+            },
+            getPageListForPagination(){
+                getPageList(this.listQuery).then(res=>{
+                    if (res.data.ok==1) {
+                        this.tableData = res.data.data
+                    }else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            initYHLX(){
+                initYHLX().then(res=>{
+                    if (res.data.ok==1){
+                        this.YHLXList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            initYHJB(){
+                initYHJB().then(res=>{
+                    if (res.data.ok==1){
+                        this.YHJBList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            initBC(){
+                initBC().then(res=>{
+                    if (res.data.ok==1){
+                        this.BCList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            initJCLB(){
+                initJCLB().then(res=>{
+                    if (res.data.ok==1){
+                        this.JCLBList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            // table点击多选框返回数据
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
+            // 发送隐患单跳转
+            handleClick(){
+                this.$router.push({
+                    path:"/rectificationDelayHiddenDanger"
+                })
+            },
+        }
+    };
 </script>
 <style>
-.inquire{
-  display: flex;
-  justify-content:left;
-  flex-wrap: wrap;
-}
-.inquire .el-form-item{
-  padding: 0 46px;
-}
-.title-center{
-  padding: 20px 0;
-}
-.btns {
-  background-color: #034ea2;
-  border: 1px solid #034ea2;
-}
+    .inquire{
+        display: flex;
+        justify-content:left;
+        flex-wrap: wrap;
+    }
+    .inquire .el-form-item{
+        padding: 0 46px;
+    }
+    .title-center{
+        padding: 20px 0;
+    }
+    .btns {
+        background-color: #034ea2;
+        border: 1px solid #034ea2;
+    }
 </style>
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index b6a1b2f..864724c 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -1,181 +1,102 @@
 <template>
   <div class="app-container">
-    <el-form
-      ref="form"
-      :inline="true"
-      class="inquire"
-      :model="form"
-      label-width="80px"
-    >
-      <el-form-item label="编号">
-        <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <!-- <el-form-item label="检查单位">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="检查部门">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
-      <el-form-item label="检查人">
-        <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <el-form-item label="隐患单位">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="隐患部门">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
-      <el-form-item label="隐患类别">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="隐患级别">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="隐患来源">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="隐患地点">
-        <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <el-form-item label="隐患内容">
-        <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <el-form-item label="班次">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否关联">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="录入人">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
-      <el-form-item label="检查时间">
-        <el-col :span="11">
-          <el-date-picker
-            type="date"
-            placeholder="选择日期"
-            v-model="form.date1"
-            style="width: 100%"
-          ></el-date-picker>
-        </el-col>
-        <el-col style="text-align: center" :span="2">-</el-col>
-        <el-col :span="11">
-          <el-date-picker
-            type="date"
-            placeholder="选择日期"
-            v-model="form.date1"
-            style="width: 100%"
-          ></el-date-picker>
-        </el-col>
-      </el-form-item>
-      <el-form-item label="限改时间">
-        <el-col :span="11">
-          <el-date-picker
-            type="date"
-            placeholder="选择日期"
-            v-model="form.date1"
-            style="width: 100%"
-          ></el-date-picker>
-        </el-col>
-        <el-col style="text-align: center" :span="2">-</el-col>
-        <el-col :span="11">
-          <el-date-picker
-            type="date"
-            placeholder="选择日期"
-            v-model="form.date1"
-            style="width: 100%"
-          ></el-date-picker>
-        </el-col>
-      </el-form-item>
-      <el-form-item style="text-align: center; padding: 0 50px">
-        <el-button type="primary" class="btns"  size="small" icon="el-icon-search"
-          >查询</el-button
-        >
-        <el-button type="primary" class="btns"  size="small" icon="el-icon-upload2"
-          >导出excel</el-button
-        >
-      </el-form-item>
-    </el-form>
+      <el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+          <el-form-item label="编号">
+              <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="检查人">
+              <el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="隐患单位">
+              <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+                  <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="隐患类别">
+              <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+                  <el-option
+                      v-for="item in YHLXList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="隐患级别">
+              <el-select v-model="listQuery.form.ht_level" placeholder="请选择">
+                  <el-option
+                      v-for="item in YHJBList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="隐患来源">
+              <el-select v-model="listQuery.form.checktype" placeholder="请选择">
+                  <el-option
+                      v-for="item in YHLYList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="隐患地点">
+              <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="隐患内容">
+              <el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="班次">
+              <el-select v-model="listQuery.form.check_class" placeholder="请选择">
+                  <el-option
+                      v-for="item in BCList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+           <el-form-item label="是否关联">
+                <el-select v-model="listQuery.form.number" placeholder="请选择">
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+          <el-form-item label="检查时间">
+              <el-col :span="11">
+                  <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              </el-col>
+              <el-col style="text-align:center" :span="2">-</el-col>
+              <el-col :span="11">
+                  <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              </el-col>
+          </el-form-item>
+          <el-form-item label="限改时间">
+              <el-col :span="11">
+                  <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              </el-col>
+              <el-col style="text-align:center" :span="2">-</el-col>
+              <el-col :span="11">
+                  <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              </el-col>
+          </el-form-item>
+          <el-form-item style="text-align:center;padding:0 50px">
+              <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+              <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
+              <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+          </el-form-item>
+      </el-form>
     <el-row class="title-center">
        <el-col :span="7">
         <el-radio-group v-model="radio1">
@@ -234,62 +155,32 @@
       </el-col>
     </el-row>
     <el-table :data="tableData" style="width: 100%">
-      <el-table-column
-        type="selection"
-        width="55"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="date"
-        label="编号"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="隐患单位"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查人"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <!-- <el-table-column prop="date" label="检查类别" align="center">
-      </el-table-column> -->
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="number" label="编号" align="center"  width="120"></el-table-column>
+        <el-table-column prop="check_branch" label="隐患单位" align="center"  width="120"></el-table-column>
+        <el-table-column prop="check_man" label="检查人" align="center"  width="120"></el-table-column>
       <el-table-column label="隐患项目" align="center">
-        <el-table-column label="检查时间" width="120" sortable align="center">
-        </el-table-column>
-        <el-table-column label="地点" align="center"> </el-table-column>
-        <el-table-column label="内容" align="center"> </el-table-column>
-        <el-table-column label="类别" align="center"> </el-table-column>
-        <el-table-column label="级别" align="center"> </el-table-column>
+          <el-table-column prop="check_date" label="检查时间" width="120"  align="center"></el-table-column>
+          <el-table-column prop="address" label="地点" align="center"> </el-table-column>
+          <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
+          <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
+          <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
       </el-table-column>
       <el-table-column label="整改计划" align="center">
-        <el-table-column label="整改措施" align="center"> </el-table-column>
+          <el-table-column prop="measure" label="整改措施" align="center"> </el-table-column>
         <!-- <el-table-column label="隐患部门" align="center"> </el-table-column> -->
-        <el-table-column label="责任人" align="center"> </el-table-column>
-        <el-table-column label="限改时间" width="120" sortable align="center">
-        </el-table-column>
+          <el-table-column prop="duty_officer" label="责任人" align="center"> </el-table-column>
+          <el-table-column prop="alter_time" label="限改时间" width="120"  align="center"></el-table-column>
         <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
       </el-table-column>
         <el-table-column label="整改情况" align="center">
-        <el-table-column label="完成时间" sortable width="110px" align="center"> </el-table-column>
+            <el-table-column prop="ACCOMPLISHTIME" label="完成时间"  width="120" align="center"> </el-table-column>
         <!-- <el-table-column label="复查结果" align="center"> </el-table-column> -->
-        <el-table-column label="复查人" align="center"> </el-table-column>
-        <el-table-column label="复查时间"  width="120" sortable align="center">
-        </el-table-column>
+            <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"> </el-table-column>
+            <el-table-column prop="CALLBACKTIME" label="复查时间" width="120"  align="center"></el-table-column>
       </el-table-column>
       <!-- <el-table-column label="隐患处理状态" align="center"> </el-table-column> -->
-      <el-table-column label="是否关联" align="center"> </el-table-column>
+        <el-table-column prop="date" label="是否关联" align="center"> </el-table-column>
       <!-- <el-table-column label="风险等级" align="center"> </el-table-column> -->
       <el-table-column label="初始警情" align="center"> </el-table-column>
       <el-table-column label="当前警情" align="center"> </el-table-column>
@@ -317,45 +208,129 @@
   </div>
 </template>
 <script>
+    import {getPageList} from "@/api/sgyhpczl/hiddenDangerManagement";
+    import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
 export default {
   data() {
     return {
-      form: {},
-      radio1: "未整改",
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕",
-        },
-        {
-          value: "选项2",
-          label: "双皮奶",
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎",
-        },
-        {
-          value: "选项4",
-          label: "龙须面",
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭",
-        },
-      ],
-      tableData: [
+        options: [],
+        form:{},
+        value1:"",
+        radio1:"未整改",
 
-      ],
-      pageSize: 10,
-      recordTotal: 0,
-      currentPage: 1,
+        JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
+        JCBMList:[],
+        YHLXList:[],
+        YHLYList:[],
+        BCList:[],
+        JCLBList:[],
+        YHBMList:[],
+        YHJBList:[],
+        tableData: [],
+        listQuery:{
+            page:1,
+            limit:10,
+            form:{},
+        },
+        currentPage: 1,
+        pageSize: 10,
+        recordTotal: 0,
     };
-  },
-  methods:{
-    handleClick(data){
-
+  }, mounted(){
+        this.getPageList()
+        this.initYHLX()
+        this.initYHJB()
+        this.initBC()
+        this.initJCLB()
     },
+    methods:{
+
+        changeYHDW(val){
+            initYHBM().then(res=>{
+                if (res.data.ok==1){
+                    this.YHBMList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        changeJCDW(val){
+            initJCBM(val).then(res=>{
+                if (res.data.ok==1){
+                    this.JCBMList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        getPageList(){
+            this.listQuery.page=1
+            getPageList(this.listQuery).then(res=>{
+                if (res.data.ok==1) {
+                    this.tableData = res.data.data
+                    // this.recordTotal=res.data.data.length
+                }else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        reset(){
+            this.listQuery.form={}
+            this.getPageList()
+        },
+        handleSizeChange(val){
+            this.listQuery.limit = val
+            this.getPageListForPagination();
+        },
+        handleCurrentChange(val){
+            this.listQuery.page = val
+            this.getPageListForPagination();
+        },
+        getPageListForPagination(){
+            getPageList(this.listQuery).then(res=>{
+                if (res.data.ok==1) {
+                    this.tableData = res.data.data
+                }else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initYHLX(){
+            initYHLX().then(res=>{
+                if (res.data.ok==1){
+                    this.YHLXList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initYHJB(){
+            initYHJB().then(res=>{
+                if (res.data.ok==1){
+                    this.YHJBList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initBC(){
+            initBC().then(res=>{
+                if (res.data.ok==1){
+                    this.BCList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initJCLB(){
+            initJCLB().then(res=>{
+                if (res.data.ok==1){
+                    this.JCLBList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
     jump(){
       this.$router.push({
         path:"/fillRectificationAdd"
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index 9f6e594..cae61f9 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -1,410 +1,458 @@
 <template>
-  <div class="app-container">
-<el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
-   <el-form-item label="编号">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="检查单位">
-     <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查部门">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查人">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="隐患单位">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患部门">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患类别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患级别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查类别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患地点">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="隐患内容">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="班次">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <!-- <el-form-item label="是否关联">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="录入人">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item> -->
-   <el-form-item label="检查时间">
-      <el-col :span="11">
-      <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-    <el-col style="text-align:center" :span="2">-</el-col>
-    <el-col :span="11">
-       <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-  </el-form-item>
-   <el-form-item label="限改时间">
-      <el-col :span="11">
-      <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-    <el-col style="text-align:center" :span="2">-</el-col>
-    <el-col :span="11">
-       <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-  </el-form-item>
-   <el-form-item style="text-align:center;padding:0 50px">
-    <el-button type="primary" class="btns"  size="small" icon="el-icon-search">查询</el-button>
-    <el-button type="primary" class="btns"  size="small" icon="el-icon-upload2">导出excel</el-button>
-  </el-form-item>
-  </el-form>
-    <el-row class="title-center">
-      <!-- <el-col :span="10">
-        <el-radio-group v-model="radio1">
-      <el-radio-button label="上海"></el-radio-button>
-      <el-radio-button label="北京"></el-radio-button>
-      <el-radio-button label="广州"></el-radio-button>
-    </el-radio-group>
-      </el-col> -->
-      <el-col  :span="24" style="text-align:right;">
-        <el-button class="btns" type="primary" size="small" @click="dialogVisible=true">申请延期</el-button>
-      </el-col>
-    </el-row>
-    <el-table :data="tableData" style="width: 100%">
-      <el-table-column
-        type="selection"
-        width="55"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="date"
-        label="编号"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查部门"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查人"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column prop="date" label="检查类别" align="center">
-      </el-table-column>
-      <el-table-column label="隐患项目" align="center">
-        <el-table-column label="检查时间" width="120" sortable align="center">
-        </el-table-column>
-        <el-table-column label="地点" align="center"> </el-table-column>
-        <el-table-column label="内容" align="center"> </el-table-column>
-        <el-table-column label="类别" align="center"> </el-table-column>
-        <el-table-column label="级别" align="center"> </el-table-column>
-      </el-table-column>
-      <el-table-column label="整改计划" align="center">
-        <el-table-column label="整改措施" align="center"> </el-table-column>
-        <el-table-column label="隐患部门" align="center"> </el-table-column>
-        <el-table-column label="责任人" align="center"> </el-table-column>
-        <el-table-column label="限改时间" width="120" sortable align="center">
-        </el-table-column>
-        <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
-      </el-table-column>
-      <el-table-column label="整改情况" align="center">
-        <el-table-column label="完成时间" sortable width="120" align="center"> </el-table-column>
-        <el-table-column label="复查结果" align="center"> </el-table-column>
-        <el-table-column label="复查人" align="center"> </el-table-column>
-        <el-table-column label="复查时间" width="120" sortable align="center">
-        </el-table-column>
-        <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
-      </el-table-column>
-      <el-table-column label="隐患处理状态" align="center"> </el-table-column>
-      <el-table-column label="是否关联" align="center"> </el-table-column>
-      <el-table-column label="风险等级" align="center"> </el-table-column>
-      <el-table-column label="初始警情" align="center"> </el-table-column>
-      <el-table-column label="当前警情" align="center"> </el-table-column>
-      <el-table-column label="流程操作" align="center">
-        <template slot-scope="scope">
-            <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-      <!--申请延期弹窗-->
-      <el-dialog
-          title="提示"
-          :visible.sync="dialogVisible"
-          :close-on-click-modal="false"
-          width="30%"
-          :before-close="handleClose">
-          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-              <el-row>
-                  <el-col :span="16" :offset="3">
-                      <el-form-item label="申请限改时间" prop="name">
-                          <el-date-picker
-                              v-model="value1"
-                              type="date"
-                              :disabled="true"
-                              placeholder="选择日期"
-                              style="width: 100%">
-                          </el-date-picker>
-                      </el-form-item>
-                  </el-col>
-              </el-row>
-              <el-row>
-                  <el-col :span="16" :offset="3">
-                      <el-form-item label="附件上传" prop="desc">
-                          <el-upload
-                              class="upload-demo"
-                              ref="upload"
-                              action="https://jsonplaceholder.typicode.com/posts/"
-                              :on-preview="handlePreview"
-                              :on-remove="handleRemove"
-                              :file-list="fileList"
-                              :before-upload="beforeUpload"
-                              :auto-upload="true">
-                              <el-button slot="trigger" size="small" type="primary" class="btns">选择文件</el-button>
-                              <div slot="tip" class="el-upload__tip">只能上传.jpg,.gif,.bmp,.png,.jpeg格式的图片</div>
-                          </el-upload>
-                      </el-form-item>
-                  </el-col>
-              </el-row>
-              <el-row>
-                  <el-col :span="16" :offset="3">
-                      <el-form-item label="备注" prop="desc">
-                          <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
-                      </el-form-item>
-                  </el-col>
-              </el-row>
-              <div style="text-align: center">
-                  <el-button class="btns" size="small" type="primary" @click="dialogVisible = false">保存</el-button>
-                  <el-button size="small" @click="dialogVisible = false">关闭</el-button>
-              </div>
-          </el-form>
-      </el-dialog>
-      <!--申请延期弹窗-->
-    <div style="text-align: right">
-      <el-pagination
-        v-show="recordTotal > 0"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="recordTotal"
-      >
-      </el-pagination>
+    <div class="app-container">
+        <el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+            <el-form-item label="编号">
+                <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="检查单位">
+                <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择"  @change="changeJCDW">
+                    <el-option
+                        v-for="item in JCDWList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查部门">
+                <el-select v-model="listQuery.form.check_branch" placeholder="请选择">
+                    <el-option
+                        v-for="item in JCBMList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查人">
+                <el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="隐患单位">
+                <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患部门">
+                <el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
+                    <el-option
+                        v-for="item in YHBMList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患类别">
+                <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+                    <el-option
+                        v-for="item in YHLXList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患级别">
+                <el-select v-model="listQuery.form.ht_level" placeholder="请选择">
+                    <el-option
+                        v-for="item in YHJBList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查类别">
+                <el-select v-model="listQuery.form.checktype" placeholder="请选择">
+                    <el-option
+                        v-for="item in JCLBList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患地点">
+                <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="隐患内容">
+                <el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="班次">
+                <el-select v-model="listQuery.form.check_class" placeholder="请选择">
+                    <el-option
+                        v-for="item in BCList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <!--      <el-form-item label="是否关联">
+                      <el-select v-model="listQuery.form.number" placeholder="请选择">
+                          <el-option
+                              v-for="item in options"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="录入人">
+                      <el-select v-model="listQuery.form.number" placeholder="请选择">
+                          <el-option
+                              v-for="item in options"
+                              :key="item.value"
+                              :label="item.value"
+                              :value="item.value">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>-->
+            <el-form-item label="检查时间">
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+                <el-col style="text-align:center" :span="2">-</el-col>
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+            </el-form-item>
+            <el-form-item label="限改时间">
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+                <el-col style="text-align:center" :span="2">-</el-col>
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+            </el-form-item>
+            <el-form-item style="text-align:center;padding:0 50px">
+                <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+                <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
+                <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row class="title-center">
+            <el-col  :span="24" style="text-align:right;">
+                <el-button class="btns" type="primary" size="small" @click="dialogVisible=true">申请延期</el-button>
+            </el-col>
+        </el-row>
+        <el-table :data="tableData" style="width: 100%">
+            <el-table-column type="selection" width="55" align="center"></el-table-column>
+            <el-table-column prop="number" label="编号" align="center"  width="120"></el-table-column>
+            <el-table-column prop="check_branch" label="检查部门" align="center"  width="120"></el-table-column>
+            <el-table-column prop="check_man" label="检查人" align="center"  width="120"></el-table-column>
+            <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
+            <el-table-column label="隐患项目" align="center">
+                <el-table-column prop="check_date" label="检查时间" width="120"  align="center"></el-table-column>
+                <el-table-column prop="address" label="地点" align="center"> </el-table-column>
+                <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
+                <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
+                <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
+            </el-table-column>
+            <el-table-column label="整改计划" align="center">
+                <el-table-column prop="measure" label="整改措施" align="center"> </el-table-column>
+                <el-table-column prop="ht_branch" label="隐患部门" align="center"> </el-table-column>
+                <el-table-column prop="duty_officer" label="责任人" align="center"> </el-table-column>
+                <el-table-column prop="alter_time" label="限改时间" width="120"  align="center"></el-table-column>
+            </el-table-column>
+            <el-table-column label="整改情况" align="center">
+                <el-table-column prop="ACCOMPLISHTIME" label="完成时间"  width="120" align="center"> </el-table-column>
+                <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"> </el-table-column>
+                <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"> </el-table-column>
+                <el-table-column prop="CALLBACKTIME" label="复查时间" width="120"  align="center"></el-table-column>
+            </el-table-column>
+            <el-table-column  label="隐患处理状态" align="center">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.step =='1'">初始状态</span>
+                    <span v-if="scope.row.step =='2'">整改中</span>
+                    <span v-if="scope.row.step =='3'">复查中</span>
+                    <span v-if="scope.row.step =='end'">处理结束</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="是否关联" align="center"> </el-table-column>
+            <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column>
+            <el-table-column prop="date" label="初始警情" align="center"> </el-table-column>
+            <el-table-column prop="date" label="当前警情" align="center"> </el-table-column>
+            <el-table-column prop="date" label="流程操作" align="center">
+                <template slot-scope="scope">
+                    <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!--申请延期弹窗-->
+        <el-dialog
+            title="提示"
+            :visible.sync="dialogVisible"
+            :close-on-click-modal="false"
+            width="30%"
+            :before-close="handleClose">
+            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+                <el-row>
+                    <el-col :span="16" :offset="3">
+                        <el-form-item label="申请限改时间" prop="name">
+                            <el-date-picker
+                                v-model="value1"
+                                type="date"
+                                :disabled="true"
+                                placeholder="选择日期"
+                                style="width: 100%">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="16" :offset="3">
+                        <el-form-item label="附件上传" prop="desc">
+                            <el-upload
+                                class="upload-demo"
+                                ref="upload"
+                                action="https://jsonplaceholder.typicode.com/posts/"
+                                :on-preview="handlePreview"
+                                :on-remove="handleRemove"
+                                :file-list="fileList"
+                                :before-upload="beforeUpload"
+                                :auto-upload="true">
+                                <el-button slot="trigger" size="small" type="primary" class="btns">选择文件</el-button>
+                                <div slot="tip" class="el-upload__tip">只能上传.jpg,.gif,.bmp,.png,.jpeg格式的图片</div>
+                            </el-upload>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="16" :offset="3">
+                        <el-form-item label="备注" prop="desc">
+                            <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <div style="text-align: center">
+                    <el-button class="btns" size="small" type="primary" @click="dialogVisible = false">保存</el-button>
+                    <el-button size="small" @click="dialogVisible = false">关闭</el-button>
+                </div>
+            </el-form>
+        </el-dialog>
+        <!--申请延期弹窗-->
+        <div style="text-align: right">
+            <el-pagination
+                v-show="recordTotal > 0"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                :page-sizes="[10, 20, 30, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="recordTotal"
+            >
+            </el-pagination>
+        </div>
     </div>
-  </div>
 </template>
 <script>
-export default {
-  data() {
-    return {
-      form:{},
-      radio1: '上海',
-       options: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
-        tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-          }],
-        dialogVisible: false,
-        ruleForm: {
-            name: '',
-            region: '',
-            date1: '',
-            date2: '',
-            delivery: false,
-            type: [],
-            resource: '',
-            value1: '',
-            desc: ''
+    import {getPageList} from "@/api/sgyhpczl/hiddenDangerRectification";
+    import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
+    export default {
+        data() {
+            return {
+                options: [],
+                form:{},
+                value1:"",
+
+                JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
+                JCBMList:[],
+                YHLXList:[],
+                BCList:[],
+                JCLBList:[],
+                YHBMList:[],
+                YHJBList:[],
+                tableData: [],
+                listQuery:{
+                    page:1,
+                    limit:10,
+                    form:{},
+                },
+
+                dialogVisible: false,
+                ruleForm: {
+                    name: '',
+                    region: '',
+                    date1: '',
+                    date2: '',
+                    delivery: false,
+                    type: [],
+                    resource: '',
+                    value1: '',
+                    desc: ''
+                },
+                rules: {},
+                fileList: [],
+                currentPage: 1,
+                pageSize: 10,
+                recordTotal: 0,
+            };
         },
-        rules: {},
-        fileList: [],
+        mounted(){
+            this.getPageList()
+            this.initYHLX()
+            this.initYHJB()
+            this.initBC()
+            this.initJCLB()
+        },
 
-      pageSize: 10,
-      recordTotal: 0,
-      currentPage: 1,
+        methods:{
+
+            changeYHDW(val){
+                initYHBM().then(res=>{
+                    if (res.data.ok==1){
+                        this.YHBMList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            changeJCDW(val){
+                initJCBM(val).then(res=>{
+                    if (res.data.ok==1){
+                        this.JCBMList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            getPageList(){
+                this.listQuery.page=1
+                getPageList(this.listQuery).then(res=>{
+                    if (res.data.ok==1) {
+                        this.tableData = res.data.data
+                        // this.recordTotal=res.data.data.length
+                    }else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            reset(){
+                this.listQuery.form={}
+                this.getPageList()
+            },
+            handleSizeChange(val){
+                this.listQuery.limit = val
+                this.getPageListForPagination();
+            },
+            handleCurrentChange(val){
+                this.listQuery.page = val
+                this.getPageListForPagination();
+            },
+            getPageListForPagination(){
+                getPageList(this.listQuery).then(res=>{
+                    if (res.data.ok==1) {
+                        this.tableData = res.data.data
+                    }else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            initYHLX(){
+                initYHLX().then(res=>{
+                    if (res.data.ok==1){
+                        this.YHLXList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            initYHJB(){
+                initYHJB().then(res=>{
+                    if (res.data.ok==1){
+                        this.YHJBList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            initBC(){
+                initBC().then(res=>{
+                    if (res.data.ok==1){
+                        this.BCList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+            initJCLB(){
+                initJCLB().then(res=>{
+                    if (res.data.ok==1){
+                        this.JCLBList=res.data.data
+                    } else{
+                        this.$message({type:'error', message:res.data.msg, duration:3000})
+                    }
+                })
+            },
+
+
+            // 发送隐患单跳转
+
+
+            handleClick(){
+                this.$router.push({
+                    path:"/sendHiddenDangerList"
+                })
+            },
+            handleClose(done) {
+                this.$confirm('确认关闭?')
+                    .then(_ => {
+                        done();
+                    })
+                    .catch(_ => {});
+            },
+            handleRemove(file, fileList) {
+                console.log(file, fileList)
+            },
+            handlePreview(file) {
+                console.log(file)
+            },
+            beforeUpload(file) {
+                var FileExt = file.name.replace(/.+\./, "");
+                if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+                    this.$message({
+                        type: 'warning',
+                        message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片!'
+                    });
+                    return false;
+                }
+            },
+        }
     };
-  },
-  methods:{
-      // 发送隐患单跳转
-      handleClick(){
-          this.$router.push({
-              path:"/sendHiddenDangerList"
-          })
-      },
-
-      // applicationExtension(){
-      //     this.$router.push({
-      //         path:"/applicationForExtension"
-      //     })
-      // },
-      handleClose(done) {
-          this.$confirm('确认关闭?')
-              .then(_ => {
-                  done();
-              })
-              .catch(_ => {});
-      },
-      handleRemove(file, fileList) {
-          console.log(file, fileList);
-      },
-      handlePreview(file) {
-          console.log(file);
-      },
-      beforeUpload(file) {
-          var FileExt = file.name.replace(/.+\./, "");
-          if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
-              this.$message({
-                  type: 'warning',
-                  message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片!'
-              });
-              return false;
-          }
-      },
-  }
-};
 </script>
 <style>
-.inquire{
-  display: flex;
-  justify-content:left;
-  flex-wrap: wrap;
-}
-.inquire .el-form-item{
-  padding: 0 46px;
-}
-.title-center{
-  padding: 20px 0;
-}
-.btns {
-  background-color: #034ea2;
-  border: 1px solid #034ea2;
-}
-/deep/ .el-dialog .el-textarea__inner{
-    height: 80px;
-    max-height: 80px;
-    overflow-y: auto
-}
-/deep/.el-dialog .button .el-form-item__content{
-    margin-left: 0;
-}
+    .inquire{
+        display: flex;
+        justify-content:left;
+        flex-wrap: wrap;
+    }
+    .inquire .el-form-item{
+        padding: 0 46px;
+    }
+    .title-center{
+        padding: 20px 0;
+    }
+    .btns {
+        background-color: #034ea2;
+        border: 1px solid #034ea2;
+    }
+    /deep/ .el-dialog .el-textarea__inner{
+        height: 80px;
+        max-height: 80px;
+        overflow-y: auto
+    }
+    /deep/.el-dialog .button .el-form-item__content{
+        margin-left: 0;
+    }
     .textarea{
         max-height: 70px;
         overflow-y: auto;
diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue
index 0e73bba..cdce91e 100644
--- a/src/views/hiddenDangerRegistration/index.vue
+++ b/src/views/hiddenDangerRegistration/index.vue
@@ -1,371 +1,397 @@
 <template>
-  <div class="app-container">
-    <el-form
-      ref="form"
-      :inline="true"
-      class="inquire"
-      :model="form"
-      label-width="80px"
-    >
-      <el-form-item label="编号">
-        <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <el-form-item label="检查单位">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="检查部门">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="检查人">
-        <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <el-form-item label="隐患单位">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="隐患部门">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="隐患类别">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="隐患级别">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="检查类别">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="隐患地点">
-        <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <el-form-item label="隐患内容">
-        <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <el-form-item label="班次">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否关联">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="录入人">
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="检查时间">
-        <el-col :span="11">
-          <el-date-picker
-            type="date"
-            placeholder="选择日期"
-            v-model="form.date1"
-            style="width: 100%"
-          ></el-date-picker>
-        </el-col>
-        <el-col style="text-align: center" :span="2">-</el-col>
-        <el-col :span="11">
-          <el-date-picker
-            type="date"
-            placeholder="选择日期"
-            v-model="form.date1"
-            style="width: 100%"
-          ></el-date-picker>
-        </el-col>
-      </el-form-item>
-      <el-form-item label="限改时间">
-        <el-col :span="11">
-          <el-date-picker
-            type="date"
-            placeholder="选择日期"
-            v-model="form.date1"
-            style="width: 100%"
-          ></el-date-picker>
-        </el-col>
-        <el-col style="text-align: center" :span="2">-</el-col>
-        <el-col :span="11">
-          <el-date-picker
-            type="date"
-            placeholder="选择日期"
-            v-model="form.date1"
-            style="width: 100%"
-          ></el-date-picker>
-        </el-col>
-      </el-form-item>
-      <el-form-item style="text-align: center; padding: 0 50px">
-        <el-button type="primary" class="btns"  size="small" icon="el-icon-search"
-          >查询</el-button
-        >
-        <el-button type="primary" class="btns"  size="small" icon="el-icon-upload2"
-          >导出excel</el-button
-        >
-      </el-form-item>
-    </el-form>
-    <el-row class="title-center">
-      <el-col :span="14">
-        <el-form ref="form" :inline="true" :model="form" label-width="100px">
-          <el-form-item label="EXCEL导入">
-            <el-input v-model="form.name" placeholder="未选择文件"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" size="small" class="btns"
-              >选择文件</el-button
-            >
-            <el-button
-              type="primary"
-              class="btns"
-              size="small"
-              icon="el-icon-bottom"
-              >导入</el-button
-            >
-            <el-button
-              type="primary"
-              class="btns"
-              size="small"
-              icon="el-icon-download"
-              >下载模板</el-button
-            >
-          </el-form-item>
+    <div class="app-container">
+        <el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+            <el-form-item label="编号">
+                <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="检查单位">
+                <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择"  @change="changeJCDW">
+                    <el-option
+                        v-for="item in JCDWList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查部门">
+                <el-select v-model="listQuery.form.check_branch" placeholder="请选择">
+                    <el-option
+                        v-for="item in JCBMList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查人">
+                <el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="隐患单位">
+                <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患部门">
+                <el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
+                    <el-option
+                        v-for="item in YHBMList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患类别">
+                <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+                    <el-option
+                        v-for="item in YHLXList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患级别">
+                <el-select v-model="listQuery.form.ht_level" placeholder="请选择">
+                    <el-option
+                        v-for="item in YHJBList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查类别">
+                <el-select v-model="listQuery.form.checktype" placeholder="请选择">
+                    <el-option
+                        v-for="item in JCLBList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="隐患地点">
+                <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="隐患内容">
+                <el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="班次">
+                <el-select v-model="listQuery.form.check_class" placeholder="请选择">
+                    <el-option
+                        v-for="item in BCList"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="是否关联">
+                <el-select v-model="listQuery.form.number" placeholder="请选择">
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="录入人">
+                <el-select v-model="listQuery.form.number" placeholder="请选择">
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.value"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="检查时间">
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+                <el-col style="text-align:center" :span="2">-</el-col>
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+            </el-form-item>
+            <el-form-item label="限改时间">
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+                <el-col style="text-align:center" :span="2">-</el-col>
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                </el-col>
+            </el-form-item>
+            <el-form-item style="text-align:center;padding:0 50px">
+                <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+                <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
+                <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+            </el-form-item>
         </el-form>
-      </el-col>
-      <el-col :span="10" style="text-align: right">
-        <el-button
-          class="btns"
-          type="primary"
-          size="small"
-          >批量发送</el-button
-        >
-        <el-button class="btns" @click="jump" type="primary" icon="el-icon-plus" size="small"
-          >添加</el-button
-        >
-           <el-button  size="small"
-          >删除</el-button
-        >
+        <el-row class="title-center">
+            <el-col :span="14">
+                <el-form ref="form" :inline="true" :model="form" label-width="100px">
+                    <el-form-item label="EXCEL导入">
+                        <el-input v-model="form.name" placeholder="未选择文件"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" size="small" class="btns"
+                        >选择文件</el-button
+                        >
+                        <el-button
+                            type="primary"
+                            class="btns"
+                            size="small"
+                            icon="el-icon-bottom"
+                        >导入</el-button
+                        >
+                        <el-button
+                            type="primary"
+                            class="btns"
+                            size="small"
+                            icon="el-icon-download"
+                        >下载模板</el-button
+                        >
+                    </el-form-item>
+                </el-form>
+            </el-col>
+            <el-col :span="10" style="text-align: right">
+                <el-button
+                    class="btns"
+                    type="primary"
+                    size="small"
+                >批量发送</el-button
+                >
+                <el-button class="btns" @click="jump" type="primary" icon="el-icon-plus" size="small"
+                >添加</el-button
+                >
+                <el-button  size="small"
+                >删除</el-button
+                >
 
-      </el-col>
-    </el-row>
-    <el-table :data="tableData" style="width: 100%">
-      <el-table-column
-        type="selection"
-        width="55"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="date"
-        label="编号"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查部门"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查人"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column prop="date" label="检查类别" align="center">
-      </el-table-column>
-      <el-table-column label="隐患项目" align="center">
-        <el-table-column label="检查时间" width="120" sortable align="center">
-        </el-table-column>
-        <el-table-column label="地点" align="center"> </el-table-column>
-        <el-table-column label="内容" align="center"> </el-table-column>
-        <el-table-column label="类别" align="center"> </el-table-column>
-        <el-table-column label="级别" align="center"> </el-table-column>
-      </el-table-column>
-      <el-table-column label="整改计划" align="center">
-        <el-table-column label="整改措施" align="center"> </el-table-column>
-        <el-table-column label="隐患部门" align="center"> </el-table-column>
-        <el-table-column label="责任人" align="center"> </el-table-column>
-        <el-table-column label="限改时间" width="120" sortable align="center">
-        </el-table-column>
-        <el-table-column label="级别" align="center"> </el-table-column>
-      </el-table-column>
-        <el-table-column label="整改情况" align="center">
-        <el-table-column label="完成时间" width="110px" sortable align="center"> </el-table-column>
-        <el-table-column label="复查结果" align="center"> </el-table-column>
-        <el-table-column label="复查人" align="center"> </el-table-column>
-        <el-table-column label="复查时间"  width="120" sortable align="center">
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="隐患处理状态" align="center"> </el-table-column>
-      <el-table-column label="是否关联" align="center"> </el-table-column>
-      <el-table-column label="风险等级" align="center"> </el-table-column>
-      <el-table-column label="初始警情" align="center"> </el-table-column>
-      <el-table-column label="当前警情" align="center"> </el-table-column>
-      <el-table-column label="流程操作" align="center"> </el-table-column>
-      <el-table-column label="基本操作" align="center">
-          <template slot-scope="scope">
-              <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
-          </template>
-      </el-table-column>
-    </el-table>
-    <div style="text-align: right">
-      <el-pagination
-        v-show="recordTotal > 0"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="recordTotal"
-      >
-      </el-pagination>
+            </el-col>
+        </el-row>
+        <el-table :data="tableData" style="width: 100%">
+            <el-table-column type="selection" width="55" align="center"></el-table-column>
+            <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+            <el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
+            <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
+            <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
+            <el-table-column label="隐患项目" align="center">
+                <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
+                <el-table-column prop="address" label="地点" align="center"> </el-table-column>
+                <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
+                <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
+                <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
+            </el-table-column>
+            <el-table-column label="整改计划" align="center">
+                <el-table-column prop="measure" label="整改措施" align="center"> </el-table-column>
+                <el-table-column prop="ht_branch" label="隐患部门" align="center"> </el-table-column>
+                <el-table-column prop="duty_officer" label="责任人" align="center"> </el-table-column>
+                <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+                <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
+            </el-table-column>
+            <el-table-column label="整改情况" align="center">
+                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" align="center"> </el-table-column>
+                <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"> </el-table-column>
+                <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"> </el-table-column>
+                <el-table-column prop="CALLBACKTIME" label="复查时间"  width="120" align="center"></el-table-column>
+            </el-table-column>
+            <el-table-column  label="隐患处理状态" align="center">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.step =='1'">初始状态</span>
+                    <span v-if="scope.row.step =='2'">整改中</span>
+                    <span v-if="scope.row.step =='3'">复查中</span>
+                    <span v-if="scope.row.step =='end'">处理结束</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="是否关联" align="center"> </el-table-column>
+            <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column>
+            <el-table-column prop="date" label="初始警情" align="center"> </el-table-column>
+            <el-table-column prop="date" label="当前警情" align="center"> </el-table-column>
+            <el-table-column prop="date" label="流程操作" align="center"> </el-table-column>
+            <el-table-column prop="date" label="基本操作" align="center">
+                <template slot-scope="scope">
+                    <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div style="text-align: right">
+            <el-pagination
+                v-show="recordTotal > 0"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                :page-sizes="[10, 20, 30, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="recordTotal"
+            >
+            </el-pagination>
+        </div>
     </div>
-  </div>
 </template>
 <script>
+import {getPageList} from "@/api/sgyhpczl/hiddenDangerRegistration";
+import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
 export default {
-  data() {
-    return {
-      form: {},
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕",
-        },
-        {
-          value: "选项2",
-          label: "双皮奶",
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎",
-        },
-        {
-          value: "选项4",
-          label: "龙须面",
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭",
-        },
-      ],
-      tableData: [{
-          date:"2016-05-04",
-      }],
-      pageSize: 10,
-      recordTotal: 0,
-      currentPage: 1,
-    };
-  },
-  methods:{
-    jump(){
-      this.$router.push({
-        path:"/hiddenDangerAdd"
-      })
-    },
-      // 发送隐患单跳转
-      handleClick(){
-          this.$router.push({
-              path:"/hiddenDangerList",
+    data() {
+        return {
+            options: [],
+            form:{},
 
-          })
-      },
-  }
+            JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
+            JCBMList:[],
+            YHLXList:[],
+            BCList:[],
+            JCLBList:[],
+            YHBMList:[],
+            YHJBList:[],
+            tableData: [],
+            listQuery:{
+                page:1,
+                limit:10,
+                form:{},
+            },
+            currentPage: 1,
+            pageSize: 10,
+            recordTotal: 0,
+        };
+    },
+    mounted(){
+        this.getPageList()
+        this.initYHLX()
+        this.initYHJB()
+        this.initBC()
+        this.initJCLB()
+    },
+    methods:{
+
+        changeYHDW(val){
+            initYHBM().then(res=>{
+                if (res.data.ok==1){
+                    this.YHBMList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        changeJCDW(val){
+            initJCBM(val).then(res=>{
+                if (res.data.ok==1){
+                    this.JCBMList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        getPageList(){
+            this.listQuery.page=1
+            getPageList(this.listQuery).then(res=>{
+                if (res.data.ok==1) {
+                    this.tableData = res.data.data
+                    // this.recordTotal=res.data.data.length
+                }else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        reset(){
+            this.listQuery.form={}
+            this.getPageList()
+        },
+        handleSizeChange(val){
+            this.listQuery.limit = val
+            this.getPageListForPagination();
+        },
+        handleCurrentChange(val){
+            this.listQuery.page = val
+            this.getPageListForPagination();
+        },
+        getPageListForPagination(){
+            getPageList(this.listQuery).then(res=>{
+                if (res.data.ok==1) {
+                    this.tableData = res.data.data
+                }else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initYHLX(){
+            initYHLX().then(res=>{
+                if (res.data.ok==1){
+                    this.YHLXList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initYHJB(){
+            initYHJB().then(res=>{
+                if (res.data.ok==1){
+                    this.YHJBList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initBC(){
+            initBC().then(res=>{
+                if (res.data.ok==1){
+                    this.BCList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initJCLB(){
+            initJCLB().then(res=>{
+                if (res.data.ok==1){
+                    this.JCLBList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+
+        jump(){
+            this.$router.push({
+                path:"/hiddenDangerAdd"
+            })
+        },
+        // 发送隐患单跳转
+        handleClick(){
+            this.$router.push({
+                path:"/hiddenDangerList",
+            })
+        },
+    }
 };
 </script>
 <style>
-.inquire {
-  display: flex;
-  justify-content: left;
-  flex-wrap: wrap;
-}
-.inquire .el-form-item {
-  padding: 0 46px;
-}
-.title-center {
-  padding: 20px 0;
-}
-.btns {
-  background-color: #034ea2;
-  border: 1px solid #034ea2;
-}
+    .inquire {
+        display: flex;
+        justify-content: left;
+        flex-wrap: wrap;
+    }
+    .inquire .el-form-item {
+        padding: 0 46px;
+    }
+    .title-center {
+        padding: 20px 0;
+    }
+    .btns {
+        background-color: #034ea2;
+        border: 1px solid #034ea2;
+    }
 </style>
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
index 7a6d1e2..08c61fd 100644
--- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -1,221 +1,192 @@
 <template>
   <div class="app-container">
-<el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
-   <el-form-item label="编号">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="检查单位">
-     <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查部门">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查人">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="隐患单位">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患部门">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患类别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患级别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查类别">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="隐患地点">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="隐患内容">
-    <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
-  </el-form-item>
-   <el-form-item label="班次">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="是否关联">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="录入人">
-       <el-select v-model="value" placeholder="请选择">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-    </el-option>
-  </el-select>
-  </el-form-item>
-   <el-form-item label="检查时间">
-      <el-col :span="11">
-      <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-    <el-col style="text-align:center" :span="2">-</el-col>
-    <el-col :span="11">
-       <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-  </el-form-item>
-   <el-form-item label="限改时间">
-      <el-col :span="11">
-      <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-    <el-col style="text-align:center" :span="2">-</el-col>
-    <el-col :span="11">
-       <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-    </el-col>
-  </el-form-item>
-   <el-form-item style="text-align:center;padding:0 50px">
-    <el-button type="primary" class="btns"  size="small" icon="el-icon-search">查询</el-button>
-    <el-button type="primary" class="btns"  size="small" icon="el-icon-upload2">导出excel</el-button>
-  </el-form-item>
-  </el-form>
+      <el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+          <el-form-item label="编号">
+              <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="检查单位">
+              <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择"  @change="changeJCDW">
+                  <el-option
+                      v-for="item in JCDWList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                  >
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="检查部门">
+              <el-select v-model="listQuery.form.check_branch" placeholder="请选择">
+                  <el-option
+                      v-for="item in JCBMList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="检查人">
+              <el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="隐患单位">
+              <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+                  <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="隐患部门">
+              <el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
+                  <el-option
+                      v-for="item in YHBMList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="隐患类别">
+              <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+                  <el-option
+                      v-for="item in YHLXList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="隐患级别">
+              <el-select v-model="listQuery.form.ht_level" placeholder="请选择">
+                  <el-option
+                      v-for="item in YHJBList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="检查类别">
+              <el-select v-model="listQuery.form.checktype" placeholder="请选择">
+                  <el-option
+                      v-for="item in JCLBList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="隐患地点">
+              <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="隐患内容">
+              <el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="班次">
+              <el-select v-model="listQuery.form.check_class" placeholder="请选择">
+                  <el-option
+                      v-for="item in BCList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+        <el-form-item label="是否关联">
+            <el-select v-model="listQuery.form.number" placeholder="请选择">
+                <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="录入人">
+            <el-select v-model="listQuery.form.number" placeholder="请选择">
+                <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                </el-option>
+            </el-select>
+        </el-form-item>
+          <el-form-item label="检查时间">
+              <el-col :span="11">
+                  <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              </el-col>
+              <el-col style="text-align:center" :span="2">-</el-col>
+              <el-col :span="11">
+                  <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              </el-col>
+          </el-form-item>
+          <el-form-item label="限改时间">
+              <el-col :span="11">
+                  <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              </el-col>
+              <el-col style="text-align:center" :span="2">-</el-col>
+              <el-col :span="11">
+                  <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              </el-col>
+          </el-form-item>
+          <el-form-item style="text-align:center;padding:0 50px">
+              <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+              <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
+              <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+          </el-form-item>
+      </el-form>
     <el-row class="title-center">
-      <!-- <el-col :span="10">
-        <el-radio-group v-model="radio1">
-      <el-radio-button label="上海"></el-radio-button>
-      <el-radio-button label="北京"></el-radio-button>
-      <el-radio-button label="广州"></el-radio-button>
-    </el-radio-group>
-      </el-col> -->
       <el-col  :span="24" style="text-align:right;">
         <el-button class="btns" type="primary" size="small">批量复查</el-button>
         <el-button class="btns" type="primary" size="small">批量发送</el-button>
       </el-col>
     </el-row>
-    <el-table :data="tableData" style="width: 100%">
-      <el-table-column
-        type="selection"
-        width="55"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="date"
-        label="编号"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查部门"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="date"
-        label="检查人"
-        align="center"
-        sortable
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column prop="date" label="检查类别" align="center">
-      </el-table-column>
-      <el-table-column label="隐患项目" align="center">
-        <el-table-column label="检查时间" width="120" sortable align="center">
-        </el-table-column>
-        <el-table-column label="地点" align="center"> </el-table-column>
-        <el-table-column label="内容" align="center"> </el-table-column>
-        <el-table-column label="类别" align="center"> </el-table-column>
-        <el-table-column label="级别" align="center"> </el-table-column>
-      </el-table-column>
-      <el-table-column label="整改计划" align="center">
-        <el-table-column label="整改措施" align="center"> </el-table-column>
-        <el-table-column label="隐患部门" align="center"> </el-table-column>
-        <el-table-column label="责任人" align="center"> </el-table-column>
-        <el-table-column label="限改时间" width="120" sortable align="center">
-        </el-table-column>
-        <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
-      </el-table-column>
-      <el-table-column label="整改情况" align="center">
-        <el-table-column label="完成时间" sortable width="120" align="center"> </el-table-column>
-        <el-table-column label="复查结果" align="center"> </el-table-column>
-        <el-table-column label="复查人" align="center"> </el-table-column>
-        <el-table-column label="复查时间" width="120" sortable align="center">
-        </el-table-column>
-        <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
-      </el-table-column>
-      <el-table-column label="隐患处理状态" align="center"> </el-table-column>
-      <el-table-column label="是否关联" align="center"> </el-table-column>
-      <el-table-column label="风险等级" align="center"> </el-table-column>
-      <el-table-column label="初始警情" align="center"> </el-table-column>
-      <el-table-column label="当前警情" align="center"> </el-table-column>
-      <el-table-column label="流程操作" align="center">
-        <template slot-scope="scope">
-            <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
-        </template>
-    </el-table-column>
-    </el-table>
+      <el-table :data="tableData" style="width: 100%">
+          <el-table-column type="selection" width="55" align="center"></el-table-column>
+          <el-table-column prop="number" label="编号" align="center"  width="120"></el-table-column>
+          <el-table-column prop="check_branch" label="检查部门" align="center"  width="120"></el-table-column>
+          <el-table-column prop="check_man" label="检查人" align="center"  width="120"></el-table-column>
+          <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
+          <el-table-column label="隐患项目" align="center">
+              <el-table-column prop="check_date" label="检查时间" width="120"  align="center"></el-table-column>
+              <el-table-column prop="address" label="地点" align="center"> </el-table-column>
+              <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
+              <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
+              <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
+          </el-table-column>
+          <el-table-column label="整改计划" align="center">
+              <el-table-column prop="measure" label="整改措施" align="center"> </el-table-column>
+              <el-table-column prop="ht_branch" label="隐患部门" align="center"> </el-table-column>
+              <el-table-column prop="duty_officer" label="责任人" align="center"> </el-table-column>
+              <el-table-column prop="alter_time" label="限改时间" width="120"  align="center"></el-table-column>
+          </el-table-column>
+          <el-table-column label="整改情况" align="center">
+              <el-table-column prop="ACCOMPLISHTIME"  label="完成时间" align="center"></el-table-column>
+              <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"> </el-table-column>
+              <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"> </el-table-column>
+              <el-table-column prop="CALLBACKTIME" label="复查时间" width="120"  align="center"></el-table-column>
+          </el-table-column>
+          <el-table-column  label="隐患处理状态" align="center">
+              <template slot-scope="scope">
+                  <span v-if="scope.row.step =='1'">初始状态</span>
+                  <span v-if="scope.row.step =='2'">整改中</span>
+                  <span v-if="scope.row.step =='3'">复查中</span>
+                  <span v-if="scope.row.step =='end'">处理结束</span>
+              </template>
+          </el-table-column>
+          <el-table-column prop="date" label="是否关联" align="center"> </el-table-column>
+          <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column>
+          <el-table-column prop="date" label="初始警情" align="center"> </el-table-column>
+          <el-table-column prop="date" label="当前警情" align="center"> </el-table-column>
+          <el-table-column prop="date" label="流程操作" align="center">
+              <template slot-scope="scope">
+                  <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+              </template>
+          </el-table-column>
+      </el-table>
     <div style="text-align: right">
       <el-pagination
         v-show="recordTotal > 0"
@@ -232,51 +203,130 @@
   </div>
 </template>
 <script>
+    import {getPageList} from "@/api/sgyhpczl/recheckCancellationNumber";
+    import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
 export default {
   data() {
     return {
-      form:{},
-      radio1: '上海',
-       options: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
-        tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-          }],
-      pageSize: 10,
-      recordTotal: 0,
-      currentPage: 1,
+        options: [],
+        form:{},
+        value1:"",
+
+        JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
+        JCBMList:[],
+        YHLXList:[],
+        BCList:[],
+        JCLBList:[],
+        YHBMList:[],
+        YHJBList:[],
+        tableData: [],
+        listQuery:{
+            page:1,
+            limit:10,
+            form:{},
+        },
+        currentPage: 1,
+        pageSize: 10,
+        recordTotal: 0,
     };
     },
+    mounted(){
+        this.getPageList()
+        this.initYHLX()
+        this.initYHJB()
+        this.initBC()
+        this.initJCLB()
+    },
     methods:{
-      // 发送隐患单跳转
+
+        changeYHDW(val){
+            initYHBM().then(res=>{
+                if (res.data.ok==1){
+                    this.YHBMList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        changeJCDW(val){
+            initJCBM(val).then(res=>{
+                if (res.data.ok==1){
+                    this.JCBMList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        getPageList(){
+            this.listQuery.page=1
+            getPageList(this.listQuery).then(res=>{
+                if (res.data.ok==1) {
+                    this.tableData = res.data.data
+                    // this.recordTotal=res.data.data.length
+                }else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        reset(){
+            this.listQuery.form={}
+            this.getPageList()
+        },
+        handleSizeChange(val){
+            this.listQuery.limit = val
+            this.getPageListForPagination();
+        },
+        handleCurrentChange(val){
+            this.listQuery.page = val
+            this.getPageListForPagination();
+        },
+        getPageListForPagination(){
+            getPageList(this.listQuery).then(res=>{
+                if (res.data.ok==1) {
+                    this.tableData = res.data.data
+                }else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initYHLX(){
+            initYHLX().then(res=>{
+                if (res.data.ok==1){
+                    this.YHLXList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initYHJB(){
+            initYHJB().then(res=>{
+                if (res.data.ok==1){
+                    this.YHJBList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initBC(){
+            initBC().then(res=>{
+                if (res.data.ok==1){
+                    this.BCList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+        initJCLB(){
+            initJCLB().then(res=>{
+                if (res.data.ok==1){
+                    this.JCLBList=res.data.data
+                } else{
+                    this.$message({type:'error', message:res.data.msg, duration:3000})
+                }
+            })
+        },
+
+        // 发送隐患单跳转
       handleClick(){
           this.$router.push({
               path:"/recheckHiddenDangerList"

--
Gitblit v1.9.2