diff --git a/api/index.js b/api/index.js
index 7184f52..7e3dfb6 100644
--- a/api/index.js
+++ b/api/index.js
@@ -64,12 +64,12 @@ export const getRiskUnitCustomizedList = (params) => post("/risk/point/app/page"
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 getSpecialCountByCorpInfo = (params) => post("/hidden/statistics/special/handling/page", params) //获取特殊隐患列表
+export const getSpecialHiddenList = (params) => post("/hidden/query/exa/page/app", params) //获取特殊隐患列表
export const getRiskFourColorMapList = (params) => post("/app/riskwarning/list", params) //获取风险四色图列表
-export const getMajorCountByCorpInfo = (params) => post("/app/corpinfo/corpinfoList", params) //获取重大/较大隐患公司列表
-export const getMajorHiddenList = (params) => post("/app/hidden/majorhiddenList", params) //获取重大/较大隐患列表
-export const getMoreHiddenList = (params) => post("/app/hidden/morehiddenList", params) //较大隐患列表
+export const getMajorCountByCorpInfo = (params) => post("/hidden/statistics/major/page", params) //获取重大隐患公司列表
+export const getLargerCountByCorpInfo = (params) => post("/hidden/statistics/larger/page", params) //获取较大隐患公司列表
+export const getMajorHiddenList = (params) => post("/hidden/query/major/info/page", params) //获取重大/较大隐患列表//较大隐患列表
export const getVersion = (params) => post("/versionmanager/reg/getVersion", params) //版本更新
export const setFeedbackUpload = (params) => upload("/app/feedback/upload", params) //反馈问题附件
export const setFeedbackAdd = (params) => post("/app/feedback/add", params) //反馈问题提交
diff --git a/pages/general-hidden-management/general-hidden/detail-list.vue b/pages/general-hidden-management/general-hidden/detail-list.vue
index 9f19ee6..c558607 100644
--- a/pages/general-hidden-management/general-hidden/detail-list.vue
+++ b/pages/general-hidden-management/general-hidden/detail-list.vue
@@ -123,8 +123,8 @@ export default {
data() {
return {
hiddendescr: '',
- pageSize: 10,
- currentPage: 1,
+ limit: 10,
+ curPage: 1,
totalPage: 0,
list: [{}],
companyId: '',
@@ -172,7 +172,7 @@ export default {
},
async getData() {
this.popupShow = false
- let { varList, page } = await getGeneralHiddenList({
+ let { 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,
@@ -180,16 +180,16 @@ export default {
state: this.state,
hiddenlevel: this.hiddenlevel,
hiddendescr: this.hiddendescr,
- showCount: this.pageSize,
- currentPage: this.currentPage,
+ limit: this.limit,
+ curPage: this.curPage,
hiddenVueType: "regulatory"
});
- this.list = [ ...this.list, ...varList ];
+ 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()
},
@@ -202,8 +202,8 @@ export default {
})
},
scrolltolower() {
- this.currentPage++;
- if (this.totalPage >= this.currentPage) this.getData();
+ this.curPage++;
+ if (this.totalPage >= this.curPage) this.getData();
},
startDataConfirm(e) {
this.startData = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
diff --git a/pages/general-hidden-management/general-hidden/detail.vue b/pages/general-hidden-management/general-hidden/detail.vue
index fcf5846..942d7b7 100644
--- a/pages/general-hidden-management/general-hidden/detail.vue
+++ b/pages/general-hidden-management/general-hidden/detail.vue
@@ -304,11 +304,11 @@
整改方案:
- 无
- 有
+ 无
+ 有
-
+
排查日期
{{ hs.screeningdate }}
diff --git a/pages/general-hidden-management/special-hidden/detail-list.vue b/pages/general-hidden-management/special-hidden/detail-list.vue
index 9f155b0..1491b60 100644
--- a/pages/general-hidden-management/special-hidden/detail-list.vue
+++ b/pages/general-hidden-management/special-hidden/detail-list.vue
@@ -6,7 +6,7 @@
prefixIcon="search"
placeholder="请输入关键字"
border="surround"
- v-model="keyword"
+ v-model="hiddendescr"
clearable
shape="circle"
>
@@ -20,7 +20,7 @@
-
-
@@ -51,18 +51,18 @@
inputAlign="right"
placeholder="请输入确认人"
border="none"
- v-model="CONFIRMOR"
+ v-model="keyConfirmUser"
clearable
>
-
+
-
+
@@ -82,30 +82,23 @@
- {{ item.HIDDENDESCR }}
-
+ {{ item.hiddendescr }}
+
-
- 来源:
- 隐患快报
- 清单排查
- 安全环保检查(监管端)
- 安全环保检查(企业端)
- 消防检查
-
+ 来源:{{ item.source }}
- 隐患发现人:{{ item.findUserNames }}
- 隐患发现时间:{{ item.DISCOVERYTIME }}
+ 隐患发现人:{{ item.hiddenDiscoverer }}
+ 隐患发现时间:{{ item.discoverytime }}
- 隐患确认人:{{ item.CONFIRM_USER }}
+ 隐患确认人:{{ item.confirmUserName }}
+ @click="fnNavigatorDetail(item.hiddenId)">
@@ -116,83 +109,71 @@
diff --git a/pages/general-hidden-management/special-hidden/list.vue b/pages/general-hidden-management/special-hidden/list.vue
index a541f3a..c2872f9 100644
--- a/pages/general-hidden-management/special-hidden/list.vue
+++ b/pages/general-hidden-management/special-hidden/list.vue
@@ -5,7 +5,7 @@
prefixIcon="search"
placeholder="请输入关键字"
border="surround"
- v-model="KEYWORDS"
+ v-model="companyName"
clearable
shape="circle"
>
@@ -18,21 +18,21 @@
- {{ item.CORP_NAME }}
+ {{ item.companyName }}
属地:
- {{ item.CITY_NAME }}
- --{{ item.COUNTRY_NAME }}
+ {{ item.companyCity }}
+ --{{ item.companyArea }}
- 特殊处置隐患数:{{ item.qwCount + item.xwCount }}
+ 特殊处置隐患数:{{ item.minorHiddenCount + item.generalHiddenCount }}
-
+
@@ -42,14 +42,14 @@
diff --git a/pages/larger-major-hidden-management/larger-hidden-management/list.vue b/pages/larger-major-hidden-management/larger-hidden-management/list.vue
index ccda679..b8d17e7 100644
--- a/pages/larger-major-hidden-management/larger-hidden-management/list.vue
+++ b/pages/larger-major-hidden-management/larger-hidden-management/list.vue
@@ -5,7 +5,7 @@
prefixIcon="search"
placeholder="请输入关键字"
border="surround"
- v-model="KEYWORDS"
+ v-model="companyName"
clearable
shape="circle"
>
@@ -18,21 +18,21 @@
- {{ item.CORP_NAME }}
+ {{ item.companyName }}
属地:
- {{ item.CITY_NAME }}
- --{{ item.COUNTRY_NAME }}
+ {{ item.companyCity }}
+ --{{ item.companyArea }}
- 较大隐患数:{{item.jdCount}}
+ 较大隐患数:{{item.majorHiddenNum}}
-
+
@@ -42,14 +42,14 @@
diff --git a/pages/larger-major-hidden-management/major-hidden-management/list.vue b/pages/larger-major-hidden-management/major-hidden-management/list.vue
index 71a0c1e..4480706 100644
--- a/pages/larger-major-hidden-management/major-hidden-management/list.vue
+++ b/pages/larger-major-hidden-management/major-hidden-management/list.vue
@@ -5,7 +5,7 @@
prefixIcon="search"
placeholder="请输入关键字"
border="surround"
- v-model="KEYWORDS"
+ v-model="companyName"
clearable
shape="circle"
>
@@ -18,21 +18,21 @@
- {{ item.CORP_NAME }}
+ {{ item.companyName }}
属地:
- {{ item.CITY_NAME }}
- --{{ item.COUNTRY_NAME }}
+ {{ item.companyCity }}
+ --{{ item.companyArea }}
- 重大隐患数:{{item.zdCount}}
+ 重大隐患数:{{item.majorHiddenNum}}
-
+
@@ -42,14 +42,14 @@