xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并代码冲突处理

Browse Source
This commit is contained in:
任珮宇 2024-01-30 16:15:39 +08:00
parent a1ba381170
commit 781a4be8a1
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/stationOperation/components/MapMarker.vue
View File

@ -217,11 +217,7 @@ export default {
// 获取站点详情 // 获取站点详情
async _getStationInfo(stationInfo) { async _getStationInfo(stationInfo) {
try { try {
<<<<<<< HEAD
const { success, result, message } = await getAction('/stationOperation/findInfo', { const { success, result, message } = await getAction('/stationOperation/findInfo', {
=======
const { success, result, message } = await getAction('/armd-station-operation/stationOperation/findInfo', {
>>>>>>> master-dev
stationId: stationInfo.stationId, stationId: stationInfo.stationId,
type: stationInfo.stationType, type: stationInfo.stationType,
}) })

12
src/views/stationOperation/index.vue
View File

@ -253,11 +253,7 @@ export default {
async getStationList() { async getStationList() {
try { try {
this.isGettingDataList = true this.isGettingDataList = true
<<<<<<< HEAD
const res = await getAction('/stationOperation/findList') const res = await getAction('/stationOperation/findList')
=======
const res = await getAction('/armd-station-operation/stationOperation/findList')
>>>>>>> master-dev
res.forEach((item) => { res.forEach((item) => {
const { stationId, stationName, stationType } = item const { stationId, stationName, stationType } = item
item._stationId = `${stationId}${stationName}${stationType}` item._stationId = `${stationId}${stationName}${stationType}`
@ -368,11 +364,7 @@ export default {
async getFollowedStationList() { async getFollowedStationList() {
try { try {
this.isGettingFollowedDataList = true this.isGettingFollowedDataList = true
<<<<<<< HEAD
const res = await getAction('/sysUserFocusStation/findList') const res = await getAction('/sysUserFocusStation/findList')
=======
const res = await getAction('/armd-station-operation/sysUserFocusStation/findList')
>>>>>>> master-dev
this.followedDataList = res this.followedDataList = res
const scrollContainer2Ref = this.$refs.scrollContainer2Ref const scrollContainer2Ref = this.$refs.scrollContainer2Ref
@ -391,11 +383,7 @@ export default {
// 获取站点类型 // 获取站点类型
async getStationTypeList() { async getStationTypeList() {
try { try {
<<<<<<< HEAD
const res = await getAction('/stationOperation/findStationType') const res = await getAction('/stationOperation/findStationType')
=======
const res = await getAction('/armd-station-operation/stationOperation/findStationType')
>>>>>>> master-dev
this.stationTypeList = res.filter((item) => item).map((item) => ({ label: item, value: item })) this.stationTypeList = res.filter((item) => item).map((item) => ({ label: item, value: item }))
} catch (error) { } catch (error) {
console.error(error) console.error(error)