Merge branch 'master' of ssh://114.215.109.124:29418/underway-vue

riku

2025-11-05 ba7065fdcf6fe48d002908a1a7666a480e805021

Merge branch 'master' of ssh://114.215.109.124:29418/underway-vue

 src/api/index.js

@@ -13,10 +13,10 @@
}

if (debug) {
  ip1 = 'http://192.168.0.103:8084/';
  // ip1 = 'http://localhost:8084/';
  ws = `192.168.0.103:9031`;
  // ws = `localhost:9031`;
  // ip1 = 'http://192.168.0.103:8084/';
  ip1 = 'http://localhost:8084/';
  // ws = `192.168.0.103:9031`;
  ws = `localhost:9031`;
}

const $http = axios.create({

 src/views/historymode/component/MissionReport.vue

@@ -450,6 +450,7 @@
              _title: _riskRegion,
              _factorNames: Object.keys(clue.pollutedData.statisticMap)
                .map((e) => factorName[e])
<<<<<<< HEAD
                .join('、'),
              _date: moment(clue.pollutedData.startTime).format('YYYY-MM-DD'),
              _time:
@@ -533,6 +534,82 @@
          //       })
          //     };
          //   })
=======
                .join('、');
              return {
                index: index2 + 1,
                factor: factorNames,
                clues: clues2.map((item3, index3) => {
                  const clue = item3.clue;
                  let _riskRegion = '';
                  if (
                    parseInt(clue.pollutedArea.distance) <
                    parseInt(clue.pollutedArea.distance2)
                  ) {
                    if (
                      clue.pollutedArea.address.indexOf(
                        clue.pollutedArea.streetNumber
                      ) == -1
                    ) {
                      _riskRegion +=
                        (clue.pollutedArea.address ?? '') +
                        '（' +
                        (clue.pollutedArea.street ?? '') +
                        (clue.pollutedArea.streetNumber ?? '') +
                        (clue.pollutedArea.direction ?? '') +
                        '）';
                    } else {
                      _riskRegion = clue.pollutedArea.address;
                    }
                  } else {
                    _riskRegion +=
                      (clue.pollutedArea.address ?? '') +
                      '（' +
                      (clue.pollutedArea.street ?? '') +
                      (clue.pollutedArea.roadinter ?? '') +
                      '）';
                  }
                  return {
                    index: index3 + 1 + '',
                    showPollutedArea: formObj.value.showPollutedArea,
                    _title:
                      // (clue.pollutedArea.street ?? '') +
                      // (clue.pollutedArea.streetNumber ?? '') +
                      // (clue.pollutedArea.direction ?? ''),
                      clue.pollutedArea.address ?? '',
                    _factorNames: Object.keys(clue.pollutedData.statisticMap)
                      .map((e) => factorName[e])
                      .join('、'),
                    _time:
                      moment(clue.pollutedData.startTime).format(
                        'YYYY-MM-DD HH:mm:ss'
                      ) +
                      ' - ' +
                      moment(clue.pollutedData.endTime).format('HH:mm:ss'),
                    _riskRegion: _riskRegion,
                    _exceptionType: clue.pollutedData.exception,
                    _images: generateChartImg(clue.pollutedData),
                    _conclusion: clue.pollutedSource.conclusion,
                    _hasScene: clue.pollutedSource.sceneList.length > 0,
                    // _scenes:
                    //   clue.pollutedSource.sceneList.length > 0
                    //     ? clue.pollutedSource.sceneList
                    //         .map(
                    //           (s, index) =>
                    //             `${index + 1}. ${s.name}，${s.type}，位于${s.location}，距${s.closestStation.name}${parseInt(s.length)}米；`
                    //         )
                    //         .join('\r\n')
                    //     : '无',
                    _scenes: clue.pollutedSource.sceneList.map((s, index) => {
                      return {
                        des: `${index + 1}. ${s.name}，${s.type}，位于${s.location}，距${s.closestStation.name}${parseInt(s.length)}米；`
                      };
                    })
                  };
                })
              };
            })
>>>>>>> ce17d42203a17120736d796d0e83b3742c4ec441
        };
      });
  });