diff --git a/api/index.js b/api/index.js
index ce92a17..7184f52 100644
--- a/api/index.js
+++ b/api/index.js
@@ -49,18 +49,21 @@ export const getCheckCycle = () => post("/app/dictionaries/getLevels", {loading:
 export const getListType = () => post("/app/dictionaries/getLevels", {loading: false, DICTIONARIES_ID: '4a3d0d99b0ea4e268c11dd0b18866917'}) //获取清单类型
 export const approveHotWorkSupervision = (params) => post("/app/hotworkapplication/editOpinion", params) //特级动火 安全监督部初审
 export const approveHotWorkSupervisionAndFfile = (params) => upload("/app/hotworkapplication/editOpinion/file", params) //特级动火 安全监督部初审 增加签字附件
-export const getInspectionReportCorpInfoList = (params) => post("/app/inspectionReport/corpinfo/list", params) //获取所有的分公司自查自报记录
-export const getInspectionReportListManageList = (params) => post("/app/inspectionReport/listManage/list", params) //分公司的清单记录
-export const getInspectionReportListManageRecordsList = (params) => post("/app/inspectionReport/listManage/records/list", params) //已检查信息与超期未检查记录
-export const getInspectionReportListManageRecordsDetails = (params) => post("/app/inspectionReport/listManage/records/details", params) //检查记录详情
-export const getIgnoreCountByCorpInfo = (params) => post("/app/hidden/getIgnoreCountByCorpinfo", params) //获取忽略隐患公司列表
-export const getIgnoreHiddenList = (params) => post("/app/hidden/ignorelist", params) //获取忽略隐患列表
-export const getHiddenGoEdit = (params) => post("/app/hidden/goEdit", params) //隐患详情
-export const getCorpInfoRiskStatistics = (params) => post("/app/corpinfo/risk/statistics", params) //获取企业风险管理列表
-export const getRiskUnitList = (params) => post("/app/riskunit/list", params) //获取公司风险点列表
-export const getRiskUnitCustomizedList = (params) => post("/app/riskunit/customizedList", params) //获取公司风险点列表
-export const getGeneralCountByCorpInfo = (params) => post("/app/hidden/hidden/list", params) //获取一般隐患公司列表
-export const getGeneralHiddenList = (params) => post("/app/hidden/generalHiddenList", params) //获取一般隐患列表
+export const getInspectionReportCorpInfoList = (params) => post("/hidden/inspections/statistics/company/page", params) //获取所有的分公司自查自报记录
+export const getInspectionReportListManageList = (params) => post("/hidden/inspections/page", params) //分公司的清单记录
+export const getInspectionReportListManageRecordsList = (params) => post("/hidden/inspections/record/page", params) //已检查信息与超期未检查记录
+export const getInspectionReportListManageRecordsDetails = (params) => post(`/hidden/inspections/record/${params.id}`, params) //检查记录详情
+export const getChecklistInspectionStatusRecordViewOtherHiddenDangerList = (params) => post("/hidden/query/list", params);
+export const getIgnoreCountByCorpInfo = (params) => post("/hidden/statistics/ignore/page", params) //获取忽略隐患公司列表
+export const getIgnoreHiddenList = (params) => post("/hidden/query/ignore/page/app", params) //获取忽略隐患列表
+export const getHiddenGoEdit = (params) => post(`/hidden/query/${params.id}`, params) //隐患详情
+export const getCorpInfoRiskStatistics = (params) => post("/risk/statistics/corp/page", params) //获取企业风险管理列表
+export const getCorpInfoRiskStatistics1 = (params) => post("/app/corpinfo/risk/statistics", params) //获取企业风险管理列表
+export const getRiskUnitList = (params) => post("/risk/unit/list", params) //获取公司风险点列表
+export const getRiskUnitCustomizedList = (params) => post("/risk/point/app/page", params) //获取公司风险点列表
+export const getRiskPostInfo = (params) => post(`/risk/point/${params.id}`, params) //获取公司风险点列表
+export const getGeneralCountByCorpInfo = (params) => post("/hidden/statistics/general/page", params) //获取一般隐患公司列表
+export const getGeneralHiddenList = (params) => post("/hidden/query/page", params) //获取一般隐患列表
 export const getSpecialCountByCorpInfo = (params) => post("/app/hidden/speciallist", params) //获取特殊隐患列表
 export const getSpecialHiddenList = (params) => post("/app/hidden/specialByCorpInfoId", params) //获取特殊隐患列表
 export const getRiskFourColorMapList = (params) => post("/app/riskwarning/list", params) //获取风险四色图列表
diff --git a/manifest.json b/manifest.json
index 140f3e6..326fa96 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
 {
     "name" : "秦港双控-监管端",
-    "appid" : "__UNI__DB65C6B",
+    "appid" : "__UNI__B09FF11",
     "description" : "秦港双控-监管端",
-    "versionName" : "01.00.59",
-    "versionCode" : 59,
+    "versionName" : "01.00.50",
+    "versionCode" : 50,
     "transformPx" : false,
     /* 5+App特有相关
 			android:value="uni.UN5E8A412|__UNI__DB65C6B|124611200205|common" */
@@ -69,49 +69,47 @@
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
-                "maps" : {
-                    "baidu" : {
-                        "appkey_ios" : "HLcs9LXSe81VbYDvpBv6RDoiFL3UqetM",
-                        "appkey_android" : "Q9xrYCbgeGkRuH5nPjhgw7js55pXg8zU"
-                    }
-                },
-                "geolocation" : {
-                    "baidu" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "HLcs9LXSe81VbYDvpBv6RDoiFL3UqetM",
-                        "appkey_android" : "Q9xrYCbgeGkRuH5nPjhgw7js55pXg8zU"
-                    }
-                }
+                "maps" : {},
+                // "baidu" : {
+                //     "appkey_ios" : "HLcs9LXSe81VbYDvpBv6RDoiFL3UqetM",
+                //     "appkey_android" : "Q9xrYCbgeGkRuH5nPjhgw7js55pXg8zU"
+                // }
+                "geolocation" : {}
             },
+            // "baidu" : {
+            //     "__platform__" : [ "ios", "android" ],
+            //     "appkey_ios" : "HLcs9LXSe81VbYDvpBv6RDoiFL3UqetM",
+            //     "appkey_android" : "Q9xrYCbgeGkRuH5nPjhgw7js55pXg8zU"
+            // }
             "icons" : {
                 "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                    "hdpi" : "",
+                    "xhdpi" : "",
+                    "xxhdpi" : "",
+                    "xxxhdpi" : ""
                 },
                 "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "appstore" : "",
                     "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                        "app" : "",
+                        "app@2x" : "",
+                        "notification" : "",
+                        "notification@2x" : "",
+                        "proapp@2x" : "",
+                        "settings" : "",
+                        "settings@2x" : "",
+                        "spotlight" : "",
+                        "spotlight@2x" : ""
                     },
                     "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                        "app@2x" : "",
+                        "app@3x" : "",
+                        "notification@2x" : "",
+                        "notification@3x" : "",
+                        "settings@2x" : "",
+                        "settings@3x" : "",
+                        "spotlight@2x" : "",
+                        "spotlight@3x" : ""
                     }
                 }
             }
diff --git a/pages/branch-self-report/index/index.vue b/pages/branch-self-report/index/index.vue
index 29e9d5e..59f109f 100644
--- a/pages/branch-self-report/index/index.vue
+++ b/pages/branch-self-report/index/index.vue
@@ -5,7 +5,7 @@
           prefixIcon="search"
           placeholder="请输入关键字"
           border="surround"
-          v-model="KEYWORDS"
+          v-model="companyName"
           clearable
           shape="circle"
       ></u--input>
@@ -18,33 +18,32 @@
       <u-list-item v-for="(item, index) in list" :key="index">
         <view>
           <view class="flex-between main-title">
