nl-7 ol-7"> 23 24
import com.ai.bss.position.model.MapAreaBusinessType;
@ -43,6 +44,9 @@ public class LocationManagementServiceImpl implements LocationManagementService
43 44
	@Autowired
44 45
	private ResourceToolQuery resourceToolQuery;
45 46
47
	@Autowired
48
	MapTagManageService mapTagManageService;
49
	
46 50
	/**
47 51
	 * 初始化人员定位详细数据
48 52
	 *
@ -170,8 +174,7 @@ public class LocationManagementServiceImpl implements LocationManagementService
170 174
		if (CollectionUtils.isEmpty(mapAreaList))
171 175
			return ebcMapAreaList;
172 176
173
		List<MapAreaBusinessType> mapAreaTypeList = mapAreaQuery.queryAllMapAreaBusinessType(new CommonRequest(null))
174
				.getData();
177
		List<MapAreaBusinessType> mapAreaTypeList = mapTagManageService.queryMapAreaTypeList().getData();
175 178
		List<ResourceToolType> toolTypeList = resourceToolQuery.loadAllResourceToolType(new CommonRequest(null))
176 179
				.getData();
177 180

+ 2 - 1
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/MapTagManageServiceImpl.java

@ -55,7 +55,8 @@ public class MapTagManageServiceImpl implements MapTagManageService {
55 55
	}
56 56
57 57
	@Override
58
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList(CommonRequest<Void> params) {
58
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList() {
59
		CommonRequest params = new CommonRequest("5");
59 60
		return mapAreaQuery.queryAllMapAreaBusinessType(params);
60 61
	}
61 62

+ 2 - 1
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/MapTagManageService.java

@ -31,9 +31,10 @@ public interface MapTagManageService {
31 31
32 32
	/**
33 33
	 * 获取所有围栏类型
34
	 * 
34 35
	 * @return
35 36
	 */
36
	CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList(CommonRequest<Void> params);
37
	CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList();
37 38
38 39
	/**
39 40
	 * 新增围栏信息

+ 6 - 6
location-rescue-service/src/main/resources/application.properties

@ -1,7 +1,7 @@
1 1
spring.application.name=WorkTaskSpec
2
server.port=8086
2
server.port=8011
3 3
4
#server.servlet.context-path=/ipu
4
server.servlet.context-path=/ipu
5 5
6 6
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
7 7
#spring.datasource.url=jdbc:mysql://localhost:3306/cmp
@ -22,10 +22,10 @@ spring.main.allow-bean-definition-overriding=true
22 22
#kafka
23 23
#kafka.bootstrap-servers=47.105.160.21:9090
24 24
kafka.bootstrap-servers=10.19.90.34:9090
25
#kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
26
#kafka.topic.alarm=Topic_IoT_IndividualAlarm
27
kafka.topic.deviceLocation=DeviceLocationA
28
kafka.topic.alarm=IndividualAlarmA
25
kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
26
kafka.topic.alarm=Topic_IoT_IndividualAlarm
27
#kafka.topic.deviceLocation=DeviceLocationA
28
#kafka.topic.alarm=IndividualAlarmA
29 29
kafka.producer.batch-size=16785
30 30
kafka.producer.retries=1
31 31
kafka.producer.buffer-memory=33554432

common-ui - Nuosi Git Service

AIoT前端公共UI

base.md 2.4KB

CommonInfo 公共文本头部

基础用法

:::demo

<template>
  <common-panel :layer="'row'">
    <template #left>
      <div class="tree">
        <common-tree></common-tree>
      </div>
    </template>
    <template #right>
      <div class="__common-info-content">
        <common-info
          :extras="extras"
          :title="title"
          :desc-data="descData"
          :descriptions="descriptions"
        ></common-info>
      </div>
    </template>
  </common-panel>
</template>

<script setup lang="ts">
import { ref } from 'vue';

function deleteFn() {}
function editFn() {}
const extras = ref<any>([
  { name: 'delete', type: 'danger', label: '删除', onCick: deleteFn },
  { name: 'edit', label: '编辑', onCick: editFn }
]);

const title = ref<any>('光伏板资产模型');

const descriptions = ref<any>([
  { label: '描述1', name: 'desc1', type: '', delete: true },
  { label: '描述2', name: 'desc2', type: '' },
  { label: '描述3', name: 'desc3', type: '' },
  { label: '描述4', name: 'desc4', type: '' },
  { label: '描述5', name: 'desc5', type: '' },
  { label: '描述6', name: 'desc6', type: '' },
  { label: '描述7', name: 'desc7', type: '' }
]);

const descData = ref<any>({
  desc1: '描述信息',
  desc2: '描述信息',
  desc3: '描述信息',
  desc4: '描述信息',
  desc5: '描述信息',
  desc6: '描述信息',
  desc7: '描述信息'
});
</script>

:::

配置参数

参数 说明 类型 是否必须
title 标题 Object[] false
extras 描述头部右侧扩展项, 目前暂时支持button形式扩展 Array[] false
----label 扩展按钮名称 String true
----type 扩展按钮类型/danger/info/warning/primary, 默认primary String true
----name 按钮对应名称key String false
----onClick icon大小,仅为icon时生效 String false
descriptions 是否要搜索框,默认为true Boolean false
editIcon 搜索框内placeholder文案 String[] false
saveIcon 树组件数据 Array[] true
url 新增按钮文字 Srtring[] false
descData 新增按钮文字 Srtring[] false
hasIcon 新增按钮文字 Srtring[] false

事件

事件名称 说明 回调
editTitle 标题编辑 --