Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

packages/screen/src/views/RiskWarning/component/ChongqingMap.vue

@@ -50,7 +50,7 @@ import tunnelLineIcon from '../../../assets/MaMap_img/线路icon定位@2x.png'
 import mapInfoDialog from '../Dialog/mapInfoDialog.vue'
 import centerInfoCard from '../Dialog/centerInfoCard.vue'
 import hazardPointSituationDialog from '../Dialog/hazardPointSituationDialog.vue'
-import I from '../../../../dist/cesium/Workers/upsampleVerticesFromCesium3DTilesTerrain'
+// import I from '../../../../dist/cesium/Workers/upsampleVerticesFromCesium3DTilesTerrain'
 
 const mapContainer = ref(null)
 const loading = ref(false)

packages/screen/src/views/WarningManagement/law/index.js

@@ -54,11 +54,8 @@ const columns = [
         label: "预警标题",
     },
     {
-        // prop: "xxx",
+        prop: "weatherWarningType",
         label: "预警类型",
-        formatter: (row) => {
-            return h(ElText, { style: {} }, '大雾预警');
-        }
     },
     {
         prop: "createTime",