-            <text>{{ item.CORP_NAME }}</text>
+            <text>{{ item.companyName }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
             <text>
               属地：
-              <template v-if="item.PRVINCE_NAME">{{ item.PRVINCE_NAME }}</template>
-              <template v-if="item.CITY_NAME"> -- {{ item.CITY_NAME }}</template>
-              <template v-if="item.COUNTRY_NAME"> -- {{ item.COUNTRY_NAME }}</template>
+              <template v-if="item.companyProvince">{{ item.companyProvince }}</template>
+              <template v-if="item.companyCity"> -- {{ item.companyCity }}</template>
+              <template v-if="item.companyArea"> -- {{ item.companyArea }}</template>
             </text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>检查清单数：{{ item.qdCount }}</text>
-            <text>检查次数：{{ item.checkedCount }}</text>
+            <text>检查清单数：{{ item.checkInspectionsCount }}</text>
+            <text>检查次数：{{ item.checkCount }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>忽略：{{ item.hlCount }}</text>
-            <text>轻微：{{ item.xwCount }}</text>
-            <text>一般：{{ item.qwCount }}</text>
-            <text>较大：{{ item.jdCount }}</text>
+            <text>忽略：{{ item.ignoreHiddenCount }}</text>
+            <text>轻微：{{ item.minorHiddenCount }}</text>
+            <text>一般：{{ item.generalHiddenCount }}</text>
+            <text>较大：{{ item.largeHiddenCount }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>重大隐患：{{ item.zdCount }}</text>
-
+            <text>重大隐患：{{ item.seriousHiddenCount }}</text>
           </view>
           <view class="see_btn">
             <u-button type="primary" text="查看" size="mini"
-                      @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
+                      @click="fnNavigatorDetail(item.companyId)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -54,14 +53,14 @@
 </template>
 
 <script>
-import {getInspectionReportCorpInfoList} from "../../../api";
+import { getInspectionReportCorpInfoList } from "@/api";
 
 export default {
   data() {
     return {
-      KEYWORDS: '',
-      pageSize: 10,
-      currentPage: 1,
+      companyName: '',
+      limit: 10,
+      curPage: 1,
       totalPage: 0,
       list: [],
     }
@@ -76,32 +75,31 @@ export default {
   },
   methods: {
     async getData() {
-      let resData = await getInspectionReportCorpInfoList({
-        USER_ID: this.userInfo.USER_ID,
-        KEYWORDS: this.KEYWORDS,
-        showCount: this.pageSize,
-        currentPage: this.currentPage,
+      let { page } = await getInspectionReportCorpInfoList({
+        companyName: this.companyName,
+        curPage: this.curPage,
+        limit: this.limit,
       });
-      this.list = [...this.list, ...resData.valList];
-      this.totalPage = resData.page.totalPage;
+      this.list = [...this.list, ...page.list];
+      this.totalPage = page.totalPage;
     },
     resetList() {
-      this.pageSize = 10
-      this.currentPage = 1
+      this.limit = 10
+      this.curPage = 1
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(CORPINFO_ID) {
+    fnNavigatorDetail(companyId) {
       uni.$u.route({
         url: '/pages/branch-self-report/index/inspection-records',
         params: {
-          CORPINFO_ID,
+          companyId,
         }
       })
     },
     scrolltolower() {
-      this.currentPage++;
-      if (this.totalPage >= this.currentPage) this.getData();
+      this.curPage++;
+      if (this.totalPage >= this.curPage) this.getData();
     },
   }
 }
diff --git a/pages/branch-self-report/index/inspection-records-detail-list.vue b/pages/branch-self-report/index/inspection-records-detail-list.vue
index c0df466..73bf7a6 100644
--- a/pages/branch-self-report/index/inspection-records-detail-list.vue
+++ b/pages/branch-self-report/index/inspection-records-detail-list.vue
@@ -11,7 +11,7 @@
           prefixIcon="search"
           placeholder="请输入关键字"
           border="surround"
-          v-model="KEYWORDS"
+          v-model="name"
           clearable
           shape="circle"
       ></u--input>
@@ -24,25 +24,25 @@
       <u-list-item v-for="(item, index) in list" :key="index">
         <view>
           <view class="flex-between main-title">
-            <text>清单名称：{{ item.LIST_NAME }}</text>
+            <text>清单名称：{{ item.name }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>人员：{{ item.CREATOR }}</text>
+            <text>人员：{{ item.creator }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>检查周期：{{ item.DATESTART }}-{{ item.DATEEND }}</text>
+            <text>检查周期：{{ item.startTime }}-{{ item.endTime }}</text>
           </view>
-          <view class="flex-between mt-10 subtitle" v-show="TYPE === 1">
-            <text>检查人：{{ item.CHECK_USERS }}</text>
-            <text>检查时间：{{ item.CHECK_TIME }}</text>
+          <view class="flex-between mt-10 subtitle" v-show="type === 1">
+            <text>检查人：{{ item.checkPerson }}</text>
+            <text>检查时间：{{ item.checkTime }}</text>
           </view>
-          <view class="flex-between mt-10 subtitle" v-show="TYPE === 2">
-            <text>清单类型：{{ item.TYPENAME }}</text>
-            <text>清单周期：{{ item.PERIODNAME }}</text>
+          <view class="flex-between mt-10 subtitle" v-show="type === 2">
+            <text>清单类型：{{ item.inspectionsTypeName }}</text>
+            <text>清单周期：{{ item.periodicityName }}</text>
           </view>
-          <view class="flex-end mt-10 see_btn" v-show="TYPE === 1">
+          <view class="flex-end mt-10 see_btn" v-show="type === 1">
             <u-button type="primary" text="查看" size="mini"
-                      @click="fnNavigatorDetail(item.CHECKRECORD_ID,item.CORPINFO_ID)"></u-button>
+                      @click="fnNavigatorDetail(item.id)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -52,61 +52,59 @@
 </template>
 
 <script>
-import {getInspectionReportListManageRecordsList} from "../../../api";
+import { getInspectionReportListManageRecordsList } from "@/api";
 
 export default {
   data() {
     return {
-      KEYWORDS: '',
-      LISTMANAGER_ID: '',
-      CORPINFO_ID: '',
-      TYPE: 1,
-      pageSize: 10,
-      currentPage: 1,
+      name: '',
+      inspectionsId: '',
+      companyId: '',
+      type: 1,
+      limit: 10,
+      curPage: 1,
       totalPage: 0,
       list: [],
       tabsList: [{name: '已检查记录', id: 1}, {name: '超期未检查记录', id: 2}]
     }
   },
   onLoad(event) {
-    this.CORPINFO_ID = event.CORPINFO_ID;
-    this.LISTMANAGER_ID = event.LISTMANAGER_ID;
+    this.companyId = event.companyId;
+    this.inspectionsId = event.id;
     this.resetList()
   },
   methods: {
     async getData() {
-      let resData = await getInspectionReportListManageRecordsList({
-        KEYWORDS: this.KEYWORDS,
-        CORPINFO_ID: this.CORPINFO_ID,
-        SELECT_CORPINFO_ID: this.CORPINFO_ID,
-        LISTMANAGER_ID: this.LISTMANAGER_ID,
-        TYPE: this.TYPE,
-        showCount: this.pageSize,
-        currentPage: this.currentPage,
+      let { page } = await getInspectionReportListManageRecordsList({
+        name: this.name,
+        inspectionsId: this.inspectionsId,
+        type: this.type,
+        limit: this.limit,
+        curPage: this.curPage,
       });
-      this.list = [...this.list, ...resData.varList];
-      this.totalPage = resData.page.totalPage;
+      this.list = [...this.list, ...page.list];
+      this.totalPage = page.totalPage;
     },
     resetList() {
-      this.pageSize = 10
-      this.currentPage = 1
+      this.limit = 10
+      this.curPage = 1
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(CHECKRECORD_ID,CORPINFO_ID) {
+    fnNavigatorDetail(id) {
       uni.$u.route({
         url: '/pages/branch-self-report/index/inspection-records-detail',
         params: {
-          CHECKRECORD_ID,CORPINFO_ID
+          id
         }
       })
     },
     scrolltolower() {
-      this.currentPage++;
-      if (this.totalPage >= this.currentPage) this.getData();
+      this.curPage++;
+      if (this.totalPage >= this.curPage) this.getData();
     },
     tabsClick(e) {
-      this.TYPE = e.id
+      this.type = e.id
       this.resetList()
     }
   }
diff --git a/pages/branch-self-report/index/inspection-records-detail.vue b/pages/branch-self-report/index/inspection-records-detail.vue
index 344ef29..00a1d7f 100644
--- a/pages/branch-self-report/index/inspection-records-detail.vue
+++ b/pages/branch-self-report/index/inspection-records-detail.vue
@@ -11,16 +11,16 @@
               <uni-th align="center">检测内容</uni-th>
               <uni-th align="center">状态</uni-th>
             </uni-tr>
-            <uni-tr v-for="item in varList" :key="item.RISKPOINT_ID">
-              <uni-td>{{ item.CHECK_CONTENT }}</uni-td>
-              <uni-td v-if='item.ISNORMAL=="1"' align="center">
-                <view style="color: blue;" @click="HiddenDetail(item.HIDDEN_ID)">不合格</view>
+            <uni-tr v-for="item in varList" :key="item.id">
+              <uni-td>{{ item.checkContent }}</uni-td>
+              <uni-td v-if='item.isNormal === "1"' align="center">
+                <view style="color: blue;" @click="HiddenDetail(item.hiddenId)">不合格</view>
               </uni-td>
-              <uni-td v-else-if='item.ISNORMAL=="2"' align="center">
+              <uni-td v-else-if='item.isNormal === "2"' align="center">
                 <view style="color: blue;">已忽略</view>
               </uni-td>
               <uni-td v-else align="center">
-                <template v-if="item.IMGCOUNT>0 && isTongyong">
+                <template v-if="item.imgCount > 0 && isTongyong">
                   <view style="color: blue;">合格</view>
                 </template>
                 <template v-else>合格</template>
@@ -39,10 +39,10 @@
               <uni-th align="center">隐患描述</uni-th>
               <uni-th align="center">操作</uni-th>
             </uni-tr>
-            <uni-tr v-for="item in otherHiddenList" :key="item.HIDDEN_ID">
-              <uni-td>{{ item.HIDDENDESCR }}</uni-td>
+            <uni-tr v-for="item in otherHiddenList" :key="item.hiddenId">
+              <uni-td>{{ item.hiddendescr }}</uni-td>
               <uni-td align="center">
-                <view style="color: blue" @click="HiddenDetail(item.HIDDEN_ID)">查看</view>
+                <view style="color: blue" @click="HiddenDetail(item.hiddenId)">查看</view>
               </uni-td>
             </uni-tr>
           </uni-table>
@@ -56,35 +56,35 @@
           <u-cell-group>
             <u-cell>
               <view slot="title" class="title">清单名称</view>
-              <view slot="value">{{ form.LIST_NAME }}</view>
+              <view slot="value">{{ form.name }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">排查清单类型</view>
-              <view slot="value">{{ form.SCREENTYPENAME }}</view>
+              <view slot="value">{{ form.screenTypeName }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">检查人</view>
-              <view slot="value">{{ form.USERS }}</view>
+              <view slot="value">{{ form.userNames }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">检查时间</view>
-              <view slot="value">{{ form.CHECK_TIME }}</view>
+              <view slot="value">{{ form.checkTime }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">所属部门</view>
-              <view slot="value">{{ form.DEPARTMENT_NAME }}</view>
+              <view slot="value">{{ form.departmentName }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">所属岗位</view>
-              <view slot="value">{{ form.POST_NAME }}</view>
+              <view slot="value">{{ form.postName }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">排查周期</view>
-              <view slot="value">{{ form.PERIODNAME }}</view>
+              <view slot="value">{{ form.periodicityName }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">清单类型</view>
-              <view slot="value">{{ form.TYPENAME }}</view>
+              <view slot="value">{{ form.inspectionsTypeName }}</view>
             </u-cell>
           </u-cell-group>
         </view>
@@ -97,7 +97,7 @@
             @click="
             $u.route({
               url: '/pages/branch-self-report/index/map',
-              params: { CHECKRECORD_ID },
+              params: { id },
             })
           "
         />
@@ -107,45 +107,35 @@
 </template>
 
 <script>
-import {getInspectionReportListManageRecordsDetails} from "../../../api";
+import {
+  getChecklistInspectionStatusRecordViewOtherHiddenDangerList,
+  getInspectionReportListManageRecordsDetails
+} from "@/api";
 
 export default {
   data() {
     return {
-      CHECKRECORD_ID: '',
+      id: '',
       form: {},
-      mapUrl: '',
-      scale: 13,
-      latitude: 39.935866846326036,
-      longitude: 119.64918897343684,
-      covers: [],
       varList: [],
-      hdList: [],
       otherHiddenList: [],
     }
   },
   onLoad(event) {
-    this.CHECKRECORD_ID = event.CHECKRECORD_ID;
+    this.id = event.id;
     this.getData()
   },
   methods: {
     async getData() {
-      let resData = await getInspectionReportListManageRecordsDetails({
-        CHECKRECORD_ID: this.CHECKRECORD_ID,
+      const { data: resData } = await getInspectionReportListManageRecordsDetails({
+        id: this.id,
       });
-      this.form = resData.pd;
-      this.varList = resData.varList;
-      this.hdList = resData.hdList;
-      this.otherHiddenList = resData.otherHiddenList;
-      for (let i = 0; i < resData.hdList.length; i++) {
-        console.log(resData.hdList)
-        this.covers.push({
-          latitude: resData.hdList[i].LATITUDE,
-          longitude: resData.hdList[i].LONGITUDE,
-          iconPath: '../../../static/map/h.png',
-        });
-      }
-      this.mapUrl = ("/hybrid/html/mapShow.html?covers=" + JSON.stringify(this.covers) + "&title=检查记录详情");
+      this.form = resData;
+      this.varList = resData?.inspectionItemList;
+      const { data } = await getChecklistInspectionStatusRecordViewOtherHiddenDangerList({
+        checkrecordId: this.id,
+      })
+      this.otherHiddenList = data;
     },
     HiddenDetail(HIDDEN_ID) {
       uni.$u.route({
diff --git a/pages/branch-self-report/index/inspection-records.vue b/pages/branch-self-report/index/inspection-records.vue
index c6061f0..d55f8a9 100644
--- a/pages/branch-self-report/index/inspection-records.vue
+++ b/pages/branch-self-report/index/inspection-records.vue
@@ -5,7 +5,7 @@
           prefixIcon="search"
           placeholder="请输入关键字"
           border="surround"
-          v-model="KEYWORDS"
+          v-model="name"
           clearable
           shape="circle"
       ></u--input>
@@ -23,28 +23,28 @@
                   inputAlign="right"
                   placeholder="请输入清单名称"
                   border="none"
-                  v-model="KEYWORDS"
+                  v-model="name"
                   clearable
               ></u--input>
             </u-form-item>
             <u-form-item label="检查部门" borderBottom>
-              <u--text :text="DEPTNAME || '请选择'" @click="showTree"></u--text>
+              <u--text :text="departmentName || '请选择'" @click="showTree"></u--text>
               <tki-tree ref="tkitree" :range="deptRange" rangeKey="name" selectParent @confirm="confirmTree"/>
             </u-form-item>
             <u-form-item label="检查人" borderBottom>
-              <u--text :text="USER_NAME || '请选择'" @click="userShow = true"></u--text>
+              <u--text :text="userName || '请选择'" @click="userShow = true"></u--text>
               <u-picker :show="userShow" :columns="userList" keyName="USERNAME"
                         @cancel="userShow = false"
                         @confirm="pickerConfirm($event,'user')"></u-picker>
             </u-form-item>
             <u-form-item label="清单类型" borderBottom>
-              <u--text :text="TYPE_NAME || '请选择'" @click="typeShow = true"></u--text>
+              <u--text :text="typeName || '请选择'" @click="typeShow = true"></u--text>
               <u-picker :show="typeShow" :columns="typeList" keyName="NAME"
                         @cancel="typeShow = false"
                         @confirm="pickerConfirm($event,'type')"></u-picker>
             </u-form-item>
             <u-form-item label="排查周期" borderBottom>
-              <u--text :text="PERIOD_NAME || '请选择'" @click="periodShow = true"></u--text>
+              <u--text :text="periodicityName || '请选择'" @click="periodShow = true"></u--text>
               <u-picker :show="periodShow" :columns="periodList" keyName="NAME"
                         @cancel="periodShow = false"
                         @confirm="pickerConfirm($event,'period')"></u-picker>
@@ -83,26 +83,26 @@
       <u-list-item v-for="(item, index) in list" :key="index">
         <view>
           <view class="flex-between main-title">
-            <text>清单名称：{{ item.NAME }}</text>
+            <text>清单名称：{{ item.name }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>清单类型：{{ item.TYPENAME }}</text>
-            <text>排查周期：{{ item.PERIODNAME }}</text>
+            <text>清单类型：{{ item.typeName }}</text>
+            <text>排查周期：{{ item.periodicityName }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>部门：{{ item.DEPARTMENT_NAME }}</text>
+            <text>部门：{{ item.departmentName }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>岗位：{{ item.POST_NAME }}</text>
-            <text>人员：{{ item.USER_NAME }}</text>
+            <text>岗位：{{ item.postName }}</text>
+            <text>人员：{{ item.userName }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>检查次数：{{ item.count }}</text>
-            <text>超期未检查次数：{{ item.OVERTIMENUM }}</text>
+            <text>检查次数：{{ item.checkCount }}</text>
+            <text>超期未检查次数：{{ item.overtimeNumber }}</text>
           </view>
           <view class="flex-end mt-10 see_btn">
             <u-button type="primary" text="查看" size="mini"
-                      @click="fnNavigatorDetail(item.LISTMANAGER_ID)"></u-button>
+                      @click="fnNavigatorDetail(item.id)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -115,41 +115,39 @@
 <script>
 import {
   getInspectionReportListManageList,
-  getDept,
   getDeptUser,
-  getCorpDept,
   getCheckCycle,
   getListType,
   getInspectedDepartment
-} from "../../../api";
+} from "@/api";
 import FabButton from "@/components/fab_button/index.vue";
 
 export default {
   components: {FabButton},
   data() {
     return {
-      CORPINFO_ID: '',
-      KEYWORDS: '',
-      pageSize: 10,
-      currentPage: 1,
+      companyId: '',
+      name: '',
+      limit: 10,
+      curPage: 1,
       totalPage: 0,
       list: [],
       popupShow: false,
-      DEPT: '',
-      DEPTNAME: '',
+      departmentId: '',
+      departmentName: '',
       deptRange: [],
       userList: [],
       userShow: false,
-      USER_NAME: '',
-      USER_ID: '',
+      userName: '',
+      userId: '',
       typeList: [],
       typeShow: false,
-      TYPE_NAME: '',
-      TYPE_ID: '',
+      typeName: '',
+      type: '',
       periodList: [],
       periodShow: false,
-      PERIOD_NAME: '',
-      PERIOD_ID: '',
+      periodicityName: '',
+      periodicity: '',
       startDateShow: false,
       startDate: '',
       endDateShow: false,
@@ -157,7 +155,7 @@ export default {
     }
   },
   onLoad(event) {
-    this.CORPINFO_ID = event.CORPINFO_ID;
+    this.companyId = event.companyId;
     this.resetList()
     this.getDept()
     this.fnGetCheckCycle()
@@ -165,7 +163,7 @@ export default {
   },
   methods: {
     async getDept() {
-      let resData = await getInspectedDepartment({'CORPINFO_ID': this.CORPINFO_ID});
+      let resData = await getInspectedDepartment({'CORPINFO_ID': this.companyId});
       this.deptRange = JSON.parse(resData.zTreeNodes)
     },
     async fnGetDeptUser(detpId) {
@@ -182,63 +180,62 @@ export default {
     },
     async getData() {
       this.popupShow = false
-      let resData = await getInspectionReportListManageList({
-        CORPINFO_ID: this.CORPINFO_ID,
-        SELECT_CORPINFO_ID: this.CORPINFO_ID,
-        KEYWORDS: this.KEYWORDS,
-        DEPARTMENT_ID: this.DEPT,
-        USER_ID: this.USER_ID,
-        TYPE: this.TYPE_ID,
-        PERIOD: this.PERIOD_ID,
-        STARTTIME: this.startDate,
-        ENDTIME: this.endDate,
-        showCount: this.pageSize,
-        currentPage: this.currentPage,
+      let { page } = await getInspectionReportListManageList({
+        companyId: this.companyId,
+        name: this.name,
+        departmentId: this.departmentId,
+        userId: this.userId,
+        type: this.type,
+        periodicity: this.periodicity,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        limit: this.limit,
+        curPage: this.curPage,
       });
-      this.list = [...this.list, ...resData.varList];
-      this.totalPage = resData.page.totalPage;
+      this.list = [...this.list, ...page.list];
+      this.totalPage = page.totalPage;
     },
     resetList() {
-      this.pageSize = 10
-      this.currentPage = 1
+      this.limit = 10
+      this.curPage = 1
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(LISTMANAGER_ID) {
+    fnNavigatorDetail(id) {
       uni.$u.route({
         url: '/pages/branch-self-report/index/inspection-records-detail-list',
         params: {
-          LISTMANAGER_ID,
-          CORPINFO_ID: this.CORPINFO_ID,
+          id,
+          companyId: this.companyId,
         }
       })
     },
     scrolltolower() {
-      this.currentPage++;
-      if (this.totalPage >= this.currentPage) this.getData();
+      this.curPage++;
+      if (this.totalPage >= this.curPage) this.getData();
     },
     showTree() {
       this.$refs.tkitree._show()
     },
     confirmTree(e) {
-      this.DEPT = e[0].id
-      this.DEPTNAME = e[0].name
+      this.departmentId = e[0].id
+      this.departmentName = e[0].name
       this.fnGetDeptUser(e[0].id)
     },
     pickerConfirm(e, type) {
       if (type === 'user') {
-        this.USER_ID = e.value[0].USER_ID
-        this.USER_NAME = e.value[0].USERNAME
+        this.userId = e.value[0].USER_ID
+        this.userName = e.value[0].USERNAME
         this.userShow = false;
       }
       if (type === 'type') {
-        this.TYPE_ID = e.value[0].BIANMA
-        this.TYPE_NAME = e.value[0].NAME
+        this.type = e.value[0].BIANMA
+        this.typeName = e.value[0].NAME
         this.typeShow = false;
       }
       if (type === 'period') {
-        this.PERIOD_ID = e.value[0].BIANMA
-        this.PERIOD_NAME = e.value[0].NAME
+        this.periodicity = e.value[0].BIANMA
+        this.periodicityName = e.value[0].NAME
         this.periodShow = false;
       }
     },
@@ -252,15 +249,15 @@ export default {
     },
     reset() {
       this.popupShow = false
-      this.KEYWORDS = ''
-      this.DEPT = ''
-      this.DEPTNAME = ''
-      this.USER_ID = ''
-      this.USER_NAME = ''
-      this.TYPE_ID = ''
-      this.TYPE_NAME = ''
-      this.PERIOD_ID = ''
-      this.PERIOD_NAME = ''
+      this.name = ''
+      this.departmentId = ''
+      this.departmentName = ''
+      this.userId = ''
+      this.userName = ''
+      this.type = ''
+      this.typeName = ''
+      this.periodicity = ''
+      this.periodicityName = ''
       this.startDate = ''
       this.endDate = ''
       this.resetList()
diff --git a/pages/branch-self-report/index/map.vue b/pages/branch-self-report/index/map.vue
index 93b87c1..b004dfe 100644
--- a/pages/branch-self-report/index/map.vue
+++ b/pages/branch-self-report/index/map.vue
@@ -5,35 +5,37 @@
 </template>
 
 <script>
-import {getInspectionReportListManageRecordsDetails} from "../../../api";
+import {
+  getChecklistInspectionStatusRecordViewOtherHiddenDangerList
+} from "@/api";
 import gcoord from '@/common/gcoord.js'
 import imgH from "@/static/h.png";
 
 export default {
   data() {
     return {
-      CHECKRECORD_ID: '',
+      id: '',
       mapUrl: '',
     }
   },
   onLoad(event) {
-    this.CHECKRECORD_ID = event.CHECKRECORD_ID;
+    this.id = event.id;
     this.getData()
   },
   methods: {
     async getData() {
-      let resData = await getInspectionReportListManageRecordsDetails({
-        CHECKRECORD_ID: this.CHECKRECORD_ID,
+      let { data } = await getChecklistInspectionStatusRecordViewOtherHiddenDangerList({
+        checkrecordId: this.id,
       });
       const covers = []
-      for (let i = 0; i < resData.hdList.length; i++) {
+      for (let i = 0; i < data.length; i++) {
         if (
-            !this.isEmpty(resData.hdList[i].LONGITUDE) &&
-            !this.isEmpty(resData.hdList[i].LATITUDE)
+            !this.isEmpty(data[i].longitude) &&
+            !this.isEmpty(data[i].latitude)
         ) {
           covers.push({
-            latitude: resData.hdList[i].LATITUDE,
-            longitude: resData.hdList[i].LONGITUDE,
+            latitude: data[i].latitude,
+            longitude: data[i].longitude,
             iconPath: imgH,
           });
         }
diff --git a/pages/general-hidden-management/general-hidden/detail-list.vue b/pages/general-hidden-management/general-hidden/detail-list.vue
index 8e83dab..9f19ee6 100644
--- a/pages/general-hidden-management/general-hidden/detail-list.vue
+++ b/pages/general-hidden-management/general-hidden/detail-list.vue
@@ -5,7 +5,7 @@
           prefixIcon="search"
           placeholder="请输入关键字"
           border="surround"
-          v-model="keyword"
+          v-model="hiddendescr"
           clearable
           shape="circle"
       ></u--input>
@@ -19,7 +19,7 @@
         <view class="pl-10 pr-10">
           <u--form labelPosition="left">
             <u-form-item label="隐患发现开始时间" borderBottom>
-              <u--text :text="START_DATA || '请选择'"
+              <u--text :text="startData || '请选择'"
                        @click="startDataShow = true"></u--text>
               <u-datetime-picker :show="startDataShow"
                                  mode="datetime"
@@ -28,7 +28,7 @@
                                  @confirm="startDataConfirm"></u-datetime-picker>
             </u-form-item>
             <u-form-item label="隐患发现结束时间" borderBottom>
-              <u--text :text="END_DATA || '请选择'"
+              <u--text :text="endData || '请选择'"
                        @click="endDataShow = true"></u--text>
               <u-datetime-picker :show="endDataShow"
                                  mode="datetime"
@@ -41,7 +41,7 @@
                   inputAlign="right"
                   placeholder="请输入发现人"
                   border="none"
-                  v-model="FIND_PEOPLE"
+                  v-model="creatorName"
                   clearable
               ></u--input>
             </u-form-item>
@@ -50,18 +50,18 @@
                   inputAlign="right"
                   placeholder="请输入确认人"
                   border="none"
-                  v-model="CONFIRMOR"
+                  v-model="keyConfirmUser"
                   clearable
               ></u--input>
             </u-form-item>
             <u-form-item label="隐患状态" borderBottom>
-              <u--text :text="HIDDEN_STATUS_NAME || '请选择'" @click="hiddenStatusShow = true"></u--text>
+              <u--text :text="stateName || '请选择'" @click="hiddenStatusShow = true"></u--text>
               <u-picker :show="hiddenStatusShow" :columns="hiddenStatusList" keyName="NAME"
                         @cancel="hiddenStatusShow = false"
                         @confirm="pickerConfirm($event,'hiddenStatus')"></u-picker>
             </u-form-item>
             <u-form-item label="隐患级别" borderBottom>
-              <u--text :text="HIDDEN_LEVEL_NAME || '请选择'" @click="showTree"></u--text>
+              <u--text :text="hiddenlevelName || '请选择'" @click="showTree"></u--text>
               <tki-tree ref="tkitree" :range="hiddenLevelList" rangeKey="name" selectParent children-name="nodes"
                         @confirm="confirmTree"/>
             </u-form-item>
@@ -81,30 +81,30 @@
       <u-list-item v-for="(item, index) in list" :key="index">
         <view>
           <view class="flex-between main-title">
-            <text>{{ item.HIDDENDESCR }}</text>
-            <u-tag :text="item.NAME" type="warning"></u-tag>
+            <text>{{ item.hiddenDescription }}</text>
+            <u-tag :text="item.hiddenLevelName" type="warning"></u-tag>
           </view>
           <view class="flex-between mt-10 subtitle">
             <text>
               来源：
-              <template v-if="item.SOURCE == 1">隐患快报</template>
-              <template v-if="item.SOURCE == 2 || item.SOURCE == 3">清单排查</template>
-              <template v-if="item.SOURCE == 4">安全环保检查(监管端)</template>
-              <template v-if="item.SOURCE == 5">安全环保检查(企业端)</template>
-              <template v-if="item.SOURCE == 6">消防检查</template>
+              <template v-if="item.hiddenSource === 1">隐患快报</template>
+              <template v-if="item.hiddenSource === 2 || item.hiddenSource === 3">清单排查</template>
+              <template v-if="item.hiddenSource === 4">安全环保检查(监管端)</template>
+              <template v-if="item.hiddenSource === 5">安全环保检查(企业端)</template>
+              <template v-if="item.hiddenSource === 6">消防检查</template>
             </text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>隐患发现人：{{ item.findUserNames }}</text>
-            <text>隐患发现时间：{{ item.DISCOVERYTIME }}</text>
+            <text>隐患发现人：{{ item.hiddenDiscoverer }}</text>
+            <text>隐患发现时间：{{ item.hiddenDiscoveryTime }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>隐患确认人：{{ item.CONFIRM_USER }}</text>
+            <text>隐患确认人：{{ item.confirmPerson }}</text>
 
           </view>
           <view class="see_btn">
             <u-button type="primary" text="查看" size="mini"
-                      @click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button>
+                      @click="fnNavigatorDetail(item.hiddenId)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -115,35 +115,35 @@
 </template>
 
 <script>
-import {getDept, getGeneralHiddenList, getHiddenLevel} from "../../../api";
+import {getDept, getGeneralHiddenList, getHiddenLevel} from "@/api";
 import FabButton from "@/components/fab_button/index.vue";
 
 export default {
   components: {FabButton},
   data() {
     return {
-      keyword: '',
+      hiddendescr: '',
       pageSize: 10,
       currentPage: 1,
       totalPage: 0,
       list: [{}],
-      CORPINFO_ID: '',
+      companyId: '',
       popupShow: false,
       startDataShow: false,
       endDataShow: false,
       deptRange: [],
-      START_DATA: '',
-      END_DATA: '',
-      FIND_PEOPLE: '',
-      CONFIRMOR: '',
-      HIDDEN_LEVEL_NAME: '',
-      HIDDEN_LEVEL_ID: '',
+      startData: '',
+      endData: '',
+      creatorName: '',
+      keyConfirmUser: '',
+      hiddenlevelName: '',
+      hiddenlevel: '',
       hiddenLevelList: [
         {id: 'hiddenLevel1004', name: '轻微隐患'},
         {id: 'hiddenLevel1002', name: '一般隐患'},
       ],
-      HIDDEN_STATUS_NAME: '',
-      HIDDEN_STATUS_ID: '',
+      stateName: '',
+      state: '',
       hiddenStatusShow: false,
       hiddenStatusList: [
         [
@@ -161,36 +161,31 @@ export default {
     }
   },
   onLoad(event) {
-    this.CORPINFO_ID = event.CORPINFO_ID;
+    this.companyId = event.companyId;
     this.resetList()
     this.fnGetDept()
-    // this.fnGetHiddenLevel()
   },
   methods: {
     async fnGetDept() {
       let resData = await getDept({'DEPARTMENT_ID': '0'});
       this.deptRange = JSON.parse(resData.zTreeNodes)
     },
-    async fnGetHiddenLevel() {
-      let resData = await getHiddenLevel();
-      this.hiddenLevelList = JSON.parse(resData.zTreeNodes)
-    },
     async getData() {
       this.popupShow = false
-      let resData = await getGeneralHiddenList({
-        CORPINFO_ID: this.CORPINFO_ID,
-        DISCOVERYTIME_START: this.START_DATA,
-        DISCOVERYTIME_END: this.END_DATA,
-        HIDDENFIND_NAME: this.FIND_PEOPLE,
-        CONFIRM_USER: this.CONFIRMOR,
-        HIDDEN_STATUS: this.HIDDEN_STATUS_ID,
-        HIDDENLEVEL: this.HIDDEN_LEVEL_ID,
-        KEYWORDS: this.keyword,
+      let { varList, page } = await getGeneralHiddenList({
+        companyId: this.companyId,
+        dates: this.startData != null && this.startData !== '' && this.endData != null && this.endData !== '' ? [this.startData, this.endData] : null,
+        creatorName: this.creatorName,
+        keyConfirmUser: this.keyConfirmUser,
+        state: this.state,
+        hiddenlevel: this.hiddenlevel,
+        hiddendescr: this.hiddendescr,
         showCount: this.pageSize,
         currentPage: this.currentPage,
+        hiddenVueType: "regulatory"
       });
-      this.list = [...this.list, ...resData.varList];
-      this.totalPage = resData.page.totalPage;
+      this.list = [ ...this.list, ...varList ];
+      this.totalPage = page.totalPage;
     },
     resetList() {
       this.pageSize = 10
@@ -198,11 +193,11 @@ export default {
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(HIDDEN_ID) {
+    fnNavigatorDetail(hiddenId) {
       uni.$u.route({
         url: '/pages/general-hidden-management/general-hidden/detail',
         params: {
-          HIDDEN_ID,
+          hiddenId,
         }
       })
     },
@@ -211,17 +206,17 @@ export default {
       if (this.totalPage >= this.currentPage) this.getData();
     },
     startDataConfirm(e) {
-      this.START_DATA = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
+      this.startData = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
       this.startDataShow = false
     },
     endDataConfirm(e) {
-      this.END_DATA = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
+      this.endData = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
       this.endDataShow = false
     },
     pickerConfirm(e, type) {
       if (type === 'hiddenStatus') {
-        this.HIDDEN_STATUS_ID = e.value[0].ID
-        this.HIDDEN_STATUS_NAME = e.value[0].NAME
+        this.state = e.value[0].ID
+        this.stateName = e.value[0].NAME
         this.hiddenStatusShow = false;
       }
     },
@@ -229,20 +224,20 @@ export default {
       this.$refs.tkitree._show()
     },
     confirmTree(e) {
-      this.HIDDEN_LEVEL_ID = e[0].id
-      this.HIDDEN_LEVEL_NAME = e[0].name
+      this.hiddenlevel = e[0].id
+      this.hiddenlevelName = e[0].name
     },
     reset() {
       this.popupShow = false
-      this.keyword = ''
-      this.START_DATA = ''
-      this.END_DATA = ''
-      this.FIND_PEOPLE = ''
-      this.CONFIRMOR = ''
-      this.HIDDEN_STATUS_ID = ''
-      this.HIDDEN_STATUS_NAME = ''
-      this.HIDDEN_LEVEL_ID = ''
-      this.HIDDEN_LEVEL_NAME = ''
+      this.hiddendescr = ''
+      this.startData = ''
+      this.endData = ''
+      this.creatorName = ''
+      this.keyConfirmUser = ''
+      this.state = ''
+      this.stateName = ''
+      this.hiddenlevel = ''
+      this.hiddenlevelName = ''
       this.resetList()
     }
   }
diff --git a/pages/general-hidden-management/general-hidden/detail.vue b/pages/general-hidden-management/general-hidden/detail.vue
index c5f68a6..fcf5846 100644
--- a/pages/general-hidden-management/general-hidden/detail.vue
+++ b/pages/general-hidden-management/general-hidden/detail.vue
@@ -9,84 +9,84 @@
           <u-cell>
             <view slot="title" class="title">隐患来源</view>
             <view slot="value">
-              <template v-if="form.SOURCE=='1'">隐患快报</template>
-              <template v-else-if="form.SOURCE=='2' || form.SOURCE=='3'">清单排查</template>
-              <template v-else-if="form.SOURCE=='4'">安全环保检查(监管端)</template>
-              <template v-else-if="form.SOURCE=='5'">安全环保检查(企业端)</template>
-              <template v-else-if="form.SOURCE=='6'">消防检查</template>
-              <template v-else-if="form.SOURCE=='8'">点检隐患</template>
+              <template v-if="form.source === '1'">隐患快报</template>
+              <template v-else-if="form.source === '2' || form.source === '3'">清单排查</template>
+              <template v-else-if="form.source === '4'">安全环保检查(监管端)</template>
+              <template v-else-if="form.source === '5'">安全环保检查(企业端)</template>
+              <template v-else-if="form.source === '6'">消防检查</template>
+              <template v-else-if="form.source === '8'">点检隐患</template>
             </view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患描述</view>
-            <view slot="label" class="mt-10 u-line-5">{{ form.HIDDENDESCR }}</view>
+            <view slot="label" class="mt-10 u-line-5">{{ form.hiddendescr }}</view>
           </u-cell>
-          <template v-if="form.SOURCE=='2'">
+          <template v-if="form.source === '2'">
             <u-cell>
               <view slot="title" class="title">风险点（单元）</view>
-              <view slot="value">{{ form.RISK_UNIT }}</view>
+              <view slot="value">{{ form.riskUnit }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">辨识部位</view>
-              <view slot="value">{{ form.IDENTIFICATION }}</view>
+              <view slot="value">{{ form.identification }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">存在风险</view>
-              <view slot="value">{{ form.RISK_DESCR }}</view>
+              <view slot="value">{{ form.riskDescr }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">风险分级</view>
-              <view slot="value">{{ form.LEVEL }}</view>
+              <view slot="value">{{ form.level }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">检查内容</view>
-              <view slot="value">{{ form.CHECK_CONTENT }}</view>
+              <view slot="value">{{ form.checkContent }}</view>
             </u-cell>
           </template>
           <u-cell>
             <view slot="title" class="title">隐患级别</view>
-            <view slot="value">{{ form.editLevelName }}</view>
+            <view slot="value">{{ form.hiddenlevelName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患类型</view>
-            <view slot="value">{{ form.HIDDENTYPENAME }}</view>
+            <view slot="value">{{ form.hiddenTypeName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患状态</view>
             <view slot="value">
-              <template v-if="form.STATE=='1'">未整改</template>
-              <template v-else-if="form.STATE=='2'">已整改</template>
-              <template v-else-if="form.STATE=='3'">已整改</template>
-              <template v-else-if="form.STATE=='4'">已验收</template>
-              <template v-else-if="form.STATE=='5'">忽略隐患</template>
-              <template v-else-if="form.STATE=='6'">重大隐患</template>
-              <template v-else-if="form.STATE=='7'">待处理的特殊隐患</template>
-              <template v-else-if="form.STATE=='8'">已处理的特殊隐患</template>
-              <template v-else-if="form.STATE=='10'">验收打回</template>
-              <template v-else-if="form.STATE=='11'">待核实</template>
-              <template v-else-if="form.STATE=='12'">待核定</template>
-              <template v-else-if="form.STATE=='13'">较大隐患待整改</template>
-              <template v-else-if="form.STATE=='14'">较大隐患验收</template>
-              <template v-else-if="form.STATE=='15'">较大隐患已归档</template>
-              <template v-else-if="form.STATE=='-1'">已超期</template>
-              <template v-else-if="form.STATE=='-2'">待确认</template>
+              <template v-if="form.state === '1'">未整改</template>
+              <template v-else-if="form.state === '2'">已整改</template>
+              <template v-else-if="form.state === '3'">已整改</template>
+              <template v-else-if="form.state === '4'">已验收</template>
+              <template v-else-if="form.state === '5'">忽略隐患</template>
+              <template v-else-if="form.state === '6'">重大隐患</template>
+              <template v-else-if="form.state === '7'">待处理的特殊隐患</template>
+              <template v-else-if="form.state === '8'">已处理的特殊隐患</template>
+              <template v-else-if="form.state === '10'">验收打回</template>
+              <template v-else-if="form.state === '11'">待核实</template>
+              <template v-else-if="form.state === '12'">待核定</template>
+              <template v-else-if="form.state === '13'">较大隐患待整改</template>
+              <template v-else-if="form.state === '14'">较大隐患验收</template>
+              <template v-else-if="form.state === '15'">较大隐患已归档</template>
+              <template v-else-if="form.state === '-1'">已超期</template>
+              <template v-else-if="form.state === '-2'">待确认</template>
 
             </view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患部位</view>
-            <view slot="value">{{ form.hregionName ? form.hregionName : form.HIDDENPART }}</view>
+            <view slot="value">{{ form.hiddenpartStr || form.hiddenpart }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患上报位置</view>
             <view slot="label" class="mt-10">
-              <view>经度:{{ form.LONGITUDE }}</view>
-              <view>纬度:{{ form.LATITUDE }}</view>
+              <view>经度:{{ form.longitude }}</view>
+              <view>纬度:{{ form.latitude }}</view>
             </view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患位置描述</view>
-            <view slot="label" class="mt-10">{{ form.POSITIONDESC }}</view>
+            <view slot="label" class="mt-10">{{ form.positiondesc }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患图片</view>
@@ -112,38 +112,38 @@
           </u-modal>
           <u-cell v-for="(item,index) in hiddenFindPeople" :key="index">
             <view slot="title" class="title">隐患发现人</view>
-            <view slot="value">{{ item.NAME }}</view>
+            <view slot="value">{{ item.userName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患发现时间</view>
-            <view slot="value">{{ $u.timeFormat(form.DISCOVERYTIME, 'yyyy-mm-dd hh:MM:ss') }}</view>
+            <view slot="value">{{ $u.timeFormat(form.creattime, 'yyyy-mm-dd hh:MM:ss') }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">整改类型</view>
             <view slot="value">
-              <template v-if="form.RECTIFICATIONTYPE=='1'">立即整改</template>
-              <template v-else-if="form.RECTIFICATIONTYPE=='2'">限期整改</template>
+              <template v-if="form.rectificationtype === '1'">立即整改</template>
+              <template v-else-if="form.rectificationtype === '2'">限期整改</template>
             </view>
           </u-cell>
-          <u-cell v-if="form.RECTIFICATIONTYPE=='1'">
+          <u-cell v-if="form.rectificationtype === '1'">
             <view slot="title" class="title">整改描述</view>
-            <view slot="value">{{ form.RECTIFYDESCR }}</view>
+            <view slot="value">{{ form.rectifydescr }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">整改负责部门</view>
-            <view slot="value">{{ form.editDeptName || form.RECTIFICATIONDEPTNAME }}</view>
+            <view slot="value">{{ form.editDeptName || form.rectificationDeptName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">整改负责人</view>
-            <view slot="value">{{ form.editUserName || form.RECTIFICATIONORNAME }}</view>
+            <view slot="value">{{ form.editUserName || form.rectificationName }}</view>
           </u-cell>
-          <u-cell v-if="form.RECTIFICATIONTYPE=='2'">
+          <u-cell v-if="form.rectificationtype === '2'">
             <view slot="title" class="title">整改期限</view>
-            <view slot="value">{{ form.RECTIFICATIONDEADLINE }}</view>
+            <view slot="value">{{ form.rectificationdeadline }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">是否相关方</view>
-            <view slot="value">{{ form.ISRELEVANT == '1' ? '是' : '否' }}</view>
+            <view slot="value">{{ form.isrelevant === '1' ? '是' : '否' }}</view>
           </u-cell>
         </u-cell-group>
       </view>
@@ -152,19 +152,19 @@
 
     <view class="card" v-for="(item,index) in hiddenExamineList" :key="index">
       <view class="view-title">
-        <u--text text="确认信息" bold v-if="item.TYPE === 4"></u--text>
-        <u--text text="延期信息" bold v-else-if="item.TYPE === 2"></u--text>
-        <u--text text="特殊处理审核信息" bold v-else-if="item.TYPE === 1"></u--text>
+        <u--text text="确认信息" bold v-if="item.type === 4"></u--text>
+        <u--text text="延期信息" bold v-else-if="item.type === 2"></u--text>
+        <u--text text="特殊处理审核信息" bold v-else-if="item.type === 1"></u--text>
       </view>
       <view class="mt-10">
-        <u-cell-group :border="false" v-if="item.TYPE === 4">
+        <u-cell-group :border="false" v-if="item.type === 4">
           <u-cell>
             <view slot="title" class="title">隐患级别</view>
-            <view slot="value">{{ item.editLevelName }}</view>
+            <view slot="value">{{ item.hiddenlevelName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">整改负责人</view>
-            <view slot="value">{{ item.editUserName }}</view>
+            <view slot="value">{{ item.spare2Name }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">整改完成期限</view>
@@ -172,51 +172,51 @@
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患确认人</view>
-            <view slot="value">{{ form.conUserName }}</view>
+            <view slot="value">{{ form.confirmUserName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">隐患确认时间</view>
-            <view slot="value">{{ form.CONFIRM_TIME }}</view>
+            <view slot="value">{{ form.confirmTime }}</view>
           </u-cell>
         </u-cell-group>
       </view>
       <view class="mt-10">
-        <u-cell-group :border="false" v-if="item.TYPE === 2">
+        <u-cell-group :border="false" v-if="item.type === 2">
           <u-cell>
             <view slot="title" class="title">申请延期日期</view>
-            <view slot="value">{{ item.DELAY_TIME }}</view>
+            <view slot="value">{{ item.creattime }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">审核人</view>
-            <view slot="value">{{ pd.conUserName }}</view>
+            <view slot="value">{{ pd.confirmUserName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">处置方案</view>
-            <view slot="value">{{ item.DISPOSAL_PLAN }}</view>
+            <view slot="value">{{ item.disposalPlan }}</view>
           </u-cell>
-          <u-cell v-if="item.DISPOSAL_FILE">
+          <u-cell v-if="item.disposalFile">
             <view slot="title" class="title">方案附件</view>
             <view slot="value">
               <u-button type="primary" text="下载" size="mini"
-                        @click="downloadAppendix(item.DISPOSAL_FILE)"></u-button>
+                        @click="downloadAppendix(item.disposalFile)"></u-button>
             </view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">延期审核状态</view>
             <view slot="value">
-              <template v-if="item.STATE === -1">待审核</template>
-              <template v-else-if="item.STATE === 1">通过</template>
-              <template v-else-if="item.STATE === 2">未通过</template>
+              <template v-if="item.state === -1">待审核</template>
+              <template v-else-if="item.state === 1">通过</template>
+              <template v-else-if="item.state === 2">未通过</template>
             </view>
           </u-cell>
-          <u-cell v-if="item.STATE === 1">
+          <u-cell v-if="item.state === 1">
             <view slot="title" class="title">审核时间</view>
-            <view slot="value">{{ item.OPERATTIME }}</view>
+            <view slot="value">{{ item.operattime }}</view>
           </u-cell>
         </u-cell-group>
       </view>
       <view class="mt-10">
-        <u-cell-group :border="false" v-if="item.TYPE === 1">
+        <u-cell-group :border="false" v-if="item.type === 1">
           <u-cell>
             <view slot="title" class="title">无法整改原因</view>
             <view slot="value">{{ item.EXAMINE }}</view>
@@ -224,29 +224,29 @@
           <u-cell>
             <view slot="title" class="title">特殊处置审核状态</view>
             <view slot="value">
-              <template v-if="item.STATE === -1">待审核</template>
-              <template v-else-if="item.STATE === 2">通过</template>
-              <template v-else-if="item.STATE === 1">未通过</template>
+              <template v-if="item.state === -1">待审核</template>
+              <template v-else-if="item.state === 2">通过</template>
+              <template v-else-if="item.state === 1">未通过</template>
             </view>
           </u-cell>
-          <u-cell v-if="item.STATE===2">
+          <u-cell v-if="item.state===2">
             <view slot="title" class="title">处置方案</view>
-            <view slot="value">{{ item.DISPOSAL_PLAN }}</view>
+            <view slot="value">{{ item.disposalPlan }}</view>
           </u-cell>
-          <u-cell v-if="item.DISPOSAL_FILE">
+          <u-cell v-if="item.disposalFile">
             <view slot="title" class="title">处置方案附件</view>
             <view slot="value">
               <u-button type="primary" text="下载" size="mini"
-                        @click="downloadAppendix(item.DISPOSAL_FILE)"></u-button>
+                        @click="downloadAppendix(item.disposalFile)"></u-button>
             </view>
           </u-cell>
-          <u-cell v-if="item.STATE!==-1">
+          <u-cell v-if="item.state!==-1">
             <view slot="title" class="title">审核时间</view>
-            <view slot="value">{{ item.OPERATTIME }}</view>
+            <view slot="value">{{ item.operattime }}</view>
           </u-cell>
-          <u-cell v-if="item.STATE!==-1">
+          <u-cell v-if="item.state!==-1">
             <view slot="title" class="title">审核人</view>
-            <view slot="value">{{ pd.conUserName }}</view>
+            <view slot="value">{{ pd.confirmUserName }}</view>
           </u-cell>
           <u-cell v-if="item.TYPE ==='2'">
             <view slot="title" class="title">是否更换整改负责人</view>
@@ -257,14 +257,14 @@
           </u-cell>
           <u-cell v-if="item.spare1 === '1'">
             <view slot="title" class="title">整改负责人</view>
-            <view slot="value">{{ item.editUserName }}</view>
+            <view slot="value">{{ item.newRectificationor }}</view>
           </u-cell>
         </u-cell-group>
       </view>
     </view>
 
 
-    <view class="card" v-if="form.STATE ==2 || form.STATE ==4 || form.STATE == 10">
+    <view class="card" v-if="form.state === 2 || form.state === 4 || form.state === 10">
       <view class="view-title">
         <u--text text="整改信息" bold></u--text>
       </view>
@@ -272,23 +272,23 @@
         <u-cell-group :border="false">
           <u-cell>
             <view slot="title" class="title">整改描述</view>
-            <view slot="label" class="mt-10">{{ form.RECTIFYDESCR }}</view>
+            <view slot="label" class="mt-10">{{ form.rectifydescr }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">整改部门</view>
-            <view slot="value">{{ form.RECTIFICATIONDEPTNAME }}</view>
+            <view slot="value">{{ form.rectificationDeptName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">整改人</view>
-            <view slot="value">{{ form.RECTIFICATIONORNAME }}</view>
+            <view slot="value">{{ form.rectificationName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">整改时间</view>
-            <view slot="value">{{ form.RECTIFICATIONTIME }}</view>
+            <view slot="value">{{ form.rectificationtime }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">投入资金</view>
-            <view slot="value">{{ form.INVESTMENT_FUNDS }}元</view>
+            <view slot="value">{{ form.investmentFunds }}元</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">整改后图片：</view>
@@ -304,50 +304,50 @@
           <u-cell>
             <view slot="title" class="title">整改方案：</view>
             <view slot="value">
-              <template v-if="form.HAVESCHEME == 0">无</template>
-              <template v-else-if="form.HAVESCHEME == 1">有</template>
+              <template v-if="form.havescheme == 0">无</template>
+              <template v-else-if="form.havescheme == 1">有</template>
             </view>
           </u-cell>
-          <template v-if="hs && form.HAVESCHEME==1">
+          <template v-if="hs && form.havescheme==1">
             <u-cell>
               <view slot="title" class="title">排查日期</view>
-              <view slot="value">{{ hs.SCREENINGDATE }}</view>
+              <view slot="value">{{ hs.screeningdate }}</view>
             </u-cell>
-            <u-cell v-if="hs.LISTNAME">
+            <u-cell v-if="hs.listname">
               <view slot="title" class="title">隐患清单</view>
-              <view slot="value">{{ hs.LISTNAME }}</view>
+              <view slot="value">{{ hs.listname }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">治理标准要求</view>
-              <view slot="value">{{ hs.GOVERNSTANDARDS }}</view>
+              <view slot="value">{{ hs.governstandards }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">治理方法</view>
-              <view slot="value">{{ hs.GOVERNMETHOD }}</view>
+              <view slot="value">{{ hs.governmethod }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">经费和物资的落实</view>
-              <view slot="value">{{ hs.EXPENDITURE }}</view>
+              <view slot="value">{{ hs.expenditure }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">负责治理人员</view>
-              <view slot="value">{{ hs.PRINCIPAL }}</view>
+              <view slot="value">{{ hs.principal }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">工时安排</view>
-              <view slot="value">{{ hs.PROGRAMMING }}</view>
+              <view slot="value">{{ hs.programming }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">时限要求</view>
-              <view slot="value">{{ hs.TIMELIMITFOR }}</view>
+              <view slot="value">{{ hs.timelimitfor }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">工作要求</view>
-              <view slot="value">{{ hs.JOBREQUIREMENT }}</view>
+              <view slot="value">{{ hs.jobrequirement }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">其他事项</view>
-              <view slot="value">{{ hs.OTHERBUSINESS }}</view>
+              <view slot="value">{{ hs.otherbusiness }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">方案图片：</view>
@@ -366,35 +366,35 @@
     </view>
 
 
-    <view class="card" v-if="form.STATE ==4">
+    <view class="card" v-if="form.state === 4">
       <view class="view-title">
         <u--text text="验收信息" bold></u--text>
       </view>
-      <template v-if="form.RECTIFICATIONTYPE!='1'">
+      <template v-if="form.rectificationtype !== '1'">
         <view class="mt-10">
           <u-cell-group :border="false" v-for="(item,index) in checkList" :key="index">
             <u-cell>
               <view slot="title" class="title">验收描述</view>
-              <view slot="label" class="mt-10">{{ item.CHECKDESCR }}</view>
+              <view slot="label" class="mt-10">{{ item.checkdescr }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">是否合格</view>
               <view slot="value">
-                <template v-if="item.STATUS == '1'">是</template>
-                <template v-else-if="item.STATUS == '0'">否</template>
+                <template v-if="item.status === '1'">是</template>
+                <template v-else-if="item.status === '0'">否</template>
               </view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">验收部门</view>
-              <view slot="value">{{ item.CHECKDEPTNAME }}</view>
+              <view slot="value">{{ item.departmentName }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">验收人</view>
-              <view slot="value">{{ item.CHECKORNAME }}</view>
+              <view slot="value">{{ item.userName }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">验收时间</view>
-              <view slot="value">{{ item.CHECK_TIME }}</view>
+              <view slot="value">{{ item.checkTime }}</view>
             </u-cell>
             <u-cell>
               <view slot="title" class="title">验收图片：</view>
@@ -410,7 +410,7 @@
           </u-cell-group>
         </view>
       </template>
-      <template v-if="form.RECTIFICATIONTYPE=='1'">
+      <template v-if="form.rectificationtype === '1'">
         <view class="mt-10">
           <u-cell-group :border="false">
             <u-cell>
@@ -425,12 +425,12 @@
 </template>
 
 <script>
-import {getHiddenGoEdit} from "../../../api";
+import {getHiddenGoEdit} from "@/api";
 
 export default {
   data() {
     return {
-      HIDDEN_ID: '',
+      hiddenId: '',
       form: {},
       hImgs: [],
       rImgs: [],
@@ -445,43 +445,30 @@ export default {
     }
   },
   onLoad(event) {
-    this.HIDDEN_ID = event.HIDDEN_ID;
+    this.hiddenId = event.hiddenId;
     this.getData()
   },
   methods: {
     async getData() {
-      let resData = await getHiddenGoEdit({HIDDEN_ID: this.HIDDEN_ID});
-      this.form = resData.pd;
-      this.hs = resData.hs;
-      this.checkList = resData.checkList;
-      this.hiddenFindPeople = resData.hiddenFindPeople;
-      this.hiddenExamineList = resData.hiddenExa
-      for (let i = 0; i < resData.hImgs.length; i++) {
-        this.hImgs.push(this.$store.state.filePath + resData.hImgs[i].FILEPATH)
-      }
-      for (let i = 0; i < resData.rImgs.length; i++) {
-        this.rImgs.push(this.$store.state.filePath + resData.rImgs[i].FILEPATH)
-      }
-      for (let i = 0; i < resData.sImgs.length; i++) {
-        this.sImgs.push(this.$store.state.filePath + resData.sImgs[i].FILEPATH)
-      }
-      for (let i = 0; i < resData.cImgs && resData.cImgs.length; i++) {
-        this.cImgs.push(this.$store.state.filePath + resData.cImgs[i].FILEPATH)
-      }
-      for (let i = 0; i < resData.checkList.length; i++) {
-        for (let j = 0; j < resData.checkList[i].cImgs.length; j++) {
-          this.cImgs.push(this.$store.state.filePath + resData.checkList[i].cImgs[j].FILEPATH)
-        }
-      }
-      if (resData.hiddenVideo.length > 0) this.videoUrl = this.$store.state.filePath + resData.hiddenVideo[0].FILEPATH
-      resData.hiddenExa && resData.hiddenExa.forEach(item => {
-        if (item.TYPE == 0) {
-          this.form.oldUserName = item.editUserName
-          this.form.oldDeptName = item.editDeptName
-          this.form.oldLevelName = item.editLevelName
-          this.form.oldRectificationDeadline = item.spare3
-        }
-      })
+      let resData = await getHiddenGoEdit({id: this.hiddenId});
+      this.form = resData.data;
+      this.hs = resData.data?.discoverPeople;
+      this.checkList = resData.data?.rectifyPeople;
+      this.hiddenFindPeople = resData.data?.acceptor;
+      this.hiddenExamineList = resData.data?.examines;
+      this.hImgs = this.findAPicture(resData.data?.files, 3);
+      this.rImgs = this.findAPicture(resData.data?.files, 4);
+      this.sImgs = this.findAPicture(resData.data?.files, 8);
+      this.cImgs = this.findAPicture(resData.data?.files, 5);
+      if (resData.hiddenVideo.length > 0) this.videoUrl = this.findAPicture(resData.data?.files, 102)?.[0]
+      // resData.data?.examines && resData.hiddenExa.forEach(item => {
+      //   if (item.type === 0) {
+      //     this.form.oldUserName = item.editUserName
+      //     this.form.oldDeptName = item.editDeptName
+      //     this.form.oldLevelName = item.editLevelName
+      //     this.form.oldRectificationDeadline = item.spare3
+      //   }
+      // })
     },
     previewImage(list, current) {
       uni.previewImage({
@@ -499,6 +486,15 @@ export default {
         },
       });
     },
+    findAPicture(files, type) {
+      const result = [];
+      files?.forEach((item) => {
+        if (item?.type === type) {
+          result.push(this.$store.state.filePath + item.filepath);
+        }
+      });
+      return result.length > 0 ? result : null;
+    }
   },
 }
 </script>
diff --git a/pages/general-hidden-management/general-hidden/list.vue b/pages/general-hidden-management/general-hidden/list.vue
index 5b34a59..b451179 100644
--- a/pages/general-hidden-management/general-hidden/list.vue
+++ b/pages/general-hidden-management/general-hidden/list.vue
@@ -5,7 +5,7 @@
           prefixIcon="search"
           placeholder="请输入关键字"
           border="surround"
-          v-model="KEYWORDS"
+          v-model="companyName"
           clearable
           shape="circle"
       ></u--input>
@@ -18,21 +18,21 @@
       <u-list-item v-for="(item, index) in list" :key="index">
         <view>
           <view class="flex-between main-title">
-            <text>{{ item.CORP_NAME }}</text>
+            <text>{{ item.companyName }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
             <text>
               属地：
-              <template v-if="item.CITY_NAME">{{ item.CITY_NAME }}</template>
-              <template v-if="item.COUNTRY_NAME"> --{{ item.COUNTRY_NAME }}</template>
+              <template v-if="item.companyCity">{{ item.companyCity }}</template>
+              <template v-if="item.companyArea"> --{{ item.companyArea }}</template>
             </text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>轻微隐患：{{item.xwCount}}</text>
-            <text>一般隐患：{{item.qwCount}}</text>
+            <text>轻微隐患：{{item.minorHiddenCount}}</text>
+            <text>一般隐患：{{item.generalHiddenCount}}</text>
           </view>
           <view class="flex-end mt-10 see_btn">
-            <u-button type="primary" text="查看" size="mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
+            <u-button type="primary" text="查看" size="mini" @click="fnNavigatorDetail(item.companyId)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -42,14 +42,14 @@
 </template>
 
 <script>
-import {getGeneralCountByCorpInfo} from "../../../api";
+import {getGeneralCountByCorpInfo} from "@/api";
 
 export default {
   data() {
     return {
-      KEYWORDS: '',
-      pageSize: 10,
-      currentPage: 1,
+      companyName: '',
+      limit: 10,
+      curPage: 1,
       totalPage: 0,
       list: [],
     }
@@ -59,31 +59,31 @@ export default {
   },
   methods:{
     async getData(){
-      let resData = await getGeneralCountByCorpInfo({
-        KEYWORDS: this.KEYWORDS,
-        showCount: this.pageSize,
-        currentPage: this.currentPage,
+      let { page } = await getGeneralCountByCorpInfo({
+        companyName: this.companyName,
+        limit: this.limit,
+        curPage: this.curPage,
       });
-      this.list = [...this.list,...resData.varList];
-      this.totalPage = resData.page.totalPage;
+      this.list = [ ...this.list, ...page.list ];
+      this.totalPage = page.totalPage;
     },
     resetList() {
-      this.pageSize= 10
-      this.currentPage= 1
+      this.limit= 10
+      this.curPage= 1
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(CORPINFO_ID){
+    fnNavigatorDetail(companyId){
       uni.$u.route({
         url: '/pages/general-hidden-management/general-hidden/detail-list',
         params: {
-          CORPINFO_ID,
+          companyId,
         }
       })
     },
     scrolltolower() {
-      this.currentPage++;
-      if(this.totalPage >= this.currentPage) this.getData();
+      this.curPage++;
+      if(this.totalPage >= this.curPage) this.getData();
     },
   }
 }
diff --git a/pages/general-hidden-management/ignore-hidden/detail-list.vue b/pages/general-hidden-management/ignore-hidden/detail-list.vue
index 3dd3076..6e2ec87 100644
--- a/pages/general-hidden-management/ignore-hidden/detail-list.vue
+++ b/pages/general-hidden-management/ignore-hidden/detail-list.vue
@@ -6,7 +6,7 @@
           prefixIcon="search"
           placeholder="请输入关键字"
           border="surround"
-          v-model="keyword"
+          v-model="hiddendescr"
           clearable
           shape="circle"
       ></u--input>
@@ -20,7 +20,7 @@
         <view class="pl-10 pr-10">
           <u--form labelPosition="left">
             <u-form-item label="隐患发现开始时间" borderBottom>
-              <u--text :text="DISCOVERYTIME_START || '请选择'"
+              <u--text :text="start || '请选择'"
                        @click="startDataShow = true"></u--text>
               <u-datetime-picker :show="startDataShow"
                                  mode="datetime"
@@ -29,7 +29,7 @@
                                  @confirm="startDataConfirm"></u-datetime-picker>
             </u-form-item>
             <u-form-item label="隐患发现结束时间" borderBottom>
-              <u--text :text="DISCOVERYTIME_END || '请选择'"
+              <u--text :text="end || '请选择'"
                        @click="endDataShow = true"></u--text>
               <u-datetime-picker :show="endDataShow"
                                  mode="datetime"
@@ -42,7 +42,7 @@
                   inputAlign="right"
                   placeholder="请输入发现人"
                   border="none"
-                  v-model="HIDDENFIND_NAME"
+                  v-model="creatorName"
                   clearable
               ></u--input>
             </u-form-item>
@@ -51,17 +51,17 @@
                   inputAlign="right"
                   placeholder="请输入确认人"
                   border="none"
-                  v-model="CONFIRM_USER"
+                  v-model="keyConfirmUser"
                   clearable
               ></u--input>
             </u-form-item>
             <u-form-item label="发现人部门" borderBottom>
-              <u--text :text="DEPT_NAME || '请选择'" @click="showTree('tkitree')"></u--text>
+              <u--text :text="departmentName || '请选择'" @click="showTree('tkitree')"></u--text>
               <tki-tree ref="tkitree" :range="deptRange" rangeKey="name" selectParent
                         @confirm="confirmTree($event,'dept')"/>
             </u-form-item>
             <u-form-item label="隐患类型" borderBottom>
-              <u--text :text="HAZARD_TYPE_NAME || '请选择'" @click="showTree('tkitree1')"></u--text>
+              <u--text :text="hiddenTypeName || '请选择'" @click="showTree('tkitree1')"></u--text>
               <tki-tree ref="tkitree1" :range="HazardTypeRange" rangeKey="name" selectParent children-name="nodes"
                         @confirm="confirmTree($event,'type')"/>
             </u-form-item>
@@ -81,30 +81,29 @@
       <u-list-item v-for="(item, index) in list" :key="index">
         <view>
           <view class="flex-between main-title">
-            <text>{{ item.HIDDENDESCR }}</text>
-            <u-tag :text="item.NAME" type="warning"></u-tag>
+            <text>{{ item.hiddendescr }}</text>
+            <u-tag :text="item.hiddenlevelName" type="warning"></u-tag>
           </view>
           <view class="flex-between mt-10 subtitle">
             <text>
               来源：
-              <template v-if="item.SOURCE == 1">隐患快报</template>
-              <template v-if="item.SOURCE == 2 || item.SOURCE == 3">清单排查</template>
-              <template v-if="item.SOURCE == 4">安全环保检查(监管端)</template>
-              <template v-if="item.SOURCE == 5">安全环保检查(企业端)</template>
-              <template v-if="item.SOURCE == 6">消防检查</template>
+              <template v-if="item.source === 1">隐患快报</template>
+              <template v-if="item.source === 2 || item.source === 3">清单排查</template>
+              <template v-if="item.source === 4">安全环保检查(监管端)</template>
+              <template v-if="item.source === 5">安全环保检查(企业端)</template>
+              <template v-if="item.source === 6">消防检查</template>
             </text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>隐患发现人：{{ item.findUserNames }}</text>
-            <text>隐患发现时间：{{ item.DISCOVERYTIME }}</text>
+            <text>隐患发现人：{{ item.hiddenDiscoverer }}</text>
+            <text>隐患发现时间：{{ item.discoverytime }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>隐患确认人：{{ item.CONFIRM_USER }}</text>
-
+            <text>隐患确认人：{{ item.confirmUserName }}</text>
           </view>
           <view class="see_btn">
             <u-button type="primary" text="查看" size="mini"
-                      @click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button>
+                      @click="fnNavigatorDetail(item.hiddenId)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -115,7 +114,7 @@
 </template>
 
 <script>
-import {getDept, getHiddenType, getIgnoreHiddenList, getCorpinfoDeptListTree} from "../../../api";
+import {getCorpinfoDeptListTree, getHiddenType, getIgnoreHiddenList} from "@/api";
 import tkiTree from "@/components/tki-tree/tki-tree.vue"
 import FabButton from "@/components/fab_button/index.vue";
 
@@ -123,36 +122,36 @@ export default {
   components: {FabButton, tkiTree},
   data() {
     return {
-      keyword: '',
+      hiddendescr: '',
       pageSize: 10,
       currentPage: 1,
       totalPage: 0,
       list: [],
-      CORPINFO_ID: '',
+      companyId: '',
       popupShow: false,
       startDataShow: false,
       endDataShow: false,
       deptRange: [],
       HazardTypeRange: [],
-      DEPT: '',
-      DEPT_NAME: '',
-      DISCOVERYTIME_START: '',
-      DISCOVERYTIME_END: '',
-      HIDDENFIND_NAME: '',
-      CONFIRM_USER: '',
-      HAZARD_TYPE: '',
-      HAZARD_TYPE_NAME: '',
+      keyFindUserDept: '',
+      departmentName: '',
+      start: '',
+      keyConfirmUser: '',
+      creatorName: '',
+      end: '',
+      hiddenType: '',
+      hiddenTypeName: '',
     }
   },
   onLoad(event) {
-    this.CORPINFO_ID = event.CORPINFO_ID;
+    this.companyId = event.companyId;
     this.resetList()
     this.fnGetDept()
     this.fnGetHiddenType()
   },
   methods: {
     async fnGetDept() {
-      let resData = await getCorpinfoDeptListTree({'CORPINFO_ID': this.CORPINFO_ID});
+      let resData = await getCorpinfoDeptListTree({'CORPINFO_ID': this.companyId});
       this.deptRange = JSON.parse(resData.zTreeNodes)
     },
     async fnGetHiddenType() {
@@ -161,20 +160,19 @@ export default {
     },
     async getData() {
       this.popupShow = false
-      let resData = await getIgnoreHiddenList({
-        CORPINFO_ID: this.CORPINFO_ID,
-        DEPTNAME: this.DEPT,
-        'DISCOVERYTIME[0]': this.DISCOVERYTIME_START,
-        'DISCOVERYTIME[1]': this.DISCOVERYTIME_END,
-        HIDDENFIND_NAME: this.HIDDENFIND_NAME,
-        confirmUserName: this.CONFIRM_USER,
-        keyHiddenType: this.HAZARD_TYPE,
-        KEYWORDS: this.keyword,
+      let { varList, page } = await getIgnoreHiddenList({
+        companyId: this.companyId,
+        keyFindUserDept: this.keyFindUserDept,
+        dates: this.start != null && this.start !== '' && this.end != null && this.end !== '' ? [this.start, this.end] : null,
+        keyConfirmUser: this.keyConfirmUser,
+        creatorName: this.creatorName,
+        keyHiddenType: this.hiddenType != null && this.hiddenType !== '' ? [this.hiddenType] : null,
+        hiddendescr: this.hiddendescr,
         showCount: this.pageSize,
         currentPage: this.currentPage,
       });
-      this.list = [...this.list, ...resData.varList];
-      this.totalPage = resData.page.totalPage;
+      this.list = [...this.list, ...varList];
+      this.totalPage = page.totalPage;
     },
     resetList() {
       this.pageSize = 10
@@ -182,11 +180,11 @@ export default {
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(HIDDEN_ID) {
+    fnNavigatorDetail(hiddenId) {
       uni.$u.route({
         url: '/pages/general-hidden-management/ignore-hidden/detail',
         params: {
-          HIDDEN_ID,
+          hiddenId,
         }
       })
     },
@@ -199,32 +197,32 @@ export default {
     },
     confirmTree(e, type) {
       if (type === 'dept') {
-        this.DEPT = e[0].id
-        this.DEPT_NAME = e[0].name
+        this.keyFindUserDept = e[0].id
+        this.departmentName = e[0].name
       } else if (type === 'type') {
-        this.HAZARD_TYPE = e[0].id
-        this.HAZARD_TYPE_NAME = e[0].name
+        this.hiddenType = e[0].id
+        this.hiddenTypeName = e[0].name
       }
     },
     startDataConfirm(e) {
-      this.DISCOVERYTIME_START = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
+      this.start = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
       this.startDataShow = false
     },
     endDataConfirm(e) {
-      this.DISCOVERYTIME_END = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
+      this.end = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
       this.endDataShow = false
     },
     reset() {
       this.popupShow = false
       this.keyword = ''
-      this.DISCOVERYTIME_START = ''
-      this.DISCOVERYTIME_END = ''
-      this.HIDDENFIND_NAME = ''
-      this.CONFIRM_USER = ''
-      this.DEPT = ''
-      this.DEPT_NAME = ''
-      this.HAZARD_TYPE = ''
-      this.HAZARD_TYPE_NAME = ''
+      this.keyConfirmUser = ''
+      this.creatorName = ''
+      this.start = ''
+      this.end = ''
+      this.keyFindUserDept = ''
+      this.departmentName = ''
+      this.hiddenType = ''
+      this.hiddenTypeName = ''
       this.resetList()
     }
   }
diff --git a/pages/general-hidden-management/ignore-hidden/detail.vue b/pages/general-hidden-management/ignore-hidden/detail.vue
index ddf1b61..80a4f29 100644
--- a/pages/general-hidden-management/ignore-hidden/detail.vue
+++ b/pages/general-hidden-management/ignore-hidden/detail.vue
@@ -8,77 +8,77 @@
         <u-cell>
           <view slot="title" class="title">隐患来源</view>
           <view slot="value">
-            <template v-if="form.SOURCE=='1'">
+            <template v-if="form.source === '1'">
               隐患快报
             </template>
-            <template v-else-if="form.SOURCE=='2'">
+            <template v-else-if="form.source === '2'">
               清单排查
             </template>
-            <template v-else-if="form.SOURCE=='3'">
+            <template v-else-if="form.source === '3'">
               清单排查
             </template>
-            <template v-else-if="form.SOURCE=='4'">
+            <template v-else-if="form.source === '4'">
               安全环保检查(监管端)
             </template>
-            <template v-else-if="form.SOURCE=='5'">
+            <template v-else-if="form.source === '5'">
               安全环保检查(企业端)
             </template>
-            <template v-else-if="form.SOURCE=='6'">
+            <template v-else-if="form.source === '6'">
               消防检查
             </template>
-            <template v-else-if="form.SOURCE=='8'">
+            <template v-else-if="form.source === '8'">
               点检隐患
             </template>
           </view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">隐患描述</view>
-          <view slot="label" class="mt-10 u-line-5">{{ form.HIDDENDESCR }}</view>
+          <view slot="label" class="mt-10 u-line-5">{{ form.hiddendescr }}</view>
         </u-cell>
-        <template v-if="form.SOURCE=='2'">
+        <template v-if="form.source === '2'">
           <u-cell>
             <view slot="title" class="title">风险点（单元）</view>
-            <view slot="value">{{ form.RISK_UNIT }}</view>
+            <view slot="value">{{ form.riskUnit }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">辨识部位</view>
-            <view slot="value">{{ form.IDENTIFICATION }}</view>
+            <view slot="value">{{ form.identification }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">存在风险</view>
-            <view slot="value">{{ form.RISK_DESCR }}</view>
+            <view slot="value">{{ form.riskDescr }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">风险分级</view>
-            <view slot="value">{{ form.LEVEL }}</view>
+            <view slot="value">{{ form.level }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">检查内容</view>
-            <view slot="value">{{ form.CHECK_CONTENT }}</view>
+            <view slot="value">{{ form.checkContent }}</view>
           </u-cell>
         </template>
         <u-cell>
           <view slot="title" class="title">隐患级别</view>
-          <view slot="value">{{ form.editLevelName || form.HIDDENLEVELNAME }}</view>
+          <view slot="value">{{ form.hiddenlevelName }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">隐患类型</view>
-          <view slot="value">{{ form.HIDDENTYPENAME }}</view>
+          <view slot="value">{{ form.hiddenTypeName }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">隐患部位</view>
-          <view slot="value">{{ form.hregionName?form.hregionName:form.HIDDENPART }}</view>
+          <view slot="value">{{ form.hiddenpartStr ? form.hiddenpartStr : form.hiddenpart }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">隐患上报位置</view>
           <view slot="label" class="mt-10">
-            <view>经度:{{ form.LONGITUDE }}</view>
-            <view>纬度:{{ form.LATITUDE }}</view>
+            <view>经度:{{ form.longitude }}</view>
+            <view>纬度:{{ form.latitude }}</view>
           </view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">隐患位置描述</view>
-          <view slot="label" class="mt-10">{{ form.POSITIONDESC }}</view>
+          <view slot="label" class="mt-10">{{ form.positiondesc }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">隐患图片</view>
@@ -102,25 +102,25 @@
             <video v-if="modalShow" :src="videoUrl" :autoplay="true"></video>
           </view>
         </u-modal>
-        <u-cell v-for="(item,index) in hiddenFindPeople" :key="index">
+        <u-cell v-for="(item,index) in acceptor" :key="index">
           <view slot="title" class="title">隐患发现人</view>
-          <view slot="value">{{ item.NAME }}</view>
+          <view slot="value">{{ item.userName }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">隐患发现时间</view>
-          <view slot="value">{{ form.DISCOVERYTIME }}</view>
+          <view slot="value">{{ form.discoverytime }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">整改负责人</view>
-          <view slot="value">{{ form.oldUserName || form.RECTIFICATIONORNAME }}</view>
+          <view slot="value">{{ form.rectificationName }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">整改完成期限</view>
-          <view slot="value">{{ form.oldRectificationDeadline || form.RECTIFICATIONDEADLINE }}</view>
+          <view slot="value">{{ form.rectificationdeadline }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">是否相关方</view>
-          <view slot="value">{{ form.ISRELEVANT == '1' ? '是' : '否' }}</view>
+          <view slot="value">{{ form.isrelevant === '1' ? '是' : '否' }}</view>
         </u-cell>
       </u-cell-group>
     </view>
@@ -131,23 +131,23 @@
       <u-cell-group :border="false">
         <u-cell>
           <view slot="title" class="title">隐患级别</view>
-          <view slot="value">{{form.HIDDENLEVELNAME}}</view>
+          <view slot="value">{{ form.hiddenlevelName }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">整改负责人</view>
-          <view slot="value">{{form.RECTIFICATIONORNAME}}</view>
+          <view slot="value">{{ form.rectificationName }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">整改完成期限</view>
-          <view slot="value">{{form.RECTIFICATIONDEADLINE}}</view>
+          <view slot="value">{{ form.rectificationdeadline }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">隐患确认人</view>
-          <view slot="value">{{form.conUserName}}</view>
+          <view slot="value">{{ form.confirmUserName }}</view>
         </u-cell>
         <u-cell v-if="form.STATE != '-2'">
           <view slot="title" class="title">隐患确认时间</view>
-          <view slot="value">{{form.CONFIRM_TIME}}</view>
+          <view slot="value">{{ form.confirmTime }}</view>
         </u-cell>
       </u-cell-group>
     </view>
@@ -155,40 +155,30 @@
 </template>
 
 <script>
-import {getHiddenGoEdit} from "../../../api";
+import {getHiddenGoEdit} from "@/api";
 
 export default {
   data() {
     return {
-      HIDDEN_ID: '',
+      hiddenId: '',
       form: {},
       hImgs: [],
       videoUrl: '',
       modalShow: false,
-      hiddenFindPeople: [],
+      acceptor: [],
     }
   },
   onLoad(event) {
-    this.HIDDEN_ID = event.HIDDEN_ID;
+    this.hiddenId = event.hiddenId;
     this.getData()
   },
   methods: {
     async getData() {
-      let resData = await getHiddenGoEdit({HIDDEN_ID: this.HIDDEN_ID});
-      this.form = resData.pd;
-      this.hiddenFindPeople = resData.hiddenFindPeople;
-      for (let i = 0; i < resData.hImgs.length; i++) {
-        this.hImgs.push(this.$store.state.filePath + resData.hImgs[i].FILEPATH)
-      }
-      if (resData.hiddenVideo.length > 0) this.videoUrl = this.$store.state.filePath + resData.hiddenVideo[0].FILEPATH
-      resData.hiddenExa && resData.hiddenExa.forEach(item => {
-        if (item.TYPE == 4) {
-          this.form.oldUserName = item.editUserName
-          this.form.oldDeptName = item.editDeptName
-          this.form.oldLevelName = item.editLevelName
-          this.form.oldRectificationDeadline = item.spare3
-        }
-      })
+      let { data } = await getHiddenGoEdit({id: this.hiddenId});
+      this.form = data;
+      this.acceptor = data.acceptor;
+      this.hImgs = this.findAPicture(data?.files, 3);
+      this.videoUrl = this.findAPicture(data?.files, 3)?.[0];
     },
     previewImage(list, current) {
       uni.previewImage({
@@ -196,6 +186,15 @@ export default {
         current
       });
     },
+    findAPicture(files, type) {
+      const result = [];
+      files?.forEach((item) => {
+        if (item?.type === type) {
+          result.push(this.$store.state.filePath + item.filepath);
+        }
+      });
+      return result.length > 0 ? result : null;
+    }
   },
 }
 </script>
diff --git a/pages/general-hidden-management/ignore-hidden/list.vue b/pages/general-hidden-management/ignore-hidden/list.vue
index 9e7ce2c..6f69e52 100644
--- a/pages/general-hidden-management/ignore-hidden/list.vue
+++ b/pages/general-hidden-management/ignore-hidden/list.vue
@@ -5,7 +5,7 @@
           prefixIcon="search"
           placeholder="请输入关键字"
           border="surround"
-          v-model="KEYWORDS"
+          v-model="companyName"
           clearable
           shape="circle"
       ></u--input>
@@ -18,25 +18,25 @@
       <u-list-item v-for="(item, index) in list" :key="index">
         <view>
           <view class="flex-between main-title">
-            <text>{{ item.CORP_NAME }}</text>
+            <text>{{ item.companyName }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
             <text>
               属地：
-              <template v-if="item.CITY_NAME">{{ item.CITY_NAME }}</template>
-              <template v-if="item.COUNTRY_NAME"> --{{ item.COUNTRY_NAME }}</template>
+              <template v-if="item.companyCity">{{ item.companyCity }}</template>
+              <template v-if="item.companyArea"> --{{ item.companyArea }}</template>
             </text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>主要负责人：{{item.LR_NAME}}</text>
-            <text>电话：{{item.LR_MOBILE}}</text>
+            <text>主要负责人：{{item.contacts}}</text>
+            <text>电话：{{item.contactsPhone}}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>忽略隐患数：{{item.hlCount}}</text>
+            <text>忽略隐患数：{{item.ignoreHiddenCount}}</text>
 
           </view>
           <view class="see_btn">
-            <u-button type="primary" text="查看" size="mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
+            <u-button type="primary" text="查看" size="mini" @click="fnNavigatorDetail(item.companyId)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -46,14 +46,14 @@
 </template>
 
 <script>
-import {getIgnoreCountByCorpInfo} from "../../../api";
+import { getIgnoreCountByCorpInfo } from "@/api";
 
 export default {
   data() {
     return {
-      KEYWORDS: '',
-      pageSize: 10,
-      currentPage: 1,
+      companyName: '',
+      limit: 10,
+      curPage: 1,
       totalPage: 0,
       list: [],
     }
@@ -68,32 +68,31 @@ export default {
   },
   methods:{
     async getData(){
-      let resData = await getIgnoreCountByCorpInfo({
-        CORPINFO_ID: this.userInfo.CORPINFO_ID,
-        KEYWORDS: this.KEYWORDS,
-        showCount: this.pageSize,
-        currentPage: this.currentPage,
+      let { page } = await getIgnoreCountByCorpInfo({
+        companyName: this.companyName,
+        limit: this.limit,
+        curPage: this.curPage,
       });
-      this.list = [...this.list,...resData.varList];
-      this.totalPage = resData.page.totalPage;
+      this.list = [ ...this.list, ...page.list];
+      this.totalPage = page.totalPage;
     },
     resetList() {
-      this.pageSize= 10
-      this.currentPage= 1
+      this.limit= 10
+      this.curPage= 1
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(CORPINFO_ID){
+    fnNavigatorDetail(companyId){
       uni.$u.route({
         url: '/pages/general-hidden-management/ignore-hidden/detail-list',
         params: {
-          CORPINFO_ID,
+          companyId,
         }
       })
     },
     scrolltolower() {
-      this.currentPage++;
-      if(this.totalPage >= this.currentPage) this.getData();
+      this.curPage++;
+      if(this.totalPage >= this.curPage) this.getData();
     },
   }
 }
diff --git a/pages/mine/promise/promise.vue b/pages/mine/promise/promise.vue
index e01cdfc..63125c6 100644
--- a/pages/mine/promise/promise.vue
+++ b/pages/mine/promise/promise.vue
@@ -56,8 +56,8 @@
 		</u-popup>
     <view class="message_list">
       <u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
-        <u-list-item v-for="(item, index) in list" :key="index">
-          <view class="message_item arrow" @click="fnNavigator(item)">
+        <u-list-item v-for="item in list" :key="item.PROMISEPEOPLE_ID">
+          <view class="message_item" @click="fnNavigator(item)">
             <view class="message_flex">
               <view>
                 <template v-if="item.corppromisType ==='1'"> <!-- 0承诺书1责任状 -->
@@ -68,12 +68,11 @@
                   <view class="fontstyle">被承诺人：{{ item.coverpeople }}</view>
                   <view class="fontstyle">承诺人：{{ item.NAME }}</view>
                 </template>
-
                 <view v-if="item.SIGNTIME != null" class="fontstyle">已签字</view>
                 <view v-else class="fontstyle_red">未签字</view>
                 <view class="message_time">{{ item.SIGNTIME }}</view>
               </view>
-              <view class="font0" v-if="TYPE === '2'">{{ item.ISREAD == '0' ? '待阅' : '已阅' }}</view>
+              <view class="font0" v-if="TYPE === '2'">{{ item.ISREAD === '0' ? '待阅' : '已阅' }}</view>
             </view>
           </view>
         </u-list-item>
@@ -122,8 +121,8 @@ export default {
         USER_ID: this.userInfo.USER_ID,
         showCount: this.pageSize,
         currentPage: this.currentPage,
-		ADDSTART: this.addTimeStartStr,
-		ADDEND: this.addTimeEndStr
+		    ADDSTART: this.addTimeStartStr,
+		    ADDEND: this.addTimeEndStr
       })
       this.list = [...this.list, ...resData.varList]
       this.totalPage = resData.page.totalPage
@@ -133,8 +132,8 @@ export default {
         USER_ID: this.userInfo.USER_ID,
         showCount: this.pageSize,
         currentPage: this.currentPage,
-		ADDSTART: this.addTimeStartStr,
-		ADDEND: this.addTimeEndStr
+		    ADDSTART: this.addTimeStartStr,
+		    ADDEND: this.addTimeEndStr
       })
       this.list = [...this.list, ...resData.varList]
     },
@@ -233,7 +232,7 @@ export default {
 			this.$refs.uToast.show({message:'日期不合法',duration:1000})
 			return
 		}
-		if (this.addTimeEndStr != '' && this.addTimeStartStr == ''){
+		if (this.addTimeEndStr !== '' && this.addTimeStartStr === ''){
 			// 结束时间有值，开始时间为空
 			this.$refs.uToast.show({message:'日期不合法',duration:1000})
 			return
diff --git a/pages/mine/promise/sign.vue b/pages/mine/promise/sign.vue
index 898eca1..f2f2cec 100644
--- a/pages/mine/promise/sign.vue
+++ b/pages/mine/promise/sign.vue
@@ -26,7 +26,7 @@
       <view class="footer">
         <!--        <view v-if="info.TYPE === '0'" class="hairdresser">承诺单位(盖章)：</view>-->
         <view v-if="info.TYPE === '1'" class="hairdresser">
-          <view class="promiser">发状人：{{ info.COVERPEOPLE }}</view>
+          <view class="promiser">发状人：{{ info.COVERPEOPLE }} {{ info.NICKNAME }}</view>
           <!--          <view class="time">{{ info.CREATTIME.substring(0,10) }}</view>-->
         </view>
         <view class="respondent">
diff --git a/pages/risk-level-control/risk-four-color-map/list.vue b/pages/risk-level-control/risk-four-color-map/list.vue
index d9d67ac..97456da 100644
--- a/pages/risk-level-control/risk-four-color-map/list.vue
+++ b/pages/risk-level-control/risk-four-color-map/list.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import {getCorpInfoRiskStatistics} from "../../../api";
+import { getCorpInfoRiskStatistics1 } from "../../../api";
 
 export default {
   data() {
@@ -77,7 +77,7 @@ export default {
   },
   methods:{
     async getData(){
-      let resData = await getCorpInfoRiskStatistics({
+      let resData = await getCorpInfoRiskStatistics1({
         USER_ID: this.userInfo.USER_ID,
         KEYWORDS: this.KEYWORDS,
         showCount: this.pageSize,
diff --git a/pages/risk-level-control/risk-management/detail-list.vue b/pages/risk-level-control/risk-management/detail-list.vue
index e8519bf..52fbd7f 100644
--- a/pages/risk-level-control/risk-management/detail-list.vue
+++ b/pages/risk-level-control/risk-management/detail-list.vue
@@ -5,7 +5,7 @@
           prefixIcon="search"
           placeholder="请输入关键字"
           border="surround"
-          v-model="keyword"
+          v-model="keyWords"
           clearable
           shape="circle"
       ></u--input>
@@ -23,8 +23,8 @@
               <tki-tree ref="tkitree" :range="deptRange" rangeKey="name" selectParent @confirm="confirmTree"/>
             </u-form-item>
             <u-form-item label="风险点（单元）" borderBottom>
-              <u--text :text="RISK_UNIT_NAME || '请选择'" @click="riskUnitShow = true"></u--text>
-              <u-picker :show="riskUnitShow" :columns="riskPointList" keyName="RISKUNITNAME"
+              <u--text :text="riskUnitName || '请选择'" @click="riskUnitShow = true"></u--text>
+              <u-picker :show="riskUnitShow" :columns="riskPointList" keyName="riskUnitName"
                         @cancel="riskUnitShow = false"
                         @confirm="pickerConfirm($event,'riskUnit')"></u-picker>
             </u-form-item>
@@ -50,22 +50,21 @@
       <u-list-item v-for="(item, index) in list" :key="index">
         <view>
           <view class="flex-between main-title">
-            <text>部位名称：{{ item.PARTSNAME }}</text>
-            <u-tag v-if="item.LEVELID=='levelD'" text="低风险/D级"></u-tag>
-            <u-tag v-if="item.LEVELID=='levelB'" text="较大风险/B级" type="warning"></u-tag>
-            <u-tag v-if="item.LEVELID=='levelC'" text="一般风险/C级" bgColor="#eeca51" borderColor="#eeca51"></u-tag>
-            <u-tag v-if="item.LEVELID=='levelA'" text="重大风险/A级" type="error"></u-tag>
+            <text>部位名称：{{ item.identificationpartsName }}</text>
+            <u-tag v-if="item.level ==='levelD'" text="低风险/D级"></u-tag>
+            <u-tag v-if="item.level ==='levelB'" text="较大风险/B级" type="warning"></u-tag>
+            <u-tag v-if="item.level ==='levelC'" text="一般风险/C级" bgColor="#eeca51" borderColor="#eeca51"></u-tag>
+            <u-tag v-if="item.level ==='levelA'" text="重大风险/A级" type="error"></u-tag>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>风险（点）单元：{{ item.RISKUNITNAME }}</text>
+            <text>风险（点）单元：{{ item.riskUnitName }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>管控部门：{{ item.DEPT_NAME }}</text>
-
+            <text>管控部门：{{ item.departmentName }}</text>
           </view>
           <view class="see_btn">
             <u-button type="primary" text="查看" size="mini"
-                      @click="fnNavigatorDetail(item.RISKPOINT_ID,item.DEPARTMENT_ID)"></u-button>
+                      @click="fnNavigatorDetail(item.id)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -77,10 +76,9 @@
 
 <script>
 import {
-  getRiskUnitList,
   getRiskUnitCustomizedList,
-  getInspectedDepartment
-} from "../../../api";
+  getInspectedDepartment, getRiskUnitList
+} from "@/api";
 import tkiTree from "@/components/tki-tree/tki-tree.vue"
 import FabButton from "@/components/fab_button/index.vue";
 
@@ -88,12 +86,12 @@ export default {
   components: {FabButton, tkiTree},
   data() {
     return {
-      keyword: '',
+      keyWords: '',
       pageSize: 10,
       currentPage: 1,
       totalPage: 0,
       list: [],
-      CORPINFO_ID: '',
+      companyId: '',
       popupShow: false,
       riskUnitShow: false,
       levelShow: false,
@@ -107,41 +105,42 @@ export default {
           {BIANMA: 'levelD', NAME: '低风险'},
         ]
       ],
-      DEPT: '',
+      departmentId: '',
       DEPT_NAME: '',
-      RISK_UNIT_NAME: '',
-      LEVEL_ID: '',
+      riskUnitName: '',
+      riskUnitId: '',
+      level: '',
       LEVEL_NAME: '',
     }
   },
   onLoad(event) {
-    this.CORPINFO_ID = event.CORPINFO_ID;
+    this.companyId = event.companyId;
     this.resetList()
     this.fnGetDept()
     this.fnGetRiskUnitList()
   },
   methods: {
     async fnGetDept() {
-      let resData = await getInspectedDepartment({'CORPINFO_ID': this.CORPINFO_ID});
+      let resData = await getInspectedDepartment({'CORPINFO_ID': this.companyId});
       this.deptRange = JSON.parse(resData.zTreeNodes)
     },
     async fnGetRiskUnitList() {
-      let resData = await getRiskUnitList({CORPINFO_ID: this.CORPINFO_ID});
-      this.$set(this.riskPointList, 0, resData.varList)
+      let { data } = await getRiskUnitList({ corpinfoId: this.companyId });
+      this.$set(this.riskPointList, 0, data)
     },
     async getData() {
       this.popupShow = false
-      let resData = await getRiskUnitCustomizedList({
-        CORPINFO_ID: this.CORPINFO_ID,
-        DEPARTMENT_ID: this.DEPT,
-        RISKUNITNAME: this.RISK_UNIT_NAME,
-        LEVELID: this.LEVEL_ID,
-        KEYWORDS: this.keyword,
+      let { varList, page } = await getRiskUnitCustomizedList({
+        corpinfoId: this.companyId,
+        departmentId: this.departmentId,
+        riskUnitId: this.riskUnitId,
+        level: this.level,
+        keyWords: this.keyWords,
         showCount: this.pageSize,
         currentPage: this.currentPage,
       });
-      this.list = [...this.list, ...resData.varList];
-      this.totalPage = resData.page.totalPage;
+      this.list = [...this.list, ...varList];
+      this.totalPage = page.totalPage;
     },
     resetList() {
       this.pageSize = 10
@@ -149,13 +148,12 @@ export default {
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(RISKPOINT_ID, DEPARTMENT_ID) {
+    fnNavigatorDetail(id) {
       uni.$u.route({
         url: '/pages/risk-level-control/risk-management/detail',
         params: {
-          RISKPOINT_ID,
-          DEPARTMENT_ID,
-          CORPINFO_ID: this.CORPINFO_ID,
+          id,
+          companyId: this.companyId,
         }
       })
     },
@@ -167,16 +165,17 @@ export default {
       this.$refs.tkitree._show()
     },
     confirmTree(e) {
-      this.DEPT = e[0].id
+      this.departmentId = e[0].id
       this.DEPT_NAME = e[0].name
     },
     pickerConfirm(e, type) {
       if (type === 'riskUnit') {
-        this.RISK_UNIT_NAME = e.value[0].RISKUNITNAME
+        this.riskUnitName = e.value[0].riskUnitName
+        this.riskUnitId = e.value[0].id
         this.riskUnitShow = false;
       }
       if (type === 'level') {
-        this.LEVEL_ID = e.value[0].BIANMA
+        this.level = e.value[0].BIANMA
         this.LEVEL_NAME = e.value[0].NAME
         this.levelShow = false;
       }
@@ -186,9 +185,9 @@ export default {
       this.DEPT = ''
       this.DEPT_NAME = ''
       this.RISK_UNIT_NAME = ''
-      this.LEVEL_ID = ''
+      this.level = ''
       this.LEVEL_NAME = ''
-      this.keyword = ''
+      this.keyWords = ''
       this.resetList()
     }
   }
diff --git a/pages/risk-level-control/risk-management/detail.vue b/pages/risk-level-control/risk-management/detail.vue
index 1c6b714..baabecd 100644
--- a/pages/risk-level-control/risk-management/detail.vue
+++ b/pages/risk-level-control/risk-management/detail.vue
@@ -5,46 +5,45 @@
         <u-cell-group :border="false">
           <u-cell>
             <view slot="title" class="title">风险点名称：</view>
-            <view slot="value">{{ form.RISKUNITNAME }}</view>
+            <view slot="value">{{ form.riskUnitName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">辨识部位名称：</view>
-            <view slot="value">{{ form.PARTSNAME }}</view>
+            <view slot="value">{{ form.identificationpartsName }}</view>
           </u-cell>
-
           <view class="mt-10 flex">
             <view class="title1">存在风险</view>
-            <view class="main">{{ form.RISK_DESCR }}</view>
+            <view class="main">{{ form.riskDesc }}</view>
           </view>
           <view class="mt-10 flex">
             <view class="title1">主要管控措施</view>
-            <view class="main">{{ form.MEASURES }}</view>
+            <view class="main">{{ form.measures }}</view>
           </view>
 
           <u-cell>
             <view slot="title" class="title">管控部门</view>
-            <view slot="value">{{ form.DEPT_NAME }}</view>
+            <view slot="value">{{ form.departmentName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">事故类型</view>
-            <view slot="value">{{ form.ACCIDENTS_NAME }}</view>
+            <view slot="value">{{ form.accidentsName }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">风险等级</view>
             <view slot="value">
-              <u-tag v-if="form.LEVELID=='levelD'" text="低风险/D级"></u-tag>
-              <u-tag v-if="form.LEVELID=='levelB'" text="较大风险/B级" type="warning"></u-tag>
-              <u-tag v-if="form.LEVELID=='levelC'" text="一般风险/C级" bgColor="#eeca51" borderColor="#eeca51"></u-tag>
-              <u-tag v-if="form.LEVELID=='levelA'" text="重大风险/A级" type="error"></u-tag>
+              <u-tag v-if="form.level ==='levelD'" text="低风险/D级"></u-tag>
+              <u-tag v-if="form.level ==='levelB'" text="较大风险/B级" type="warning"></u-tag>
+              <u-tag v-if="form.level ==='levelC'" text="一般风险/C级" bgColor="#eeca51" borderColor="#eeca51"></u-tag>
+              <u-tag v-if="form.level ==='levelA'" text="重大风险/A级" type="error"></u-tag>
             </view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">经度</view>
-            <view slot="value">{{ form.PARTSNAME_LONGITUDE }}</view>
+            <view slot="value">{{ form.longitude }}</view>
           </u-cell>
           <u-cell>
             <view slot="title" class="title">纬度</view>
-            <view slot="value">{{ form.PARTSNAME_LATITUDE }}</view>
+            <view slot="value">{{ form.latitude }}</view>
           </u-cell>
         </u-cell-group>
       </view>
@@ -53,31 +52,25 @@
 </template>
 
 <script>
-import {getRiskUnitCustomizedList} from "../../../api";
+import { getRiskPostInfo } from "@/api";
 
 export default {
   data() {
     return {
-      RISKPOINT_ID: '',
-      CORPINFO_ID: '',
-      DEPARTMENT_ID: '',
+      id: '',
+      companyId: '',
       form: {}
     }
   },
   onLoad(event) {
-    this.RISKPOINT_ID = event.RISKPOINT_ID;
-    this.CORPINFO_ID = event.CORPINFO_ID;
-    this.DEPARTMENT_ID = event.DEPARTMENT_ID;
+    this.id = event.id;
+    this.companyId = event.companyId;
     this.getData();
   },
   methods: {
     async getData() {
-      let resData = await getRiskUnitCustomizedList({
-        RISKPOINT_ID: this.RISKPOINT_ID,
-        CORPINFO_ID: this.CORPINFO_ID,
-        DEPARTMENT_ID: this.DEPARTMENT_ID
-      });
-      this.form = resData.varList[0];
+      let { data } = await getRiskPostInfo({ id: this.id });
+      this.form = data;
     }
   }
 }
diff --git a/pages/risk-level-control/risk-management/list.vue b/pages/risk-level-control/risk-management/list.vue
index 688008e..d10b420 100644
--- a/pages/risk-level-control/risk-management/list.vue
+++ b/pages/risk-level-control/risk-management/list.vue
@@ -5,7 +5,7 @@
           prefixIcon="search"
           placeholder="请输入关键字"
           border="surround"
-          v-model="keyword"
+          v-model="companyName"
           clearable
           shape="circle"
       ></u--input>
@@ -18,25 +18,25 @@
       <u-list-item v-for="(item, index) in list" :key="index">
         <view>
           <view class="flex-between main-title">
-            <text>{{ item.CORP_NAME }}</text>
+            <text>{{ item.companyName }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
             <text>
               属地：
-              <template v-if="item.CITY_NAME">{{ item.CITY_NAME }}</template>
-              <template v-if="item.COUNTRY_NAME"> -- {{ item.COUNTRY_NAME }}</template>
+              <template v-if="item.companyCity">{{ item.companyCity }}</template>
+              <template v-if="item.companyArea"> -- {{ item.companyArea }}</template>
             </text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>风险（点）单元：{{ item.unitCount }}</text>
+            <text>风险（点）单元：{{ item.riskUnitNum }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>辨识部位：{{ item.idCount }}</text>
-            <text>存在风险：{{ item.pointCount }}</text>
+            <text>辨识部位：{{ item.identificationNum }}</text>
+            <text>存在风险：{{ item.riskNum }}</text>
           </view>
           <view class="flex-end mt-10 see_btn">
             <u-button type="primary" text="查看" size="mini"
-                      @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
+                      @click="fnNavigatorDetail(item.companyId)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -46,12 +46,12 @@
 </template>
 
 <script>
-import {getCorpInfoRiskStatistics} from "../../../api";
+import { getCorpInfoRiskStatistics } from "@/api";
 
 export default {
   data() {
     return {
-      keyword: '',
+      companyName: '',
       pageSize: 10,
       currentPage: 1,
       totalPage: 0,
@@ -63,13 +63,13 @@ export default {
   },
   methods: {
     async getData() {
-      let resData = await getCorpInfoRiskStatistics({
-        KEYWORDS: this.keyword,
+      let { page } = await getCorpInfoRiskStatistics({
+        companyName: this.companyName,
         showCount: this.pageSize,
         currentPage: this.currentPage,
       });
-      this.list = [...this.list, ...resData.varList];
-      this.totalPage = resData.page.totalPage;
+      this.list = [...this.list, ...page.list];
+      this.totalPage = page.totalCount;
     },
     resetList() {
       this.pageSize = 10
@@ -77,11 +77,11 @@ export default {
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(CORPINFO_ID) {
+    fnNavigatorDetail(companyId) {
       uni.$u.route({
         url: '/pages/risk-level-control/risk-management/detail-list',
         params: {
-          CORPINFO_ID,
+          companyId: companyId,
         }
       })
     },