想定信息

src/views/subsystem/display/index.vue

@@ -2,7 +2,28 @@
   <Flex fd="co" class="page-display">
     <Flex ai="c" jc="sb" class="page-display-header">
       <span class="page-display-title">显示子系统</span>
-      <span class="page-display-title">推演想定【{{ roomName }}-{{ scenarioName }}】</span>
+      <span class="page-display-title">
+        推演想定【{{ roomName }}-{{ scenarioName }}】
+        <a-popover v-if="scenarioDetail" title="想定信息">
+          <template slot="content">
+            <div>
+              <Flex>
+                <span>开始时间：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.startTime }}</span>
+              </Flex>
+              <Flex>
+                <span>结束时间：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.endTime }}</span>
+              </Flex>
+              <Flex>
+                <span>想定说明：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.mark }}</span>
+              </Flex>
+            </div>
+          </template>
+          <a-button type="text-primary" icon="exclamation-circle"></a-button>
+        </a-popover>
+      </span>
       <span class="page-display-title">剩余 {{ roomInfo.remainTimeStr }}</span>
     </Flex>
     <Grid class="page-display-main flex-1 oh" :rows="['30px', 1]" gap="0px">
@@ -61,6 +82,7 @@ export default {
     async getScenarioDetail() {
       try {
         const res = await getAction(`/baseData/scenario/${this.scenarioId}`)
+        this.scenarioDetail = res.data
         const {
           leftUpLng,
           leftUpLat,

src/views/subsystem/model/index.vue

@@ -2,7 +2,28 @@
   <Flex fd="co" class="page-model">
     <Flex ai="c" jc="sb" class="page-model-header">
       <span class="page-scene-title">场景编辑子系统</span>
-      <span class="page-scene-title">推演想定【{{ roomName }}-{{ scenarioName }}】</span>
+      <span class="page-scene-title">
+        推演想定【{{ roomName }}-{{ scenarioName }}】
+        <a-popover v-if="scenarioDetail" title="想定信息">
+          <template slot="content">
+            <div>
+              <Flex>
+                <span>开始时间：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.startTime }}</span>
+              </Flex>
+              <Flex>
+                <span>结束时间：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.endTime }}</span>
+              </Flex>
+              <Flex>
+                <span>想定说明：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.mark }}</span>
+              </Flex>
+            </div>
+          </template>
+          <a-button type="text-primary" icon="exclamation-circle"></a-button>
+        </a-popover>
+      </span>
       <span class="page-scene-title">剩余 {{ roomInfo.remainTimeStr }}</span>
     </Flex>
     <Grid class="page-model-main flex-1 oh" :columns="['320px', 1, '320px']" :rows="['30px', 1]" gap="0px">
