diff --git a/collect_information/.env.development b/collect_information/.env.development index 6f38067..4e393f7 100644 --- a/collect_information/.env.development +++ b/collect_information/.env.development @@ -1,6 +1,9 @@ # 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config TARO_APP_ID="wx0acd1c4fcf94bdd3" -TARO_APP_BASE_API="http://172.10.10.93:8765" +# TARO_APP_BASE_API="http://172.10.10.93:8765" +TARO_APP_BASE_API="https://www.hnjinglian.cn:5678" + + # minio TARO_APP_MINIO_URL=http://118.253.177.137:9000 diff --git a/collect_information/src/assets/images/rotate.png b/collect_information/src/assets/images/rotate.png new file mode 100644 index 0000000..1f52f3e Binary files /dev/null and b/collect_information/src/assets/images/rotate.png differ diff --git a/collect_information/src/assets/images/rotate1.png b/collect_information/src/assets/images/rotate1.png new file mode 100644 index 0000000..58adfbb Binary files /dev/null and b/collect_information/src/assets/images/rotate1.png differ diff --git a/collect_information/src/assets/images/旋转.png b/collect_information/src/assets/images/旋转.png new file mode 100644 index 0000000..d3f7488 Binary files /dev/null and b/collect_information/src/assets/images/旋转.png differ diff --git a/collect_information/src/pages/projectManager/index/index.vue b/collect_information/src/pages/projectManager/index/index.vue index fb842a5..f9bcefe 100644 --- a/collect_information/src/pages/projectManager/index/index.vue +++ b/collect_information/src/pages/projectManager/index/index.vue @@ -3,22 +3,19 @@ - + 1123 - + 单位数量 - 51 + 51 服务项目 - - 13123 - + 13123 有保安证人员 @@ -35,23 +32,21 @@ - - + + - {{item.name}} + {{ item.name }} - - + diff --git a/collect_information/src/request/index.ts b/collect_information/src/request/index.ts index 02d252a..9c89ee8 100644 --- a/collect_information/src/request/index.ts +++ b/collect_information/src/request/index.ts @@ -1,6 +1,6 @@ import Taro from "@tarojs/taro"; -import {ApiOptions} from "@/types/request"; -import {useUserStore} from "@/store/userStore"; +import { ApiOptions } from "@/types/request"; +import { useUserStore } from "@/store/userStore"; /** @@ -10,7 +10,7 @@ import {useUserStore} from "@/store/userStore"; const requestInterceptor = (chain: Taro.Chain) => { const requestParams = chain.requestParams const tokenInfo = useUserStore().getTokenInfo() - const {header} = requestParams; + const { header } = requestParams; const customHeader: Record = {} //添加token tokenInfo && (customHeader[tokenInfo.name] = tokenInfo.value); @@ -36,6 +36,9 @@ class CustomRequest { Taro.showLoading({ title: '请求中...', }).then() + // Taro.showLoading({ + // title: '请求中...', + // }) } Taro.request, object>({ url: this.BASE_API + url, @@ -78,7 +81,7 @@ class CustomRequest { }) } - get(url: string, params?: object, options: ApiOptions = {loading: false}): Promise> { + get(url: string, params?: object, options: ApiOptions = { loading: false }): Promise> { options.header = { ...options.header, "content-type": 'application/x-www-form-urlencoded' @@ -86,11 +89,11 @@ class CustomRequest { return this.request(url, "GET", options, params) } - post(url: string, params?: object, options: ApiOptions = {loading: false}): Promise> { + post(url: string, params?: object, options: ApiOptions = { loading: false }): Promise> { return this.request(url, "POST", options, params) } - delete(url: string, params?: object, options: ApiOptions = {loading: false}): Promise> { + delete(url: string, params?: object, options: ApiOptions = { loading: false }): Promise> { options.header = { ...options.header, "content-type": 'application/x-www-form-urlencoded' @@ -98,7 +101,7 @@ class CustomRequest { return this.request(url, "DELETE", options, params) } - put(url: string, params?: object, options: ApiOptions = {loading: false}): Promise> { + put(url: string, params?: object, options: ApiOptions = { loading: false }): Promise> { return this.request(url, "PUT", options, params) } diff --git a/collect_information/src/store/daily.ts b/collect_information/src/store/daily.ts index 8fa40c7..ecf195d 100644 --- a/collect_information/src/store/daily.ts +++ b/collect_information/src/store/daily.ts @@ -5,6 +5,10 @@ export const useDailyStore = defineStore('daily', { userdailyinspection: [], base64_1: '', base64_2: '', + direction: true, + direction_1: true, + direction_2: true, + }), actions: { @@ -20,6 +24,18 @@ export const useDailyStore = defineStore('daily', { clearSignData() { this.base64_1 = '' this.base64_2 = '' + }, + changeDirection() { + this.direction = !this.direction + }, + changeDirection__(data) { + this.direction = data + }, + changeDirection1(data) { + this.direction_1 = data + }, + changeDirection2(data) { + this.direction_2 = data } }, getters: { @@ -31,6 +47,15 @@ export const useDailyStore = defineStore('daily', { }, get_base64_2(state) { return state.base64_2 + }, + getDirection(state) { + return state.direction + }, + getDirection1(state) { + return state.direction_1 + }, + getDirection2(state) { + return state.direction_2 } } }) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss index 4773363..b239470 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss @@ -39,3 +39,9 @@ page { border-left: white; } } +.sigh_btns { + transform: rotate(-90deg); + transform-origin: center +} + +.sigh_btns_noRotate {} diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue index 23eccdf..2b74e6d 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -40,30 +40,36 @@ - - - - 考核人员签字 + + + 考核人员签字 + + + + - - - 被考评学校负责人 + + 被考评学校负责人 + + + + - 确认提交 + 确认提交 diff --git a/collect_information/src/subPages/select/dailyLife/dailyLife.vue b/collect_information/src/subPages/select/dailyLife/dailyLife.vue index 8724b8d..95240a8 100644 --- a/collect_information/src/subPages/select/dailyLife/dailyLife.vue +++ b/collect_information/src/subPages/select/dailyLife/dailyLife.vue @@ -98,7 +98,6 @@ const checkboxChange = async function (state, label, index, i) { let arr if (label === '达标' && i === 0) { - console.log(11111111111111) arr = ['null'] } else { arr = starRating.value[findIndex.value].itemList[index].selectedGroup.filter((selectedId) => selectedId != 'null') diff --git a/collect_information/src/subPages/select/signature/signature.scss b/collect_information/src/subPages/select/signature/signature.scss index e69de29..fc3270e 100644 --- a/collect_information/src/subPages/select/signature/signature.scss +++ b/collect_information/src/subPages/select/signature/signature.scss @@ -0,0 +1,65 @@ +.sign-box { + position: fixed; + z-index: 100; + top: 0; + left: 0; + width: 100%; + height: 100%; +} + +.fixedIcon { + z-index: 1000; + position: fixed; + right: 20px; + top: 20px; + height: 100rpx; + width: 100rpx; +} + +.sign-view { + height: 100%; +} + +.sigh_btns_false { + position: absolute; + bottom: 15rpx; + right: 0; + width: 100%; + height: 100rpx; + display: flex; + justify-content: space-evenly; + align-items: center; + +} + +.sigh_btns { + transform: rotate(90deg); + transform-origin: center +} + +.sigh_btns_noRotate {} + +.sigh_btns_true { + position: absolute; + left: 0; + top: 0; + width: 20%; + height: 100%; + display: flex; + flex-direction: column; + justify-content: space-evenly; + align-items: center; +} + + +.mycanvas { + width: 100%; + background-color: #ececec; +} + +.canvsborder { + border: 1rpx solid #333; + position: fixed; + top: 0; + left: 10000rpx; +} diff --git a/collect_information/src/subPages/select/signature/signature.ts b/collect_information/src/subPages/select/signature/signature.ts index 0192ec1..5f9871a 100644 --- a/collect_information/src/subPages/select/signature/signature.ts +++ b/collect_information/src/subPages/select/signature/signature.ts @@ -1,3 +1,4 @@ export default definePageConfig({ navigationBarTitleText: '签名', + disableScroll: true }) diff --git a/collect_information/src/subPages/select/signature/signature.vue b/collect_information/src/subPages/select/signature/signature.vue index 086a646..53a591b 100644 --- a/collect_information/src/subPages/select/signature/signature.vue +++ b/collect_information/src/subPages/select/signature/signature.vue @@ -1,64 +1,173 @@ -