Merge remote-tracking branch 'origin/main'
This commit is contained in:
		
						commit
						0dcee7f7f6
					
				| 
						 | 
				
			
			@ -15,7 +15,7 @@ VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJps/EXxxSpEM1Ix4R
 | 
			
		|||
# 高德
 | 
			
		||||
VITE_APP_GAODE_KEY=ca549d915cb38803582ca7e85c5f972c
 | 
			
		||||
VITE_APP_GAODE_VERSION=2.0
 | 
			
		||||
VITE_APP_SECURITY_JS_CODE=432125a0f8d8cad2dac38b77d6f6728f
 | 
			
		||||
VITE_APP_SECURITY_JS_CODE=f464462874676b3f1469780a62e5b921
 | 
			
		||||
 | 
			
		||||
# VITE_APP_GAODE_KEY=f379a3f860a68d7438526275d6a94b05
 | 
			
		||||
# VITE_APP_GAODE_VERSION=2.0
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,17 +10,14 @@ 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']
 | 
			
		||||
    AFormItem: typeof import('ant-design-vue/es')['FormItem']
 | 
			
		||||
    AImage: typeof import('ant-design-vue/es')['Image']
 | 
			
		||||
    AInput: typeof import('ant-design-vue/es')['Input']
 | 
			
		||||
    AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
 | 
			
		||||
    AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
 | 
			
		||||
| 
						 | 
				
			
			@ -32,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']
 | 
			
		||||
| 
						 | 
				
			
			@ -42,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']
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,7 @@ const saveOrUpdateEnterprisesUnit = (params: _FormType, callback: Function) => {
 | 
			
		|||
  const _mapRef = ref<ComponentExposed<typeof MapContainer>>(null)
 | 
			
		||||
  const _formParams = ref<_FormType>({ ...params })
 | 
			
		||||
 | 
			
		||||
  let city = ''
 | 
			
		||||
  let city = '全国'
 | 
			
		||||
  const initMarker = (map: AMap.Map) => {
 | 
			
		||||
    //添加maker点 设置point
 | 
			
		||||
    const maker = new AMap.Marker({
 | 
			
		||||
| 
						 | 
				
			
			@ -62,11 +62,13 @@ const saveOrUpdateEnterprisesUnit = (params: _FormType, callback: Function) => {
 | 
			
		|||
              //@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,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue