Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

src/packages/components/Decorates/Titles/Weather/index.vue

@@ -14,7 +14,10 @@
         </div>
       </div>
       <div class="wind-speed">
-        <span style="margin-right: 25px;">{{`风速：${windPower}m/s`}}</span>{{`风向： ${winddirection}`}}</div>
+        <Icon style="font-size: 35px;" icon="mdi:weather-windy" />&nbsp;
+        <span style="margin-right: 25px;">{{`${windPower}m/s`}}</span>
+        <Icon style="font-size: 35px;" icon="mdi:windsock" />&nbsp;
+        {{`${winddirection}`}}</div>
     </div>
   </template>
   
@@ -24,6 +27,7 @@
   import dayjs from 'dayjs';
   import { CreateComponentType } from '@/packages/index.d';
   import { GoIconify } from '@/components/GoIconify';
+  import Icon from '@/components/Icon/Icon.vue';
   const props = defineProps({
     chartConfig: {
       type: Object as PropType<CreateComponentType>,

src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue

@@ -17,7 +17,7 @@
         v-for="(item, index) in sectionDatas"
         @click="handlerFireDetail(item)"
       >
-        <div class="flex jc-sb">
+        <div class="flex jc-sb ai-c" style="height: 27px;">
           <div class="titleText">{{ item.describe }}</div>
           <div class="mr-2 desStyle">{{ item.degreeType }}</div>
         </div>
@@ -389,6 +389,7 @@ const getFileImage = (type) => {
       height: calc(100% - 40px);
       margin-left: 4%;
       overflow: auto;
+      padding-right: 5px;
       img {
         width: 21px;
         height: 21px;
@@ -397,6 +398,7 @@ const getFileImage = (type) => {
         width: 15px;
         height: 15px;
         margin-left: 3px;
+        margin-right: 10px;
       }
     }
     .sectionLi {
@@ -410,7 +412,9 @@ const getFileImage = (type) => {
       text-overflow: ellipsis;
       white-space: nowrap;
       color: v-bind('titleColor');
-      font-size: v-bind('titleSize+"px"');
+      // font-size: v-bind('titleSize+"px"');
+      font-size: 14px;
+      font-weight: 600;
     }
     .dataStyle {
       font-size: 14px;
@@ -434,6 +438,9 @@ const getFileImage = (type) => {
     .desStyle {
       color: v-bind('desColor');
       font-size: v-bind('desSize+"px"');
+      display: flex;
+      align-items: center;
+      height: 100%;
     }
     .desImg {
       margin-right: 10px;
@@ -445,7 +452,7 @@ const getFileImage = (type) => {
       margin-right: 6px;
     }
     .mt-1 {
-      margin-top: 8px;
+      // margin-top: 8px;
     }
 
 

src/packages/components/Equipment/Equipment/WuRenJi/config.ts

@@ -19,6 +19,5 @@ export default class Config extends PublicConfigClass implements CreateComponent
   public attr = { ...chartInitConfig, w: 117, h: 168, zIndex: 1 }
   public chartConfig = cloneDeep(WuRenJiConfig)
   public option = cloneDeep(option)
-  public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from ' }, }
   public filter = "return res.result;"
 }

src/packages/components/Equipment/Equipment/WuRenJi/index.vue

@@ -38,9 +38,8 @@ onMounted(() => {
   })
 })
  // 数据callback处理（预览时触发）
- useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => {
+  // useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => {
-//   props.chartConfig.option.dataset = resData;
+  // });
-});
 
 const chartEditStore = useChartEditStore();
 

src/packages/components/Tasks/Tasks/TaskBanner/index.vue

@@ -12,7 +12,7 @@
     <div class="flex column sectionsbox">
       <div class="flex mt-1" v-for="item in dataset.data">
         <div class="flex ai-c jc-c tasktitlesbox">
-          <div class="dots"></div>
+          <!-- <div class="dots"></div> -->
           <div class="titleText">{{ item.title }}</div>
         </div>
         <div class="desStyle">{{ item.desc }}</div>
@@ -162,7 +162,7 @@ const handlerShowColumns = ()=> {
     margin: 0 auto;
   }
   .tasktitlesbox{
-    width: 120px;
+    width: 90px;
     height: 30px;
   }
   .dots{
@@ -175,6 +175,11 @@ const handlerShowColumns = ()=> {
   .titleText{
     color: v-bind('titleColor');
     font-size: v-bind('titleSize+"px"');
+    width: 72px;
+    text-align: right;
+    margin-right: 10px;
+    color: #9aa4af;
+    flex-shrink: 0;
   }
   .desStyle{
     width: calc(100% - 120px);

src/packages/components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="resource-analysis-report-content">
-    <div class="lnglat-div" v-if="clueInfo.lng && clueInfo.lat">线索地点：{{ `${clueInfo.lng}°E` }}, {{ `${clueInfo.lat}°N` }}</div>
+    <div class="lnglat-div" v-if="clueInfo.lng && clueInfo.lat">线索地点：{{ `${clueInfo.lng.toFixed(6)}°E` }}, {{ `${clueInfo.lat.toFixed(6)}°N` }}</div>
     <div class="lnglat-div" v-else></div>
     <div class="count-div">
       <div class="scope-count">

src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/config.ts

@@ -24,18 +24,6 @@ export const option = {
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key = ZhiGan_DroneListConfig.key
   public attr = { ...chartInitConfig, w: 506, h: 378, zIndex: -1 }
-  public request = {
-    ...requestSqlConfig,
-    requestHttpType: "get",
-    requestContentType: 0,
-    requestUrl: VITE_GLOB_API_URL_SITUATION+"/api/Manage/GetUavPageList",
-    requestParams: {
-      Params: {
-        page: "1",
-        limit: "999"
-      }
-    }
-  }
   public filter = "return res.result.items;"
   public chartConfig = cloneDeep(ZhiGan_DroneListConfig)
   public option = cloneDeep(option)

src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/index.vue

@@ -67,7 +67,6 @@
     if (!getClient() || !getClient().connected) {
       // createConnection();
     }
-     // 获取eventBus传过来的值
     GetUavPageList().then(resData => {
       option.dataset = resData.items;
       resData.items.forEach(item => {
@@ -99,9 +98,9 @@
     }, 1000);
   });
 
-  // 数据callback处理（预览时触发）
+  // // 数据callback处理（预览时触发）
-  useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => {
+  // useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => {
-  });
+  // });
   const flyControl = (item) => {
     activeDrone.value = item.id
     airPortStoreVal.setAirPort('sn', item.psn);

src/router/routes/modules/bigscreen.ts

@@ -26,4 +26,4 @@ const bigscreen: AppRouteModule = {
   ],
 };
 
-export default bigscreen;
+// export default bigscreen;

src/router/routes/modules/dashboard.ts

@@ -11,13 +11,14 @@ const dashboard: AppRouteModule = {
   meta: {
     orderNo: 10,
     icon: 'ion:grid-outline',
-    title: t('routes.dashboard.dashboard'),
+    title: '首页',
   },
   children: [
     {
       path: '/dashboard/analysis',
       name: 'Analysis',
       meta: {
+        icon: 'material-symbols:house-outline-rounded',
         title: t('routes.dashboard.analysis'),
       },
       component: () => import('@/views/home/index.vue'),