Merge remote-tracking branch 'origin/master'

罗广辉

2025-06-25 5a7be6ac54b1e099eae276f550aa9cc9f3167be8

Merge remote-tracking branch 'origin/master'

 src/views/dataCenter/dataCenter.vue

@@ -124,7 +124,7 @@
          />
          <!-- 地图 -->
          <div
            v-if="dialogDetailList?.resultType === 4"
            v-else-if="dialogDetailList?.resultType === 4"
            id="detaildataCenterMap"
            class="ztzf-cesium"
          ></div>

 src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue

@@ -20,11 +20,11 @@
                            :style="{
                                color:
                                    scope.row.status === 1
                                        ? '#ffe17e'
                                        ? '#00CDC2'
                                        : scope.row.status === 2
                                        ? '#ffa768'
                                        ? '#FF720F'
                                        : scope.row.status === 3
                                        ? '#8effac'
                                        ? '#00AA2D'
                                        : scope.row.status === 5
                                        ? '#FF4848'
                                        : scope.row.status === 7