diff --git a/collect_information/src/assets/images/banner.png b/collect_information/src/assets/images/banner.png new file mode 100644 index 0000000..f29618c Binary files /dev/null and b/collect_information/src/assets/images/banner.png differ diff --git a/collect_information/src/assets/logo/avatar1.png b/collect_information/src/assets/logo/avatar1.png new file mode 100644 index 0000000..09cb7a7 Binary files /dev/null and b/collect_information/src/assets/logo/avatar1.png differ diff --git a/collect_information/src/pages/police/mine/index.vue b/collect_information/src/pages/police/mine/index.vue index d00e9e3..ce60812 100644 --- a/collect_information/src/pages/police/mine/index.vue +++ b/collect_information/src/pages/police/mine/index.vue @@ -1,6 +1,6 @@ diff --git a/collect_information/src/pages/projectManager/mine/index.scss b/collect_information/src/pages/projectManager/mine/index.scss index e69de29..321b2e7 100644 --- a/collect_information/src/pages/projectManager/mine/index.scss +++ b/collect_information/src/pages/projectManager/mine/index.scss @@ -0,0 +1,71 @@ +.mine { + height: 100vh; + background-color: #fff; +} +.mine-container { + height: 320rpx; + display: flex; + align-items: center; + background-image: url('../../../assets/images/banner.png'); + background-repeat: no-repeat; + background-position: right; + overflow: hidden; + padding: 45rpx; + box-sizing: border-box; + .contacts { + height: 75rpx; + width: 75rpx; + border-radius: 50%; + border: solid 1px gray; + .image { + width: 100%; + height: 100%; + } + } + .tips-text { + display: flex; + font-size: 28rpx; + color: #fff; + line-height: 50rpx; + margin-left: 20rpx; + flex-direction: column; + justify-content: space-evenly; + } +} +.exit { + height: 100rpx; + line-height: 40px; + border-bottom: solid 0.5px #ebebf7; + box-sizing: border-box; + display: flex; + justify-content: space-between; + align-items: center; + color: #7d7d7d; + .exitItem { + display: flex; + align-items: center; + margin-left: 30rpx; + } + .exitItemIndex { + height: 40rpx; + width: 40rpx; + border-radius: 50%; + display: block; + line-height: 48rpx; + image { + width: 100%; + height: 100%; + } + } + .microscope { + width: 8px; + height: 8px; + display: inline-block; + border: solid 2px #ccc; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + border-bottom: white; + border-left: white; + } +} + diff --git a/collect_information/src/pages/projectManager/mine/index.vue b/collect_information/src/pages/projectManager/mine/index.vue index 55e8097..07098b1 100644 --- a/collect_information/src/pages/projectManager/mine/index.vue +++ b/collect_information/src/pages/projectManager/mine/index.vue @@ -1,9 +1,55 @@ diff --git a/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue b/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue index b68a6cc..4c2c92e 100644 --- a/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue +++ b/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue @@ -95,7 +95,6 @@ useLoad(async (options) => { await projectDetailsTable() }) const projectDetailsTable = async () => { - // if (total.value === projectData.value.length) return Taro.showLoading({ title: '加载中', }) diff --git a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue index 8fa23b9..56105c5 100644 --- a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue +++ b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue @@ -5,7 +5,7 @@ {{ enterprisesUnitName }}-----{{ serviceProject?.name }} - 进行中 + diff --git a/securityManagement/.env.development b/securityManagement/.env.development index 5c29a1e..6ed8ec6 100644 --- a/securityManagement/.env.development +++ b/securityManagement/.env.development @@ -11,5 +11,5 @@ VITE_APP_PROXY_URL=http://172.10.10.93:8765 VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJps/EXxxSpEM1Ix4R0NWIOBciHCr7P7coDT8tNKfelgR7txcJOqHCO/MIWe7T04aHQTcpQxqx9hMca7dbqz8TZpz9jvLzE/6ZonVKxHsoFnNlHMp1/CPAJ9f6D9wYicum2KltJkmQ0g//D9W2zPCYoGOmSRFcZx/KEBa4EM53jQIDAQAB # minio -VITE_APP_MINIO_URL=http://118.253.177.137:9000 +VITE_APP_MINIO_URL=https://www.hnjinglian.cn:9000 VITE_APP_MINIO_BUCKET=police-security-dev