diff --git a/api/enterprise/index.js b/api/enterprise/index.js index d7bb773..66915c6 100644 --- a/api/enterprise/index.js +++ b/api/enterprise/index.js @@ -33,4 +33,15 @@ export function getEnterPrise(id) { url: `/system/enterprise/get?id=${id}`, method: 'GET', }) +} + +/** + * 审核企业 + * @param {Object} id + */ +export function checkEnterprise(id) { + return request({ + url: `/system/enterprise/audit?id=${id}`, + method: 'PUT', + }) } \ No newline at end of file diff --git a/api/inspections/index.js b/api/inspections/index.js index 5139de7..5648bba 100644 --- a/api/inspections/index.js +++ b/api/inspections/index.js @@ -12,15 +12,7 @@ export const InspectionsApi = { params }) }, - /** - * 获取详情 - */ - getDetail: (id) => { - return request({ - url: `/system/enterprise-inspections/appGet?id=${id}`, - method: 'GET', - }) - }, + /** * 获取反馈结果 */ @@ -68,5 +60,24 @@ export const InspectionsApi = { method: 'PUT', data }) + }, + /** + * 执法反馈 + */ + feeback: data => { + return request({ + url: `/system/inspections-log/inspectionsAudit`, + method: 'POST', + data + }) + }, + /** + * 反馈详情 + */ + feedBackDetail: id => { + return request({ + url: `/system/inspections-log/get?id=${id}`, + method: 'GET', + }) } } \ No newline at end of file diff --git a/components/cs-bottom-wrapper/index.vue b/components/cs-bottom-wrapper/index.vue index f2a8c39..7461156 100644 --- a/components/cs-bottom-wrapper/index.vue +++ b/components/cs-bottom-wrapper/index.vue @@ -21,7 +21,7 @@ export default { diff --git a/sub/task/detail.vue b/sub/task/detail.vue index a7cc418..340d664 100644 --- a/sub/task/detail.vue +++ b/sub/task/detail.vue @@ -137,7 +137,7 @@ isSelect: isSelect.includes(record.id) }" @tap.native.stop="select(record.id)" - v-if="[3, null].includes(record.inspectionStatus)" + v-if="['3', null].includes(record.inspectionStatus)" > @@ -684,6 +684,12 @@ export default { box-shadow: none; --dropdown-menu-title-font-size: 13px; --dropdown-menu-title-text-color: #071437; + .van-dropdown-menu__item { + flex: 0; + .van-dropdown-menu__title { + width: 80px; + } + } } } .isTop { diff --git a/sub/task/enforce.vue b/sub/task/enforce.vue index 4c5c763..847b05c 100644 --- a/sub/task/enforce.vue +++ b/sub/task/enforce.vue @@ -1,6 +1,6 @@ @@ -56,6 +220,7 @@ export default { border: 1px solid #f9f9f9; border-radius: 12px; background-color: #fff; + margin-bottom: 12px; } .operation { padding: 12px; @@ -81,4 +246,32 @@ export default { } } } +::v-deep .uni-easyinput__content-textarea { + min-height: 400rpx; +} +::v-deep .u-upload__button { + border-radius: 8px !important; + border: 1px solid #f1f1f4; + background-color: #f9f9f9 !important; +} + +::v-deep .u-upload__wrap { + .u-upload__wrap__preview { + width: 192rpx; + height: 192rpx; + border-radius: 8px !important; + overflow: visible !important; + .u-upload__wrap__preview__image { + border-radius: 8px !important; + } + .u-upload__deletable { + border-radius: 100% !important; + background-color: #f8285a !important; + transform: translateX(50%) translateY(-50%); + .u-upload__deletable__icon { + position: relative; + } + } + } +} diff --git a/sub/task/locate.vue b/sub/task/locate.vue index 01aae23..89cf402 100644 --- a/sub/task/locate.vue +++ b/sub/task/locate.vue @@ -211,6 +211,17 @@ export default { this.timer && clearInterval(this.timer) return false }, + watch: { + list: { + handler: function (val) { + if (val.length >= 2) { + this.timer && clearInterval(this.timer) + } + }, + immediate: true, + deep: true + } + }, methods: { async init() { const miniCode = await getMiniCode({ @@ -331,18 +342,19 @@ export default { }, echoQueset() { const timeout = 3 * 60 * 1000 + // const timeout = 10 * 1000 this.timer && clearInterval(this.timer) - // this.timer = setInterval(() => { - // this.getLocateList() - // this.time += 5000 - // if (this.time > timeout) { - // console.log('timeout') - // clearInterval(this.timer) - // uni.navigateBack({ - // delta: 1 - // }) - // } - // }, 5 * 1000) + this.timer = setInterval(() => { + this.getLocateList() + this.time += 5000 + if (this.time > timeout) { + console.log('timeout') + clearInterval(this.timer) + uni.navigateBack({ + delta: 1 + }) + } + }, 5 * 1000) }, goNext() { InspectionsApi.beginEnforce({ diff --git a/sub/task/log.vue b/sub/task/log.vue new file mode 100644 index 0000000..0644d0a --- /dev/null +++ b/sub/task/log.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/sub/task/record.vue b/sub/task/record.vue index a1067db..3c0a555 100644 --- a/sub/task/record.vue +++ b/sub/task/record.vue @@ -1,10 +1,13 @@ \ No newline at end of file +$uni-error: #e43d33; +$uni-border-1: #dcdfe6 !default; + +.uni-easyinput { + /* #ifndef APP-NVUE */ + width: 100%; + /* #endif */ + flex: 1; + position: relative; + text-align: left; + color: #333; + font-size: 14px; +} + +.uni-easyinput__content { + flex: 1; + /* #ifndef APP-NVUE */ + width: 100%; + display: flex; + box-sizing: border-box; + // min-height: 36px; + /* #endif */ + flex-direction: row; + align-items: center; + // 处理border动画刚开始显示黑色的问题 + border-color: #fff; + transition-property: border-color; + transition-duration: 0.3s; +} + +.uni-easyinput__content-input { + /* #ifndef APP-NVUE */ + width: auto; + /* #endif */ + position: relative; + overflow: hidden; + flex: 1; + line-height: 1; + font-size: 14px; + height: 35px; + // min-height: 36px; + + /*ifdef H5*/ + & ::-ms-reveal { + display: none; + } + + & ::-ms-clear { + display: none; + } + + & ::-o-clear { + display: none; + } + + /*endif*/ +} + +.uni-easyinput__placeholder-class { + color: #999; + font-size: 12px; + // font-weight: 200; +} + +.is-textarea { + align-items: flex-start; +} + +.is-textarea-icon { + margin-top: 5px; +} + +.uni-easyinput__content-textarea { + position: relative; + overflow: hidden; + flex: 1; + line-height: 1.5; + font-size: 14px; + margin: 6px; + margin-left: 0; + height: 80px; + min-height: 80px; + /* #ifndef APP-NVUE */ + min-height: 80px; + width: auto; + /* #endif */ +} + +.input-padding { + padding-left: 10px; +} + +.content-clear-icon { + padding: 0 5px; +} + +.label-icon { + margin-right: 5px; + margin-top: -1px; +} + +// 显示边框 +.is-input-border { + /* #ifndef APP-NVUE */ + display: flex; + box-sizing: border-box; + /* #endif */ + flex-direction: row; + align-items: center; + border: 1px solid $uni-border-1; + border-radius: 4px; + /* #ifdef MP-ALIPAY */ + overflow: hidden; + /* #endif */ +} + +.uni-error-message { + position: absolute; + bottom: -17px; + left: 0; + line-height: 12px; + color: $uni-error; + font-size: 12px; + text-align: left; +} + +.uni-error-msg--boeder { + position: relative; + bottom: 0; + line-height: 22px; +} + +.is-input-error-border { + border-color: $uni-error; + + .uni-easyinput__placeholder-class { + color: mix(#fff, $uni-error, 50%); + } +} + +.uni-easyinput--border { + margin-bottom: 0; + padding: 10px 15px; + // padding-bottom: 0; + border-top: 1px #eee solid; +} + +.uni-easyinput-error { + padding-bottom: 0; +} + +.is-first-border { + /* #ifndef APP-NVUE */ + border: none; + /* #endif */ + /* #ifdef APP-NVUE */ + border-width: 0; + /* #endif */ +} + +.is-disabled { + background-color: #f7f6f6; + color: #d5d5d5; + + .uni-easyinput__placeholder-class { + color: #d5d5d5; + font-size: 12px; + } +} + diff --git a/utils/dict.js b/utils/dict.js index d07e46a..04557b1 100644 --- a/utils/dict.js +++ b/utils/dict.js @@ -4,11 +4,20 @@ * @param {Object} value */ export function echoDicValue(dict, value) { - if (!dict) return '' - if (!value) return '' + if (!dict || !value) return '' return dict.find(d => d.value == value).label || '' } +/** + * 回显字典项 + * @param {Object} dict + * @param {Object} value + */ +export function echoDictOption(dict, value) { + if (!dict || !value) return '' + return dict.find(d => d.value == value) || {} +} + /** * 构造树型结构数据 * diff --git a/utils/ruoyi.js b/utils/ruoyi.js index 95fe768..dd6ca6f 100644 --- a/utils/ruoyi.js +++ b/utils/ruoyi.js @@ -83,10 +83,11 @@ export function viewPosition({ name = '' }) { uni.openLocation({ - latitude: lat, - longitude: lng, - address: lat, - lng, - name + latitude: Number(lat), + longitude: Number(lng), + name, + fail: (err) => { + console.log(err); + } }) } \ No newline at end of file