@@ -205,7 +226,7 @@ export default {
         case 'xdrw':
           return [1, 1, 8]
         default:
-          return [4, 3, 3]
+          return [2, 4, 4]
       }
     },
     blbzShowKeys() {
@@ -255,6 +276,7 @@ export default {
     async getScenarioDetail() {
       try {
         const res = await getAction(`/baseData/scenario/${this.scenarioId}`)
+        this.scenarioDetail = res.data
         const {
           leftUpLng,
           leftUpLat,
@@ -285,7 +307,11 @@ export default {
             this.roomInfo.duringTime = response.data.during_time
             break
           case 'path_init':
-            this.cesium.drawRouteByCoordinates(response.data.points, response.data.resourceId, ['red', 'blue'][response.data.teamType])
+            this.cesium.drawRouteByCoordinates(
+              response.data.points,
+              response.data.resourceId,
+              ['red', 'blue'][response.data.teamType]
+            )
             break
           case 'path_update':
             this.cesium.movePlotByCoordinates(response.data.resourceId, response.data.points)

src/views/subsystem/scene/components/Zzxd.vue

@@ -108,6 +108,11 @@ export default {
       },
     }
   },
+  watch: {
+    resourceId() {
+      this.checkedAction = null
+    },
+  },
   methods: {
     handleOpenAddModal({ key: taskType }) {
       this.AEModal.formItems = this.actionTypeMapFormItemProps[taskType].map((p) =>

src/views/subsystem/scene/index.vue

@@ -2,7 +2,27 @@
   <Flex fd="co" class="page-scene">
     <Flex ai="c" jc="sb" class="page-scene-header">
       <span class="page-scene-title">场景编辑子系统</span>
-      <span class="page-scene-title">推演想定【{{ roomName }}-{{ scenarioName }}】</span>
+      <span class="page-scene-title">
+        推演想定【{{ roomName }}-{{ scenarioName }}】<a-popover v-if="scenarioDetail" title="想定信息">
+          <template slot="content">
+            <div>
+              <Flex>
+                <span>开始时间：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.startTime }}</span>
+              </Flex>
+              <Flex>
+                <span>结束时间：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.endTime }}</span>
+              </Flex>
+              <Flex>
+                <span>想定说明：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.mark }}</span>
+              </Flex>
+            </div>
+          </template>
+          <a-button type="text-primary" icon="exclamation-circle"></a-button>
+        </a-popover>
+      </span>
       <span class="page-scene-title">剩余 {{ roomInfo.remainTimeStr }}</span>
     </Flex>
     <Grid class="page-scene-main flex-1 oh" :columns="['320px', 1, '320px']" :rows="['30px', 1]" gap="0px">
@@ -169,7 +189,7 @@ export default {
         case 'xdrw':
           return [1, 1, 8]
         default:
-          return [4, 3, 3]
+          return [2, 4, 4]
       }
     },
     blbzShowKeys() {
@@ -219,6 +239,7 @@ export default {
     async getScenarioDetail() {
       try {
         const res = await getAction(`/baseData/scenario/${this.scenarioId}`)
+        this.scenarioDetail = res.data
         const {
           leftUpLng,
           leftUpLat,
@@ -249,7 +270,11 @@ export default {
             this.roomInfo.duringTime = response.data.during_time
             break
           case 'path_init':
-            this.cesium.drawRouteByCoordinates(response.data.points, response.data.resourceId, ['red', 'blue'][response.data.teamType])
+            this.cesium.drawRouteByCoordinates(
+              response.data.points,
+              response.data.resourceId,
+              ['red', 'blue'][response.data.teamType]
+            )
             break
           case 'path_update':
             this.cesium.movePlotByCoordinates(response.data.resourceId, response.data.points)

src/views/subsystem/scene/presetting.vue

@@ -2,7 +2,28 @@
   <Flex fd="co" class="page-scene-presetting">
     <Flex ai="c" jc="sb" class="page-scene-presetting-header">
       <span class="page-scene-presetting-title">场景编辑子系统</span>
-      <span class="page-scene-presetting-title">编辑想定【{{ scenarioId }}-{{ scenarioName }}】</span>
+      <span class="page-scene-presetting-title">
+        编辑想定【{{ scenarioId }}-{{ scenarioName }}】
+        <a-popover v-if="scenarioDetail" title="想定信息">
+          <template slot="content">
+            <div>
+              <Flex>
+                <span>开始时间：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.startTime }}</span>
+              </Flex>
+              <Flex>
+                <span>结束时间：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.endTime }}</span>
+              </Flex>
+              <Flex>
+                <span>想定说明：</span>
+                <span style="max-width: 200px">{{ scenarioDetail.mark }}</span>
+              </Flex>
+            </div>
+          </template>
+          <a-button type="text-primary" icon="exclamation-circle"></a-button>
+        </a-popover>
+      </span>
       <span class="page-scene-presetting-title" style="color: transparent">场景编辑子系统</span>
     </Flex>
     <Grid class="page-scene-presetting-main flex-1 oh" :columns="['320px', 1, '320px']" :rows="['30px', 1]" gap="0px">
@@ -238,7 +259,7 @@ export default {
         case 'xdrw':
           return [1, 1, 8]
         default:
-          return [4, 3, 3]
+          return [2, 4, 4]
       }
     },
     showBlbzCheckedTreeData() {
@@ -276,6 +297,7 @@ export default {
     async getScenarioDetail() {
       try {
         const res = await getAction(`/baseData/scenario/${this.scenarioId}`)
+        this.scenarioDetail = res.data
         const {
           leftUpLng,
           leftUpLat,