Merge remote-tracking branch 'origin/main'

This commit is contained in:
luozhun 2024-10-31 11:00:17 +08:00
commit 44bff02808
10 changed files with 153 additions and 20 deletions

View File

@ -1,3 +1,3 @@
# 配置文档参考 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="https://www.hnjinglian.cn:5678"

View File

@ -1 +1,2 @@
# TARO_APP_ID="生产环境下的小程序appid"
# TARO_APP_ID="wx0acd1c4fcf94bdd3"
TARO_APP_BASE_API="https://www.hnjinglian.cn:5678"

View File

@ -0,0 +1,71 @@
.public {
height: 100vh;
background-color: #fff;
}
.public-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;
}
}

View File

@ -1,9 +1,56 @@
<template>
<view>
警察我的444
<view class="public">
<!-- 公安-->
<view class="public-container" >
<view class="contacts">
<image src="@/assets/logo/avatar1.png" mode="scaleToFill" class="image" />
</view>
<view class="tips-text">
<view style="font-size: 15px;">名字</view>
<view style="font-size: 12px;">
<text style="margin-right: 5px">部门 </text>
<text>未选择单位</text>
</view>
</view>
</view>
<!-- 用户信息 -->
<view class="userIndex">
<view class="exit" v-for="item in datalist" :key="item.value">
<view class="exitItem">
<!-- <view class="exitItemIndex">-->
<!-- <image :src="item.url" mode="scaleToFill" class="image" />-->
<!-- </view>-->
<text style="margin-left: 30rpx;font-size: 12px;">{{ item.name }}</text>
</view>
<view style="margin-right: 40rpx">
<text class="microscope"></text>
</view>
</view>
</view>
<!-- 退出弹框-->
</view>
</template>
<script setup lang="ts">
import './index.scss'
import {ref} from "vue";
const datalist = ref([
{
value: 1,
name: '简介',
},
{
value: 0,
name: '退出登录',
},
{
value: 2,
name: '修改用户信息',
},
{
value: 3,
name: '意见收集',
},
])
</script>

View File

@ -1,38 +1,45 @@
<template>
<view class="myProject">
<view class="myProjectItem" v-for="(item,index) in myProjectList" :key="index">
<view style="display: flex;justify-content: space-between">
<view v-if="number !== 0" class="myProjectItem" v-for="(item, index) in myProjectList" :key="index">
<view style="display: flex; justify-content: space-between">
<text>{{ item?.name }}</text>
<!--<text>进行中</text>-->
</view>
<view class="myProjectIndex">地址
<view class="myProjectIndex"
>地址
<text>{{ item?.provinceName }}{{ item.cityName }}{{ item.districtsName }}{{ item.streetName }}</text>
</view>
<view style="display: flex;justify-content: space-between">
<view style="display: flex; justify-content: space-between">
<text>联系人{{ item?.contactPersonInfo.name }}</text>
<text>电话{{ item?.contactPersonInfo.telephone }}</text>
</view>
<view class="project">
<view @click="projectClick(item?.name,serviceProject)" v-for="(serviceProject,index) in item.serviceProjectList"
:key="index">
<view @click="projectClick(item?.name, serviceProject)" v-for="(serviceProject, index) in item.serviceProjectList" :key="index">
{{ serviceProject.name }}
</view>
</view>
</view>
<view v-else class="myProject">
<nut-empty image="empty" description="暂无项目">
<div style="margin-top: 10px"></div>
</nut-empty>
</view>
</view>
</template>
<script setup lang="ts">
import api from "@/request/index";
import {onMounted, ref} from "vue";
import Taro from "@tarojs/taro";
import api from '@/request/index'
import { onMounted, ref } from 'vue'
import Taro from '@tarojs/taro'
import './myEnterprisesUnit.scss'
import {MyProjectList, ServiceProjectList} from "@/types/subPages/projectManager/myProject";
import { MyProjectList, ServiceProjectList } from '@/types/subPages/projectManager/myProject'
const myProjectList = ref<MyProjectList[]>()
const number = ref(0)
const getMyServiceProject = async () => {
const resp = await api.get<MyProjectList[]>(`/policeIndex/getUnitServiceProjectList`)
myProjectList.value = resp.data
number.value = resp.data?.length || 0
}
const projectClick = (enterprisesUnitName: string, serviceProject: ServiceProjectList) => {

View File

@ -8,8 +8,7 @@ VITE_APP_BASE_API=/api
VITE_APP_PROXY_URL=http://172.10.10.93:8765
# rsa 公钥
VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJps/EXxxSpEM1Ix4R0NWIOBciHCr7P7coDT8tNKfelgR7txcJOqHCO/MIWe7T04aHQTcpQxqx9hMca7dbqz8TZpz9jvLzE/6ZonVKxHsoFnNlHMp1/CPAJ9f6D9wYicum2KltJkmQ0g//D9W2zPCYoGOmSRFcZx/KEBa4EM53jQIDAQAB
VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpu1C3JHZ+Ng/eVVCZtwKsOZv9RktpAL13pKy4FoRHyNv2t8TPV2AMzLzfEzlWx001nBxyVxEMR2N9jAcqFLHv7r16ciOzbtzB9dky2G+bc9jIs4/EdVK5bAZcPRh5Jrb78sC9PHyR4AeceDyCIKHLUbWBJB4NTZE0s1Wh5kMynQIDAQAB
# minio
VITE_APP_MINIO_URL=https://www.hnjinglian.cn:9000
VITE_APP_MINIO_BUCKET=police-security-dev

View File

@ -6,3 +6,10 @@ VITE_DROP_CONSOLE=true
# axios
VITE_APP_BASE_API=/api
VITE_APP_PROXY_URL=https://172.10.10.238:8765
# rsa 公钥
VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpu1C3JHZ+Ng/eVVCZtwKsOZv9RktpAL13pKy4FoRHyNv2t8TPV2AMzLzfEzlWx001nBxyVxEMR2N9jAcqFLHv7r16ciOzbtzB9dky2G+bc9jIs4/EdVK5bAZcPRh5Jrb78sC9PHyR4AeceDyCIKHLUbWBJB4NTZE0s1Wh5kMynQIDAQAB
# minio
VITE_APP_MINIO_URL=https://www.hnjinglian.cn:9000
VITE_APP_MINIO_BUCKET=police-security

View File

@ -16,9 +16,10 @@
"lodash-es": "^4.17.21",
"pinia": "^2.2.2",
"pinia-plugin-persistedstate": "^3.2.0",
"vue-component-type-helpers": "^2.1.2",
"sass": "^1.77.8",
"terser": "^5.36.0",
"vue": "^3.4.37",
"vue-component-type-helpers": "^2.1.2",
"vue-router": "4",
"vue-uuid": "^3.0.0"
},

View File

@ -10,7 +10,7 @@ import {ROUTER_WHITE_LIST} from "@/config";
* createWebHashHistory: 路径带# URL SEO
*/
const router = createRouter({
history: createWebHistory(),
history: createWebHistory('/securityManagement/'),
routes: [...staticRouter],
strict: false,
scrollBehavior: () => ({left: 0, top: 0})

View File

@ -14,7 +14,7 @@ export default defineConfig(({mode}) => {
define: {
__APP_ENV: JSON.stringify(env)
},
base: '/',
base: '/securityManagement/',
plugins: [
vue(),
vueJsx(),
@ -43,7 +43,7 @@ export default defineConfig(({mode}) => {
}
},
build: {
outDir: 'dist',
outDir: 'securityManagement',
target: 'modules',
chunkSizeWarningLimit: 1500,
minify: 'terser',