Merge remote-tracking branch 'origin/main'

This commit is contained in:
luozhun 2024-10-31 09:45:44 +08:00
commit ee650bba12
19 changed files with 2215 additions and 705 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -1,6 +1,6 @@
<template> <template>
<view> <view>
警察我的 警察我的444
</view> </view>
</template> </template>

View File

@ -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;
}
}

View File

@ -1,9 +1,55 @@
<template> <template>
<view> <view class="mine">
项目经理我的 <view class="mine-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> </view>
</template> </template>
<script setup lang="ts"> <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> </script>

View File

@ -95,7 +95,6 @@ useLoad(async (options) => {
await projectDetailsTable() await projectDetailsTable()
}) })
const projectDetailsTable = async () => { const projectDetailsTable = async () => {
// if (total.value === projectData.value.length) return
Taro.showLoading({ Taro.showLoading({
title: '加载中', title: '加载中',
}) })

View File

@ -5,7 +5,7 @@
<view style="display: flex;justify-content: space-between"> <view style="display: flex;justify-content: space-between">
<text style="font-size: 18px">{{ enterprisesUnitName }}-----{{ serviceProject?.name }} <text style="font-size: 18px">{{ enterprisesUnitName }}-----{{ serviceProject?.name }}
</text> </text>
<text>进行中</text> <!-- <text>进行中</text>-->
</view> </view>
<view> <view>
<view style="float: left;width: 50%;" class="content"> <view style="float: left;width: 50%;" class="content">

View File

@ -5,4 +5,6 @@ VITE_DROP_CONSOLE=true
# axios # axios
VITE_APP_BASE_API=/api VITE_APP_BASE_API=/api
VITE_APP_PROXY_URL=https://172.10.10.238:8765 VITE_APP_PROXY_URL=http://172.10.10.93:8765
# rsa 公钥
VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpu1C3JHZ+Ng/eVVCZtwKsOZv9RktpAL13pKy4FoRHyNv2t8TPV2AMzLzfEzlWx001nBxyVxEMR2N9jAcqFLHv7r16ciOzbtzB9dky2G+bc9jIs4/EdVK5bAZcPRh5Jrb78sC9PHyR4AeceDyCIKHLUbWBJB4NTZE0s1Wh5kMynQIDAQAB

View File

@ -9,6 +9,8 @@ lerna-debug.log*
node_modules node_modules
dist dist
policeManagement
package-lock.json
dist-ssr dist-ssr
*.local *.local

View File

@ -9,7 +9,6 @@ declare module 'vue' {
export interface GlobalComponents { export interface GlobalComponents {
AAvatar: typeof import('ant-design-vue/es')['Avatar'] AAvatar: typeof import('ant-design-vue/es')['Avatar']
AButton: typeof import('ant-design-vue/es')['Button'] AButton: typeof import('ant-design-vue/es')['Button']
ACard: typeof import('ant-design-vue/es')['Card']
ACascader: typeof import('ant-design-vue/es')['Cascader'] ACascader: typeof import('ant-design-vue/es')['Cascader']
ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup'] ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
@ -17,7 +16,6 @@ declare module 'vue' {
AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider'] AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider']
ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
ADivider: typeof import('ant-design-vue/es')['Divider'] ADivider: typeof import('ant-design-vue/es')['Divider']
ADrawer: typeof import('ant-design-vue/es')['Drawer']
ADropdown: typeof import('ant-design-vue/es')['Dropdown'] ADropdown: typeof import('ant-design-vue/es')['Dropdown']
AForm: typeof import('ant-design-vue/es')['Form'] AForm: typeof import('ant-design-vue/es')['Form']
AFormItem: typeof import('ant-design-vue/es')['FormItem'] AFormItem: typeof import('ant-design-vue/es')['FormItem']
@ -34,12 +32,10 @@ declare module 'vue' {
APagination: typeof import('ant-design-vue/es')['Pagination'] APagination: typeof import('ant-design-vue/es')['Pagination']
APopconfirm: typeof import('ant-design-vue/es')['Popconfirm'] APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
APopover: typeof import('ant-design-vue/es')['Popover'] APopover: typeof import('ant-design-vue/es')['Popover']
ARadio: typeof import('ant-design-vue/es')['Radio']
ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup'] ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
ARangePicker: typeof import('ant-design-vue/es')['RangePicker'] ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
ARow: typeof import('ant-design-vue/es')['Row'] ARow: typeof import('ant-design-vue/es')['Row']
ASelect: typeof import('ant-design-vue/es')['Select'] ASelect: typeof import('ant-design-vue/es')['Select']
ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
ASpace: typeof import('ant-design-vue/es')['Space'] ASpace: typeof import('ant-design-vue/es')['Space']
ASpin: typeof import('ant-design-vue/es')['Spin'] ASpin: typeof import('ant-design-vue/es')['Spin']
ASubMenu: typeof import('ant-design-vue/es')['SubMenu'] ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
@ -53,7 +49,6 @@ declare module 'vue' {
ATooltip: typeof import('ant-design-vue/es')['Tooltip'] ATooltip: typeof import('ant-design-vue/es')['Tooltip']
ATreeSelect: typeof import('ant-design-vue/es')['TreeSelect'] ATreeSelect: typeof import('ant-design-vue/es')['TreeSelect']
FormProMax: typeof import('./src/components/form/FormProMax.vue')['default'] FormProMax: typeof import('./src/components/form/FormProMax.vue')['default']
HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
IconFont: typeof import('./src/components/iconfont/IconFont.vue')['default'] IconFont: typeof import('./src/components/iconfont/IconFont.vue')['default']
Layout: typeof import('./src/components/layout/layout.vue')['default'] Layout: typeof import('./src/components/layout/layout.vue')['default']
LayoutHeader: typeof import('./src/components/layout/header/LayoutHeader.vue')['default'] LayoutHeader: typeof import('./src/components/layout/header/LayoutHeader.vue')['default']
@ -61,7 +56,6 @@ declare module 'vue' {
RouterLink: typeof import('vue-router')['RouterLink'] RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView'] RouterView: typeof import('vue-router')['RouterView']
SingleImageFileUpload: typeof import('./src/components/upload/SingleImageFileUpload.vue')['default'] SingleImageFileUpload: typeof import('./src/components/upload/SingleImageFileUpload.vue')['default']
Sliber: typeof import('./src/components/layout/sliber/sliber.vue')['default']
SystemMenus: typeof import('./src/components/layout/SystemMenus.vue')['default'] SystemMenus: typeof import('./src/components/layout/SystemMenus.vue')['default']
TableProMax: typeof import('./src/components/table/TableProMax.vue')['default'] TableProMax: typeof import('./src/components/table/TableProMax.vue')['default']
TelephoneLogin: typeof import('./src/components/login/TelephoneLogin.vue')['default'] TelephoneLogin: typeof import('./src/components/login/TelephoneLogin.vue')['default']

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vue-tsc -b && vite build", "build": "vite build --mode production",
"preview": "vite preview" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
@ -16,9 +16,9 @@
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"pinia": "^2.2.2", "pinia": "^2.2.2",
"pinia-plugin-persistedstate": "^3.2.0", "pinia-plugin-persistedstate": "^3.2.0",
"vue-component-type-helpers": "^2.1.2",
"sass": "^1.77.8", "sass": "^1.77.8",
"vue": "^3.4.37", "vue": "^3.4.37",
"vue-component-type-helpers": "^2.1.2",
"vue-router": "4", "vue-router": "4",
"vue-uuid": "^3.0.0" "vue-uuid": "^3.0.0"
}, },
@ -30,6 +30,7 @@
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"postcss": "^8.4.41", "postcss": "^8.4.41",
"tailwindcss": "^3.4.10", "tailwindcss": "^3.4.10",
"terser": "^5.36.0",
"typescript": "^5.5.3", "typescript": "^5.5.3",
"unplugin-vue-components": "^0.27.4", "unplugin-vue-components": "^0.27.4",
"vite": "^5.4.1", "vite": "^5.4.1",

View File

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

View File

@ -1,4 +1,4 @@
<template><div>111111</div></template> <template><div>公安后台</div></template>
<script setup lang="ts"> <script setup lang="ts">
defineOptions({ defineOptions({

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
policeManagement/vite.config.d.ts vendored Normal file
View File

@ -0,0 +1,2 @@
declare const _default: import("vite").UserConfigFnObject;
export default _default;

View File

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

View File

@ -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 VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJps/EXxxSpEM1Ix4R0NWIOBciHCr7P7coDT8tNKfelgR7txcJOqHCO/MIWe7T04aHQTcpQxqx9hMca7dbqz8TZpz9jvLzE/6ZonVKxHsoFnNlHMp1/CPAJ9f6D9wYicum2KltJkmQ0g//D9W2zPCYoGOmSRFcZx/KEBa4EM53jQIDAQAB
# minio # 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 VITE_APP_MINIO_BUCKET=police-security-dev