diff --git a/api/enterprise/index.js b/api/enterprise/index.js index 66915c6..3815201 100644 --- a/api/enterprise/index.js +++ b/api/enterprise/index.js @@ -44,4 +44,25 @@ export function checkEnterprise(id) { url: `/system/enterprise/audit?id=${id}`, method: 'PUT', }) +} + +/** + * 获取企业执法记录 + */ +export function getTaskList(params) { + return request({ + url: `/system/task-info/appPageByEnterpriseId`, + method: 'GET', + params + }) +} + +/** + * 获取企业执法日志 + */ +export function getTaskLog(id) { + return request({ + url: `/system/inspections-log/appList?inspectionsId=${id}`, + method: 'GET', + }) } \ No newline at end of file diff --git a/components/cs-echart/index.vue b/components/cs-echart/index.vue deleted file mode 100644 index 5cfeac2..0000000 --- a/components/cs-echart/index.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/package.json b/package.json deleted file mode 100644 index 9bb28a9..0000000 --- a/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "crypto-js": "^4.0.0" - }, - "devDependencies": { - "sass": "^1.83.4", - "sass-loader": "^16.0.4" - } -} diff --git a/pages.json b/pages.json index 0ee071b..381d294 100644 --- a/pages.json +++ b/pages.json @@ -3,9 +3,15 @@ "path": "pages/index", "style": { "navigationBarTitleText": "首页", - "navigationStyle": "custom" + "navigationStyle": "custom", + "usingComponents": { + "van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index", + "van-dropdown-item": "/wxcomponents/vant/dropdown-item/index", + "ec-canvas": "/wxcomponents/ec-canvas/ec-canvas" + } } - }, { + }, + { "path": "pages/login", "style": { "navigationBarTitleText": "登录", @@ -83,7 +89,7 @@ }, { "path": "enterprise/detail", "style": { - "navigationBarTitleText": "企业详情", + "navigationBarTitleText": "档案详情", "componentPlaceholder": { "u-modal": "view" } @@ -146,6 +152,22 @@ "style": { "navigationBarTitleText": "结果反馈" } + }, + { + "path": "inspection/detail", + "style": { + "navigationBarTitleText": "", + "onReachBottonDistance": 50, + "enablePullDownRefresh": true + } + }, + { + "path": "inspection/record", + "style": { + "navigationBarTitleText": "", + "onReachBottonDistance": 50, + "enablePullDownRefresh": true + } } ] }], diff --git a/pages/enterprise.vue b/pages/enterprise.vue index 8ec0002..7bb877d 100644 --- a/pages/enterprise.vue +++ b/pages/enterprise.vue @@ -105,7 +105,7 @@ 待审核 diff --git a/pages/index.vue b/pages/index.vue index 170a1d2..3d4b1d4 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,16 +1,133 @@ - + diff --git a/pages/owner.vue b/pages/owner.vue index 39adfa7..6618a76 100644 --- a/pages/owner.vue +++ b/pages/owner.vue @@ -1,11 +1,23 @@