diff --git a/App.vue b/App.vue
index 42b2761..b99c9a4 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,7 @@
+
+
diff --git a/components/cs-dict-tag/index.vue b/components/cs-dict-tag/index.vue
index b71c487..2af5687 100644
--- a/components/cs-dict-tag/index.vue
+++ b/components/cs-dict-tag/index.vue
@@ -1,5 +1,7 @@
- {{ current.label }}
+
+ {{ current.label }}
+
-
\ No newline at end of file
+
diff --git a/sub/enterprise/detail.vue b/sub/enterprise/detail.vue
index 899a133..cfbdbf6 100644
--- a/sub/enterprise/detail.vue
+++ b/sub/enterprise/detail.vue
@@ -1,7 +1,11 @@
-
+
@@ -11,32 +15,62 @@
- {{ detail.enterprisesName }}
-
-
+
+ {{ detail.enterprisesName }}
+
+
+
+
+
{{ detail.address }}
-
+
环保负责人
- {{ detail.enterprisesName }}
+
+ {{ detail.enterprisesName }}
+
联系方式
- {{ detail.environmentalContactPhone }}
+
+ {{ detail.environmentalContactPhone }}
+
-
+
{{ detail.introduction }}
-
+
-
-
+
+
资质名称
- {{ $dict.echoDicValue(dictMap.enterprise_qua, prove.qualificationName.toString()) }}
+ {{
+ $dict.echoDicValue(
+ dictMap.enterprise_qua,
+ prove.qualificationName.toString()
+ )
+ }}
@@ -91,7 +125,9 @@ export default {
* 获取字典
*/
async getDict() {
- const dict = await getDictBatchByType({ type: ['enterprises_type', 'enterprise_qua'].join(',') })
+ const dict = await getDictBatchByType({
+ type: ['enterprises_type', 'enterprise_qua'].join(',')
+ })
this.dictMap = {
...dict.data
}
@@ -122,7 +158,7 @@ export default {
.detail {
display: flex;
flex-flow: column nowrap;
- gap: 16px;
+ gap: 12px;
.address {
display: flex;
flex-flow: row nowrap;
@@ -136,6 +172,8 @@ export default {
flex-flow: row nowrap;
gap: 12px;
.image {
+ width: 96px;
+ height: 96px;
border-radius: $cs-border-radius;
}
}
diff --git a/sub/task/detail.vue b/sub/task/detail.vue
index 2767c5e..a3d86ab 100644
--- a/sub/task/detail.vue
+++ b/sub/task/detail.vue
@@ -95,6 +95,16 @@
}
"
/>
+
+
\ No newline at end of file
diff --git a/sub/task/locate.vue b/sub/task/locate.vue
new file mode 100644
index 0000000..666e550
--- /dev/null
+++ b/sub/task/locate.vue
@@ -0,0 +1,464 @@
+
+
+
+
+
+
+
+
+ 执法协同人员请
+ 扫描二维码签到
+
+ (要求2人以上)
+
+
+
+ 无法正常签到？
+
+
+
+
+
+
+
+ 暂无处理结果
+
+
+
+
+
+
+
+
+ {{ item.realName }}
+
+ {{ item.deptName }}
+
+
+
+ {{ $util.formatDate(item.time, 'YYYY年M月D日 hh:mm') }}
+
+
+
+
+
+ 已签到
+
+
+
+
+
+
+
+ 不在签到范围
+
+
+
+
+
+
+
+
+
+ 开启手机设置GPS定位功能
+
+
+
+ 开启手机授权微信定位功能
+
+
+
+ 开启右上角小程序定位功能
+
+
+
+
+
+ 确认
+
+
+
+
+
+
+
+ 开启定位
+
+
+
+
+
+
+
+
diff --git a/sub/task/record.vue b/sub/task/record.vue
index 395dbee..171e0c8 100644
--- a/sub/task/record.vue
+++ b/sub/task/record.vue
@@ -19,12 +19,12 @@
>
-
+
{{
`${$util.formatDate(
detail.startDate,
'YYYY/M/D'
- )}~${$util.formatDate(detail.endDate, 'YYYY/M/D')}`
+ )} 至 ${$util.formatDate(detail.endDate, 'YYYY/M/D')}`
}}
@@ -73,7 +73,10 @@
{{ detail.enterprise.enterprisesName }}
-
+
{{ detail.enterprise.address }}
@@ -97,6 +100,24 @@
>
+
+
+ 结果反馈
+
+
+ 暂无处理结果
+
+
+
+
+
+ 执法签到
+
+
@@ -104,6 +125,7 @@
import { getDeptTree, getDictBatchByType } from '@/api/system/dict.js'
import { TaskApi } from '@/api/task/index.js'
import { getEnterPrise } from '@/api/enterprise/index.js'
+import { InspectionsApi } from '../../api/inspections'
export default {
data() {
return {
@@ -117,15 +139,11 @@ export default {
isShowAllText: false,
// 查询条件
queryParams: {
- dept: '',
- Inspections_status: '',
- pageSize: 8,
- pageNo: 1,
taskId: '',
- recordId: ''
+ recordId: '',
+ enterpriseId: ''
},
- list: [],
- load: 'loadmore'
+ list: []
}
},
onLoad(res) {
@@ -141,7 +159,7 @@ export default {
*/
async getDict() {
const dict = await getDictBatchByType({
- type: ['task_state', 'Inspections_status'].join(',')
+ type: ['Inspections_status'].join(',')
})
const dept = await getDeptTree()
this.dictMap = {
@@ -156,31 +174,30 @@ export default {
...res.data,
enterprise: enterprise.data
}
- uni.getLocation({
- success: res => {
- console.log(res)
- }
+ const feedBack = await InspectionsApi.getFeedBack(
+ this.queryParams.recordId
+ )
+ this.list = feedBack.data.list
+ },
+
+ goEnterprise(enterprise) {
+ uni.navigateTo({
+ url: `/sub/enterprise/detail?id=${enterprise.id}`
})
- // this.getList()
},
- async getList() {
- uni.showToast({
- title: '加载中',
- mask: true,
- icon: 'loading'
+ viewPosition(enterprise) {
+ const position = enterprise.gpsLocation
+ .split(',')
+ .map(i => Number(i))
+ this.$util.viewPosition({
+ lat: position[0],
+ lng: position[1],
+ name: enterprise.address
})
- this.load = 'loading'
- // const { data } = await InspectionsApi.getList(this.queryParams)
- this.list.push(...data.list)
- this.load = 'loadmore'
- if (this.list.length == data.total) {
- this.load = 'nomore'
- }
- uni.hideToast()
},
- goEnterprise(enterprise) {
+ locate() {
uni.navigateTo({
- url: `/sub/enterprise/detail?id=${enterprise.id}`
+ url: `/sub/task/locate?inspectionsId=${this.queryParams.recordId}&enterpriseId=${this.queryParams.enterpriseId}`
})
}
}
@@ -189,7 +206,12 @@ export default {
diff --git a/uni_modules/s-components/s-header/index.vue b/uni_modules/s-components/s-header/index.vue
index ee0a9cb..5abb1f9 100644
--- a/uni_modules/s-components/s-header/index.vue
+++ b/uni_modules/s-components/s-header/index.vue
@@ -6,12 +6,25 @@
-
-
+
+
{{ title }}
-
+
@@ -54,7 +67,7 @@ export default {
height: 6vh;
}
.operation {
- padding: 10px;
+ padding: 12px 4px;
.title {
color: #000;
font-size: 16px;
diff --git a/utils/constant.js b/utils/constant.js
index f9f9a56..1d24a7c 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -4,7 +4,8 @@ const constant = {
roles: 'vuex_roles',
permissions: 'vuex_permissions',
userId: 'vuex_userId',
- phone: 'vuex_phone'
+ phone: 'vuex_phone',
+ deptId: 'vuex_deptId'
}
export default constant
\ No newline at end of file
diff --git a/utils/getCode.js b/utils/getCode.js
new file mode 100644
index 0000000..3cc22b1
--- /dev/null
+++ b/utils/getCode.js
@@ -0,0 +1,44 @@
+let AccessToken
+
+function getAccessToken() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wx6d80755768234f3b&secret=c8180f2ab1b8454d403c7aa336782e21',
+ method: "GET",
+ success(res) {
+ resolve(res.data.access_token)
+ },
+ fail(err) {
+ console.error(err)
+ resolve(false)
+ }
+ })
+ })
+}
+
+
+function getCode(data, token) {
+ return new Promise((resolve) => {
+ uni.request({
+ url: `https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=${token}`,
+ method: "POST",
+ responseType: "arraybuffer",
+ data: JSON.stringify(data),
+ success(res) {
+ resolve(res)
+ },
+ fail(err) {
+ console.error(err)
+ resolve(false)
+ }
+ })
+ })
+}
+
+export async function getMiniCode(data) {
+ const token = await getAccessToken()
+ const code = await getCode(data, token)
+ const arrayBuffer = new Uint8Array(code.data)
+ const base64 = wx.arrayBufferToBase64(arrayBuffer)
+ return `data:image/jpeg;base64,${base64}`
+}
\ No newline at end of file
diff --git a/utils/ruoyi.js b/utils/ruoyi.js
index 28b53be..3d0895a 100644
--- a/utils/ruoyi.js
+++ b/utils/ruoyi.js
@@ -70,4 +70,24 @@ export function formatDate(date, format = 'YYYY-MM-DD HH:mm:ss') {
format = 'YYYY-MM-DD HH:mm:ss';
}
return dayjs(date).format(format);
+}
+
+/**
+ * 查看位置
+ * @param {number} lat 经度
+ * @param {number} lng 纬度
+ * @param {string} name 地址名称
+ */
+export function viewPosition({
+ lat,
+ lng,
+ name = ''
+}) {
+ uni.openLocation({
+ latitude: lat,
+ longitude: lng,
+ address: lat,
+ lng,
+ name
+ })
}
\ No newline at end of file
diff --git a/utils/storage.js b/utils/storage.js
index 4d0108b..ccf5c74 100644
--- a/utils/storage.js
+++ b/utils/storage.js
@@ -5,7 +5,7 @@ let storageKey = 'storage_data'
// 存储节点变量名
let storageNodeKeys = [constant.avatar, constant.roles, constant.permissions, constant.userId, constant
- .name, constant.phone
+ .name, constant.phone, constant.deptId
]
// 存储的数据