diff --git a/policeManagement/.env.development b/policeManagement/.env.development
index 09fc9f3..7252cf2 100644
--- a/policeManagement/.env.development
+++ b/policeManagement/.env.development
@@ -11,3 +11,12 @@ 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_GAODE_KEY=ca549d915cb38803582ca7e85c5f972c
+VITE_APP_GAODE_VERSION=2.0
+VITE_APP_SECURITY_JS_CODE=f464462874676b3f1469780a62e5b921
+
+# VITE_APP_GAODE_KEY=f379a3f860a68d7438526275d6a94b05
+# VITE_APP_GAODE_VERSION=2.0
+# VITE_APP_SECURITY_JS_CODE=432125a0f8d8cad2dac38b77d6f6728f
\ No newline at end of file
diff --git a/policeManagement/.env.production b/policeManagement/.env.production
index d7a7d29..3d56736 100644
--- a/policeManagement/.env.production
+++ b/policeManagement/.env.production
@@ -7,4 +7,9 @@ VITE_DROP_CONSOLE=true
VITE_APP_BASE_API=/api
VITE_APP_PROXY_URL=http://172.10.10.93:8765
# rsa 公钥
-VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpu1C3JHZ+Ng/eVVCZtwKsOZv9RktpAL13pKy4FoRHyNv2t8TPV2AMzLzfEzlWx001nBxyVxEMR2N9jAcqFLHv7r16ciOzbtzB9dky2G+bc9jIs4/EdVK5bAZcPRh5Jrb78sC9PHyR4AeceDyCIKHLUbWBJB4NTZE0s1Wh5kMynQIDAQAB
\ No newline at end of file
+VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpu1C3JHZ+Ng/eVVCZtwKsOZv9RktpAL13pKy4FoRHyNv2t8TPV2AMzLzfEzlWx001nBxyVxEMR2N9jAcqFLHv7r16ciOzbtzB9dky2G+bc9jIs4/EdVK5bAZcPRh5Jrb78sC9PHyR4AeceDyCIKHLUbWBJB4NTZE0s1Wh5kMynQIDAQAB
+
+# 高德
+VITE_APP_GAODE_KEY=f379a3f860a68d7438526275d6a94b05
+VITE_APP_GAODE_VERSION=2.0
+VITE_APP_SECURITY_JS_CODE=432125a0f8d8cad2dac38b77d6f6728f
\ No newline at end of file
diff --git a/policeManagement/components.d.ts b/policeManagement/components.d.ts
index a4445cc..019cb82 100644
--- a/policeManagement/components.d.ts
+++ b/policeManagement/components.d.ts
@@ -10,12 +10,10 @@ declare module 'vue' {
AAvatar: typeof import('ant-design-vue/es')['Avatar']
AButton: typeof import('ant-design-vue/es')['Button']
ACascader: typeof import('ant-design-vue/es')['Cascader']
- ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
ACol: typeof import('ant-design-vue/es')['Col']
AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider']
ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
- ADivider: typeof import('ant-design-vue/es')['Divider']
AdministrativeDivisionTree: typeof import('./src/components/tree/AdministrativeDivisionTree.vue')['default']
ADropdown: typeof import('ant-design-vue/es')['Dropdown']
AForm: typeof import('ant-design-vue/es')['Form']
@@ -31,7 +29,6 @@ declare module 'vue' {
AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
AModal: typeof import('ant-design-vue/es')['Modal']
APagination: typeof import('ant-design-vue/es')['Pagination']
- APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
APopover: typeof import('ant-design-vue/es')['Popover']
ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
@@ -41,9 +38,6 @@ declare module 'vue' {
ASpin: typeof import('ant-design-vue/es')['Spin']
ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
ATable: typeof import('ant-design-vue/es')['Table']
- ATabPane: typeof import('ant-design-vue/es')['TabPane']
- ATabs: typeof import('ant-design-vue/es')['Tabs']
- ATag: typeof import('ant-design-vue/es')['Tag']
ATextarea: typeof import('ant-design-vue/es')['Textarea']
ATimePicker: typeof import('ant-design-vue/es')['TimePicker']
ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker']
diff --git a/policeManagement/package-lock.json b/policeManagement/package-lock.json
index 249163b..31dd593 100644
--- a/policeManagement/package-lock.json
+++ b/policeManagement/package-lock.json
@@ -23,6 +23,7 @@
"vue-uuid": "^3.0.0"
},
"devDependencies": {
+ "@amap/amap-jsapi-types": "^0.0.15",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.5.1",
"@vitejs/plugin-vue": "^5.1.2",
@@ -55,6 +56,13 @@
"integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==",
"license": "MIT"
},
+ "node_modules/@amap/amap-jsapi-types": {
+ "version": "0.0.15",
+ "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-types/-/amap-jsapi-types-0.0.15.tgz",
+ "integrity": "sha512-oqyRqHpVDZh5bUe2mAJh41ZsziSj0eUzwcfIbiaBNB0eiTJnZNhKsTdk77VOklOjwuwNfsblpKW9LjmWNpeQ7A==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@ampproject/remapping": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
diff --git a/policeManagement/package.json b/policeManagement/package.json
index 9ab1b46..ae7a398 100644
--- a/policeManagement/package.json
+++ b/policeManagement/package.json
@@ -25,6 +25,7 @@
"vue-uuid": "^3.0.0"
},
"devDependencies": {
+ "@amap/amap-jsapi-types": "^0.0.15",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.5.1",
"@vitejs/plugin-vue": "^5.1.2",
diff --git a/policeManagement/src/assets/scss/myAntD.scss b/policeManagement/src/assets/scss/myAntD.scss
new file mode 100644
index 0000000..f2e201e
--- /dev/null
+++ b/policeManagement/src/assets/scss/myAntD.scss
@@ -0,0 +1,178 @@
+/* 扩展ant design pro按钮组件颜色 */
+$--my-antd-important: !important;
+
+.btn-danger {
+ color: #ffffff;
+ background-color: #F5222D;
+ border-color: #F5222D;
+
+ &:hover,
+ &:focus {
+ color: #ffffff $--my-antd-important;
+ background-color: #ff4d4f $--my-antd-important;
+ border-color: #ff4d4f $--my-antd-important;
+ }
+
+ &:active,
+ &.active {
+ color: #ffffff $--my-antd-important;
+ background-color: #cf1322 $--my-antd-important;
+ border-color: #cf1322 $--my-antd-important;
+ }
+}
+
+.btn-volcano {
+ color: #ffffff;
+ background-color: #FA541C;
+ border-color: #FA541C;
+
+ &:hover,
+ &:focus {
+ color: #ffffff $--my-antd-important;
+ background-color: #ff7a45 $--my-antd-important;
+ border-color: #ff7a45 $--my-antd-important;
+ }
+
+ &:active,
+ &.active {
+ color: #ffffff $--my-antd-important;
+ background-color: #d4380d $--my-antd-important;
+ border-color: #d4380d $--my-antd-important;
+ }
+}
+
+.btn-warn {
+ color: #ffffff;
+ background-color: #FAAD14;
+ border-color: #FAAD14;
+
+ &:hover,
+ &:focus {
+ color: #ffffff $--my-antd-important;
+ background-color: #ffc53d $--my-antd-important;
+ border-color: #ffc53d $--my-antd-important;
+ }
+
+ &:active,
+ &.active {
+ color: #ffffff $--my-antd-important;
+ background-color: #d48806 $--my-antd-important;
+ border-color: #d48806 $--my-antd-important;
+ }
+}
+
+.btn-success {
+ color: #ffffff;
+ background-color: #52C41A;
+ border-color: #52C41A;
+
+ &:hover,
+ &:focus {
+ color: #ffffff $--my-antd-important;
+ background-color: #73d13d $--my-antd-important;
+ border-color: #73d13d $--my-antd-important;
+ }
+
+ &:active,
+ &.active {
+ color: #ffffff $--my-antd-important;
+ background-color: #389e0d $--my-antd-important;
+ border-color: #389e0d $--my-antd-important;
+ }
+}
+
+.button-color-cyan {
+ color: #ffffff;
+ background-color: #13C2C2;
+ border-color: #13C2C2;
+
+ &:hover,
+ &:focus {
+ color: #ffffff $--my-antd-important;
+ background-color: #36cfc9 $--my-antd-important;
+ border-color: #36cfc9 $--my-antd-important;
+ }
+
+ &:active,
+ &.active {
+ color: #ffffff $--my-antd-important;
+ background-color: #08979c $--my-antd-important;
+ border-color: #08979c $--my-antd-important;
+ }
+}
+
+.btn-daybreak {
+ color: #ffffff;
+ background-color: #1890FF;
+ border-color: #1890FF;
+
+ &:hover,
+ &:focus {
+ color: #ffffff $--my-antd-important;
+ background-color: #096dd9 $--my-antd-important;
+ border-color: #096dd9 $--my-antd-important;
+ }
+
+ &:active,
+ &.active {
+ color: #ffffff $--my-antd-important;
+ background-color: #40a9ff $--my-antd-important;
+ border-color: #40a9ff $--my-antd-important;
+ }
+}
+
+.button-color-geekblue {
+ color: #ffffff;
+ background-color: #2F54EB;
+ border-color: #2F54EB;
+
+ &:hover,
+ &:focus {
+ color: #ffffff $--my-antd-important;
+ background-color: #1d39c4 $--my-antd-important;
+ border-color: #1d39c4 $--my-antd-important;
+ }
+
+ &:active,
+ &.active {
+ color: #ffffff $--my-antd-important;
+ background-color: #597ef7 $--my-antd-important;
+ border-color: #597ef7 $--my-antd-important;
+ }
+}
+
+.btn-purple {
+ color: #ffffff;
+ background-color: #722ED1;
+ border-color: #722ED1;
+
+ &:hover,
+ &:focus {
+ color: #ffffff $--my-antd-important;
+ background-color: #9254de $--my-antd-important;
+ border-color: #9254de $--my-antd-important;
+ }
+
+ &:active,
+ &.active {
+ color: #ffffff $--my-antd-important;
+ background-color: #531dab $--my-antd-important;
+ border-color: #531dab $--my-antd-important;
+ }
+}
+
+.table-row-warn td {
+ background-color: #fefca6;
+}
+
+.table-row-danger td {
+ background-color: #f79988;
+}
+
+.table-row-success td {
+ background-color: #b6fcbe;
+}
+
+.ant-table-summary td {
+ background: #edeff6;
+}
\ No newline at end of file
diff --git a/policeManagement/src/components/aMap/MapContainer.vue b/policeManagement/src/components/aMap/MapContainer.vue
index cc287ff..8eb4f20 100644
--- a/policeManagement/src/components/aMap/MapContainer.vue
+++ b/policeManagement/src/components/aMap/MapContainer.vue
@@ -7,7 +7,7 @@
+
+
\ No newline at end of file
diff --git a/policeManagement/src/views/query/assessmentRecord.vue.bak b/policeManagement/src/views/query/assessmentRecord.vue.bak
new file mode 100644
index 0000000..3fc71eb
--- /dev/null
+++ b/policeManagement/src/views/query/assessmentRecord.vue.bak
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+ -
+ {{ item.itemName }}
+
+
+
+
+
+ -
+
+ -
+ {{ standard.standardName }}
+
+
+
+
+
+
+
+ >
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/policeManagement/src/views/query/index.tsx b/policeManagement/src/views/query/index.tsx
index 968b21b..1207abf 100644
--- a/policeManagement/src/views/query/index.tsx
+++ b/policeManagement/src/views/query/index.tsx
@@ -24,7 +24,7 @@ const saveOrUpdateEnterprisesUnit = (params: _FormType, callback: Function) => {
const _mapRef = ref>(null)
const _formParams = ref<_FormType>({ ...params })
- let city = ''
+ let city = '全国'
const initMarker = (map: AMap.Map) => {
//添加maker点 设置point
const maker = new AMap.Marker({
@@ -47,6 +47,7 @@ const saveOrUpdateEnterprisesUnit = (params: _FormType, callback: Function) => {
required: true,
customRender: () => {
return (
+ // AutoComplete 自动完成 组件
{
initMarker(_mapRef.value?.mapInstance)
}}
onSearch={debounce((val: string) => {
+ console.log('onSearch___________________', val)
+
//@ts-ignore
const auto = new AMap.AutoComplete({
city: city,
- input: 'tipinput',
+ // input: 'tipinput',
citylimit: true,
})
auto.search(val, (status, result) => {
+ console.log('🚀 ~ auto.search ~ status, result:', status, result)
if (status === 'complete') {
+ // 生成组件需要数据
autoAddress.value = result.tips?.map((e) => {
return {
value: e.name,
@@ -125,7 +130,7 @@ const saveOrUpdateEnterprisesUnit = (params: _FormType, callback: Function) => {
customRender: () => (
{
const contextMenu = new AMap.ContextMenu()
diff --git a/policeManagement/src/views/query/publicUnit.vue b/policeManagement/src/views/query/publicUnit.vue
index 3093cef..ce3647e 100644
--- a/policeManagement/src/views/query/publicUnit.vue
+++ b/policeManagement/src/views/query/publicUnit.vue
@@ -26,7 +26,6 @@ import { publicUnitPagerQueryParams, FromItem } from '@/types/views/publicUnit.t
// import FormProMax from '@/components/form/FormProMax.vue'
import { FormProMaxItemOptions } from '@/types/components/form//index.ts'
import { FormExpose } from 'ant-design-vue/es/form/Form'
-import { message } from 'ant-design-vue'
import { showEnterprisesUnit } from './index'
const formRef = ref(null)
type TableProps = TableProMaxProps
diff --git a/policeManagement/src/vite-env.d.ts b/policeManagement/src/vite-env.d.ts
index da394f3..830ddff 100644
--- a/policeManagement/src/vite-env.d.ts
+++ b/policeManagement/src/vite-env.d.ts
@@ -54,9 +54,9 @@ interface ImportMetaEnv {
readonly VITE_APP_RSA_PUBLIC_KEY: string;
// 高德
- readonly VITE_APP_GAODE_KEY: string
- readonly VITE_APP_GAODE_VERSION: string
- readonly VITE_APP_SECURITY_JS_CODE: string
+ VITE_APP_GAODE_KEY: string
+ VITE_APP_GAODE_VERSION: string
+ VITE_APP_SECURITY_JS_CODE: string
}
declare module '*.vue' {