diff --git a/package.json b/package.json index 0ec66b5..10df995 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "build-api": "cd api_build/ && build.bat" }, "dependencies": { + "@antv/x6": "^2.18.1", "@element-plus/icons-vue": "^2.3.1", "@microsoft/signalr": "^8.0.0", "@vue-flow/additional-components": "^1.3.3", diff --git a/public/config.js b/public/config.js index 738691a..6a5f4ba 100644 --- a/public/config.js +++ b/public/config.js @@ -3,5 +3,5 @@ window.__env__ = { "VITE_OPEN": "false", "VITE_OPEN_CDN": "false", "VITE_PUBLIC_PATH": "", - "VITE_API_URL": "" + "VITE_API_URL": "http://cloud.bodk.com.cn" } \ No newline at end of file diff --git a/src/api/api.ts b/src/api/api.ts index ad3d975..866789b 100644 --- a/src/api/api.ts +++ b/src/api/api.ts @@ -33,6 +33,8 @@ export function getTumor(code) { method: 'get', }); } + +// 新增基因报告 export function addGeneReport(data) { return request({ url: `/api/geneReport/report`, @@ -40,9 +42,17 @@ export function addGeneReport(data) { data, }); } +// 获取基因报告 export function getGeneReport(customerId) { return request({ url: `/api/geneReport/list/${customerId}`, method: 'get', }); } +// 获取存下的细胞列表 +export function getCellList() { + return request({ + url: `/api/support/getCellList`, + method: 'post', + }); +} diff --git a/src/api/equipment.ts b/src/api/equipment.ts index 74a1512..37f5f71 100644 --- a/src/api/equipment.ts +++ b/src/api/equipment.ts @@ -1,11 +1,10 @@ import request from '/@/utils/request'; // import type { ResultData } from './common'; - export function getEquipmentList(data?: object) { return request({ url: '/api/sysEquipment/equipmentList', - data, + data, method: 'post', }); } @@ -13,7 +12,7 @@ export function getEquipmentList(data?: object) { export function add(data?: object) { return request({ url: '/api/sysEquipment/add', - data, + data, method: 'post', }); } @@ -21,7 +20,7 @@ export function add(data?: object) { export function update(data?: object) { return request({ url: '/api/sysEquipment/update', - data, + data, method: 'post', }); } @@ -29,7 +28,14 @@ export function update(data?: object) { export function del(data?: object) { return request({ url: '/api/sysEquipment/delete', - data, + data, + method: 'post', + }); +} +export function list(data?: object) { + return request({ + url: '/api/device/list', + data, method: 'post', }); } diff --git a/src/assets/M9_01.png b/src/assets/M9_01.png index dfba8b0..ac27217 100644 Binary files a/src/assets/M9_01.png and b/src/assets/M9_01.png differ diff --git a/src/assets/M9_02.png b/src/assets/M9_02.png deleted file mode 100644 index a5007be..0000000 Binary files a/src/assets/M9_02.png and /dev/null differ diff --git a/src/assets/star.png b/src/assets/star.png new file mode 100644 index 0000000..177f428 Binary files /dev/null and b/src/assets/star.png differ diff --git a/src/views/HealthLayout/area.vue b/src/views/HealthLayout/area.vue index 6a24cd3..18283ec 100644 --- a/src/views/HealthLayout/area.vue +++ b/src/views/HealthLayout/area.vue @@ -22,7 +22,9 @@
{{val.city}}基地
-
{{city.name}}
+
+ {{city.name}} +
diff --git a/src/views/HealthLayout/cityPostion.js b/src/views/HealthLayout/cityPostion.js index bd21d4e..39d5d24 100644 --- a/src/views/HealthLayout/cityPostion.js +++ b/src/views/HealthLayout/cityPostion.js @@ -224,7 +224,7 @@ export const mockData2 = [ { name: '西湖健康中心', value: 245223 }, ], }, - { city: '南昌', list: [{ name: '南昌健康中心', value: 245223 }] }, + { city: '江西', list: [{ name: '湖口健康中心', value: 245223, url: 'http://hukou.bodk.com.cn/#/' }] }, { city: '厦门', list: [{ name: '厦门健康中心', value: 245223 }] }, { city: '宁波', list: [{ name: '宁波健康中心', value: 245223 }] }, { city: '合肥', list: [{ name: '合肥健康中心', value: 245223 }] }, diff --git a/src/views/HealthLayout/index.vue b/src/views/HealthLayout/index.vue index 2d2f186..8cf1f03 100644 --- a/src/views/HealthLayout/index.vue +++ b/src/views/HealthLayout/index.vue @@ -27,16 +27,16 @@ let height = ref(0); import * as echarts from 'echarts'; import Area from './area.vue'; import { getCityPositionByName, } from './cityPostion' -import { useRouter } from 'vue-router'; -const router = useRouter(); +// import { useRouter } from 'vue-router'; +// const router = useRouter(); // 模拟10条数据 let mockData = [ - { name: '北京', value: 11500 }, - { name: '天津', value: 1200 }, - { name: '河南', value: 2300 }, - { name: '广西', value: 1300 }, - { name: '广东', value: 9300 }, - { name: '河北', value: 5300 }, + // { name: '北京', value: '北京' }, + // { name: '天津', value: 1200 }, + // { name: '河南', value: 2300 }, + { name: '江西', value: '湖口' }, + { name: '广东', value: '松山湖' }, + { name: '湖北', value: '宜昌' }, ]; const state = reactive({ loading: false, @@ -69,7 +69,7 @@ const init = async () => { // }) // }) // console.log(88888, data); - + // echarts.graphic.registerSymbol('star', 'path://M25.6 0L33 9.4l10-1.2c0.9-0.1 1.3 1.1 0.6 1.7l-7.5 6.9 1.8 10c0.1 0.9-0.8 1.6-1.6 1.2L25 25.6l-9.3 4.6c-0.8 0.4-1.7-0.3-1.6-1.2l1.8-10-7.5-6.9c-0.7-0.6-0.3-1.8 0.6-1.7l10 1.2L22.4 0c0.6-0.9 1.8-0.9 2.4 0z') let initMap = echarts.init(document.querySelector('#mapDom')) initMap.on('click', mapClick); initMap.setOption({ @@ -121,8 +121,8 @@ const init = async () => { disabled: true, }, itemStyle: { - areaColor: '#00000000', - borderColor: '#00000000', + areaColor: '#000', + borderColor: '#000', }, }], z: 1, @@ -170,6 +170,57 @@ const init = async () => { z: 2, // data: data, }, + //涟漪特效 + { + type: "effectScatter", + coordinateSystem: "geo", + data:data,//传入的地图点数据 + symbolSize: 6,//涟漪大小 + showEffectOn: "render", + //涟漪效应 + rippleEffect: { + brushType: "stroke", + color: "#fcdd6e", + period: 10,//周期 + scale: 5//规模 + }, + hoverAnimation: true,//悬停动画 + //地图点样式 + itemStyle: { + color: "#fcdd6e", + shadowBlur: 2, + shadowColor: "#333" + }, + //鼠标点击散点的下弹框 + tooltip: { + show: false, + triggerOn:"click", + formatter: function(data1) { + console.log(data1) + let data2 = data1.data; + return `${data2.value[2]}` + } + }, + zlevel: 1 + }, + { + type: "scatter", + coordinateSystem: "geo", + data:[ + {name: '北京', value: ['116.3979471', '39.9081726'] } + ],//传入的地图点数据 + symbol: 'path://M512 40.36l73.41 202.59h211.8l-171.18 124.37 66.18 202.59-171.21-124.39-171.21 124.39 66.18-202.59-171.18-124.37h211.8z', + symbolSize: 20,//涟漪大小 + //地图点样式 + itemStyle: { + color: '#ffde00', + borderColor: '#ff6700', + borderWidth: 2, + shadowBlur: 10, + shadowColor: '#333' + }, + zlevel: 1 + } // { // type: 'scatter', // coordinateSystem: 'geo', @@ -192,7 +243,12 @@ const init = async () => { }) } const mapClick = (item) => { - router.push({name: 'home', query: {name: item.name}}); + if (!item.value) return; + const a = document.createElement('a'); + a.setAttribute('href', 'http://hukou.bodk.com.cn/#/'); + a.setAttribute('target', '_blank'); + a.click(); + // router.push({name: 'home', query: {name: item.name}}); }