diff --git a/collect_information/package.json b/collect_information/package.json
index 69bd40f..9c42ee8 100644
--- a/collect_information/package.json
+++ b/collect_information/package.json
@@ -2,7 +2,7 @@
"name": "collect_information",
"version": "1.0.0",
"private": true,
- "description": "智慧派出所信息采集小程序",
+ "description": "小程序",
"templateInfo": {
"name": "default",
"typescript": true,
diff --git a/collect_information/src/app.config.ts b/collect_information/src/app.config.ts
index 0c08573..39ddf66 100644
--- a/collect_information/src/app.config.ts
+++ b/collect_information/src/app.config.ts
@@ -2,7 +2,8 @@ export default defineAppConfig({
pages: [
'pages/login/login',
'pages/register/register',
- 'pages/index/index',
+ 'pages/projectManager/index/index',
+ 'pages/policeManager/index/index',
'pages/mine/mine',
'pages/employeeInfo/employeeInfo',
],
@@ -15,7 +16,7 @@ export default defineAppConfig({
tabBar: {
list: [
{
- pagePath: 'pages/index/index',
+ pagePath: 'pages/projectManager/index/index',
text: '首页',
iconPath: "assets/mine/punch.png",
selectedIconPath: "assets/mine/punch-active.png"
diff --git a/collect_information/src/app.scss b/collect_information/src/app.scss
index b6faf5f..0570844 100644
--- a/collect_information/src/app.scss
+++ b/collect_information/src/app.scss
@@ -1,4 +1,4 @@
*{
margin: 0;
- padding: 0;
+ padding: 0;
}
diff --git a/collect_information/src/pages/index/index.vue b/collect_information/src/pages/index/index.vue
deleted file mode 100644
index c25c9c2..0000000
--- a/collect_information/src/pages/index/index.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- 12
-
-
-45
-
-
-
-
-
-
diff --git a/collect_information/src/pages/login/login.scss b/collect_information/src/pages/login/login.scss
index e69de29..7977430 100644
--- a/collect_information/src/pages/login/login.scss
+++ b/collect_information/src/pages/login/login.scss
@@ -0,0 +1,87 @@
+.SignMultiple {
+ height: 100vh;
+ background: #f4f5f7;
+ position: relative;
+
+ .urlIndex {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 0;
+ margin: 0;
+ width: 100%;
+ height: 440rpx;
+ background: #3a6bbe;
+ text-align: center;
+ overflow: hidden;
+
+ .urlTitle {
+ width: 100%;
+ height: 300rpx;
+
+ .urlWelcome {
+ color: #fff;
+ font-size: 24px;
+ }
+
+ .urlHibiscus {
+ height: 200rpx;
+ line-height: 58rpx;
+ //font-size: 38rpx;
+ margin: 40rpx 20rpx;
+ border: 2px solid #a1b8e0;
+ display: flex;
+ justify-content: center;
+
+ .contact {
+ height: 100rpx;
+ width: 100rpx;
+ border-radius: 50%;
+ border: solid 1px gray;
+
+ .image {
+ width: 100%;
+ height: 100%;
+ border-radius: 50%
+ }
+ }
+ }
+ }
+ }
+
+ .type {
+ margin: 0 20rpx 0 20rpx;
+ width: 29%;
+ text-align: right;
+ }
+
+ .HiddenEse {
+ position: absolute;
+ top: 4px;
+ right: 0;
+ width: 76rpx;
+ height: 40rpx;
+
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ }
+ }
+
+ .SignItem {
+ transform: translateY(15%);
+ display: flex;
+ flex-direction: column;
+ margin: 20rpx 48rpx;
+ border-radius: 20rpx;
+ }
+
+ .Cancel {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ text-align: center;
+ margin: 20rpx 40rpx;
+ }
+
+}
diff --git a/collect_information/src/pages/login/login.vue b/collect_information/src/pages/login/login.vue
index 44937f4..9320e6b 100644
--- a/collect_information/src/pages/login/login.vue
+++ b/collect_information/src/pages/login/login.vue
@@ -1,16 +1,71 @@
- 登录
+
+
+
+ Welcome
+
+
+
+ 欢迎
+
+
+
+
+
+
+
+ 一键授权
+
+
diff --git a/collect_information/src/pages/policeManager/index/index.vue b/collect_information/src/pages/policeManager/index/index.vue
new file mode 100644
index 0000000..00e3017
--- /dev/null
+++ b/collect_information/src/pages/policeManager/index/index.vue
@@ -0,0 +1,12 @@
+
+ 警察
+
+
+
+
+
+
diff --git a/collect_information/src/pages/index/index.config.ts b/collect_information/src/pages/projectManager/index/index.config.ts
similarity index 100%
rename from collect_information/src/pages/index/index.config.ts
rename to collect_information/src/pages/projectManager/index/index.config.ts
diff --git a/collect_information/src/pages/index/index.scss b/collect_information/src/pages/projectManager/index/index.scss
similarity index 100%
rename from collect_information/src/pages/index/index.scss
rename to collect_information/src/pages/projectManager/index/index.scss
diff --git a/collect_information/src/pages/projectManager/index/index.vue b/collect_information/src/pages/projectManager/index/index.vue
new file mode 100644
index 0000000..c75437b
--- /dev/null
+++ b/collect_information/src/pages/projectManager/index/index.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/collect_information/src/pages/register/register.vue b/collect_information/src/pages/register/register.vue
index 6a999c4..7bbe165 100644
--- a/collect_information/src/pages/register/register.vue
+++ b/collect_information/src/pages/register/register.vue
@@ -24,18 +24,6 @@
-
-
-
-
-
- {{ streetCommunitySmallCommunityLabel || "请选择行政区划" }}
-
-
+
+
+
+
+
+ {{ streetCommunitySmallCommunityLabel || "请选择行政区划" }}
+
+
-
+
{{ selectedLabel || '请选择单位'}}
@@ -65,7 +65,7 @@
:field-names="{
text: 'label',
children: 'extData'
- }" v-model="formData.unitId" :columns="columns" title="请选择城市" @confirm="confirm" @cancel="show = false"/>
+ }" v-model="formData.unitId" :columns="columns" title="请选择单位" @confirm="confirm" @cancel="show = false"/>
注册
@@ -75,7 +75,7 @@
diff --git a/collect_information/types/pages/login/index.d.ts b/collect_information/types/pages/login/index.d.ts
index 2192b8c..236bff4 100644
--- a/collect_information/types/pages/login/index.d.ts
+++ b/collect_information/types/pages/login/index.d.ts
@@ -2,3 +2,4 @@ interface LoginUserInfo {
name?: string;
avatar?: string;
}
+
diff --git a/securityManagement/src/components/upload/SingleImageFileUpload.vue b/securityManagement/src/components/upload/SingleImageFileUpload.vue
index 1bcdb0f..97c15b7 100644
--- a/securityManagement/src/components/upload/SingleImageFileUpload.vue
+++ b/securityManagement/src/components/upload/SingleImageFileUpload.vue
@@ -7,7 +7,7 @@
:src="minioBaseUrl+modelValue"
alt="avatar"/>
{{ btnLabel }}
-
+
@@ -40,6 +40,8 @@ const props = withDefaults(defineProps<{
const uploading = ref(false)
const percent = ref(0)
let cancelToken: CancelTokenSource | null = null
+const uploadUrl = ref()
+const fileInput = ref(null);
const selectFile = () => {
document.getElementById('myFileInput')?.click()
@@ -62,19 +64,23 @@ async function inputFileListener(this: HTMLInputElement) {
uploading.value = true;
const objectName = generateSimpleObjectName(selectedFile.name, props.parentDir)
- const uploadUrl = await getResignedObjectUrl(__APP_ENV.VITE_APP_MINIO_BUCKET, objectName);
+ uploadUrl.value = await getResignedObjectUrl(__APP_ENV.VITE_APP_MINIO_BUCKET, objectName)
cancelToken = axios.CancelToken.source()
- await axios.put(uploadUrl, selectedFile, {
+ await axios.put(uploadUrl.value, selectedFile, {
cancelToken: cancelToken.token,
onUploadProgress: (progressEvent) => {
percent.value = (progressEvent.loaded / (progressEvent.total as number) * 100 | 0)
}
})
-
modelValue.value = '/' + __APP_ENV.VITE_APP_MINIO_BUCKET + objectName;
uploading.value = false;
}
+const fileDelete = ()=>{
+ uploadUrl.value = ''
+ fileInput.value.value = ''
+ modelValue.value = ''
+}
onMounted(() => {
document.getElementById('myFileInput')?.addEventListener('change', inputFileListener);
})
@@ -82,6 +88,7 @@ onMounted(() => {
onUnmounted(() => {
document.getElementById('myFileInput')?.removeEventListener('change', inputFileListener);
})
+defineExpose({fileDelete})
diff --git a/securityManagement/src/types/views/enterprise.ts b/securityManagement/src/types/views/enterprise.ts
index e8bdb4b..8268b20 100644
--- a/securityManagement/src/types/views/enterprise.ts
+++ b/securityManagement/src/types/views/enterprise.ts
@@ -4,7 +4,7 @@ export interface formDatePort {
businessLicense:string,
legalPersonInfo:string,
telephone:string,
- administrativeDivisionCodes:Record,
+ administrativeDivisionCodes:string,
address:string,
nature:string
}
diff --git a/securityManagement/src/views/enterprise.vue b/securityManagement/src/views/enterprise.vue
index 2b04a73..6e5a75a 100644
--- a/securityManagement/src/views/enterprise.vue
+++ b/securityManagement/src/views/enterprise.vue
@@ -91,7 +91,7 @@ const formDate = ref({
businessLicense:'',
legalPersonInfo:'',
telephone:'',
- administrativeDivisionCodes:undefined,
+ administrativeDivisionCodes:'',
address:'',
nature:''
})
@@ -126,13 +126,12 @@ const DivisionTree = async ()=>{
// 可以进行搜索行政区划 2
const filter: ShowSearchType['filter'] = (inputValue, path) => {
- console.log(inputValue,path)
return path.some(option => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
};
// 搜索完成时回调
const searchAdministrativeDivisionTree = (e:Array)=>{
- formDate.value.administrativeDivisionCodes = e
+ formDate.value.administrativeDivisionCodes = e as any
}
// 注册企业入驻
const onFinish = async ()=>{
@@ -153,6 +152,7 @@ const onFinish = async ()=>{
}
const resp = await api.post('/common/securityUnitRegister',securityUnitRegisterParams)
message.success(resp.message)
+ fileUpload.value.fileDelete()
await formDateRef.value.resetFields() //成功之后进行移除表单
formDate.value = {
name:'',
@@ -160,7 +160,7 @@ const onFinish = async ()=>{
businessLicense:'',
legalPersonInfo:'',
telephone:'',
- administrativeDivisionCodes:undefined,
+ administrativeDivisionCodes:'',
address:'',
nature:''
}
diff --git a/securityManagement/src/views/serviceManagement/index.vue b/securityManagement/src/views/serviceManagement/index.vue
index dd9a46c..b4990c8 100644
--- a/securityManagement/src/views/serviceManagement/index.vue
+++ b/securityManagement/src/views/serviceManagement/index.vue
@@ -98,8 +98,8 @@ const formParams = ref<{
const columns: TableProps['columns'] = [
{
- dataIndex: 'enterprisesUnitName',
- title: '企事业单位名称',
+ dataIndex: 'name',
+ title: '服务项目名称',
width: 150,
ellipsis: true
},
@@ -108,9 +108,10 @@ const columns: TableProps['columns'] = [
title: '项目经理小程序用户名称',
width: 200,
ellipsis: true
- }, {
- dataIndex: 'name',
- title: '服务项目名称',
+ },
+ {
+ dataIndex: 'enterprisesUnitName',
+ title: '企事业单位名称',
width: 150,
ellipsis: true
},
@@ -129,7 +130,7 @@ const columns: TableProps['columns'] = [
{
dataIndex:'idNumber',
title: '证件号',
- width:200
+ width:170
},
{
dataIndex:'serviceArea',
@@ -426,8 +427,8 @@ const addServiceProjects = () => {
}
onMounted(async ()=>{
- await getAdministrativeDivisionTree()
await projectManagerMiniProgram()
+ await getAdministrativeDivisionTree()
})
diff --git a/securityManagement/src/views/userManagement/uniManagement/index.vue b/securityManagement/src/views/userManagement/uniManagement/index.vue
index 1a1d32e..53b18db 100644
--- a/securityManagement/src/views/userManagement/uniManagement/index.vue
+++ b/securityManagement/src/views/userManagement/uniManagement/index.vue
@@ -98,6 +98,7 @@ const columns: TableProps['columns'] = [
}
return
{
const resp = await api.post('/management/disableOrEnableMiniProgramUser', {