软件状态和台站 编报项目

src/views/alarm/gis/index.vue

@@ -16,7 +16,7 @@
                   <el-icon class="el-input__icon"><search /></el-icon>
                 </template>
           </el-select>
-        </el-form-item> 
+        </el-form-item>
 
         <el-form-item label="所属基地：" prop="base">
           <el-select v-model="searchParam.base" placeholder="请选择" style="width: 200px">
@@ -27,15 +27,15 @@
         <el-form-item><div class="lv-state">设备正常3</div></el-form-item>
         <el-form-item><div class="hong-state">设备故障2</div></el-form-item>
         <el-form-item><div class="cheng-state">危险天气1{{ info.one }}</div></el-form-item> <!-- 操作1     -->
-        
+
         <!-- 基本信息 -->
         <el-form-item>
-          <el-popover 
-            v-model="visible" 
+          <el-popover
+            v-model="visible"
             @show="handleShowChange"
-            @hide="handleHideChange" 
-            placement="bottom" 
-            :width="200" 
+            @hide="handleHideChange"
+            placement="bottom"
+            :width="200"
             trigger="click">
             <el-checkbox-group v-model="checkList">
               <!--鹰眼  -->
@@ -54,7 +54,7 @@
                   size="large"
                   v-model="showNineGrid"
                     inline-prompt
-                    active-text="开九宫格"    
+                    active-text="开九宫格"
                     inactive-text="关九宫格"
                 />
               </el-form-item>
@@ -87,7 +87,7 @@
                     active-text="街道地图"
                     inactive-text="关闭"
                 />
-              </el-form-item>             
+              </el-form-item>
             </el-checkbox-group>
             <template #reference>
               <div :class="visible ? 'hei-state-primary' : 'hei-state'">基本功能</div>
@@ -95,7 +95,7 @@
           </el-popover>
         </el-form-item>
 
-      </el-form>      
+      </el-form>
       <!-- 右侧功能栏 -->
       <div class="header-button-ri">
         <el-popover
@@ -119,7 +119,7 @@
                 <template v-for="item in elementList" :key="item.id"  >
                   <div v-if="item.data_type==='温湿度'"  :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)" >{{item.data_name}}</div>
                 </template>
-              </div>  
+              </div>
             </el-tab-pane>
 
             <!-- 气压 -->
@@ -134,7 +134,7 @@
                 <template v-for="item in elementList" :key="item.id"  >
                   <div v-if="item.data_type==='气压'"  :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)" >{{item.data_name}}</div>
                 </template>
-              </div>  
+              </div>
             </el-tab-pane>
 
             <!-- 湿度 -->
@@ -149,9 +149,9 @@
                 <template v-for="item in elementList" :key="item.id"  >
                   <div v-if="item.data_type==='温湿度'"  :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)" >{{item.data_name}}</div>
                 </template>
-              </div>  
+              </div>
             </el-tab-pane>
-           
+
             <!-- 风 -->
             <el-tab-pane>
               <template #label>
@@ -167,19 +167,19 @@
               </div>
             </el-tab-pane>
 
-            <!-- 降雨 -->   
+            <!-- 降雨 -->
             <el-tab-pane>
               <template #label>
                 <div class="gis-c">
                   <span>降雨</span>
                   <img class="gis-icon" src="../../../assets/images/rainfall.svg">
                 </div>
-              </template>              
+              </template>
               <div class="container-tag" style="overflow-y:auto; height:300px ">
                 <template v-for="item in elementList" :key="item.id"  >
                   <div v-if="item.data_type==='降水'"  :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)" >{{item.data_name}}</div>
                 </template>
-              </div>             
+              </div>
 
             </el-tab-pane>
 
@@ -196,7 +196,7 @@
                 <template v-for="item in elementList" :key="item.id"  >
                   <div v-if="item.data_type==='云'"  :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)" >{{item.data_name}}</div>
                 </template>
-              </div>  
+              </div>
             </el-tab-pane>
 
             <!-- 能见度 -->
@@ -211,7 +211,7 @@
                 <template v-for="item in elementList" :key="item.id"  >
                   <div v-if="item.data_type==='能见度'"  :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)" >{{item.data_name}}</div>
                 </template>
-              </div>  
+              </div>
             </el-tab-pane>
 
             <!-- 天气现象 -->
@@ -226,7 +226,7 @@
                 <template v-for="item in elementList" :key="item.id"  >
                   <div v-if="item.data_type==='天气现象'"  :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)" >{{item.data_name}}</div>
                 </template>
-              </div>  
+              </div>
             </el-tab-pane>
           </el-tabs>
           <template #reference>
@@ -238,8 +238,8 @@
           </template>
         </el-popover>
       </div>
-    </div>  
-    
+    </div>
+
     <!-- 地图与经纬度显示区域 -->
     <div id="map" class="map" style="width: 100%; height: 100vh;">
       <!-- 九宫格盒子 -->
@@ -248,13 +248,13 @@
           {{ value }}
         </div>
       </div>
-      
+
     </div>
- 
-    <div id="mouse-position" class="mouse-position">经纬度: </div>    
+
+    <div id="mouse-position" class="mouse-position">经纬度: </div>
 
     <!-- 地图底部控制栏 -->
-    <div class="gis-bottom-box">  
+    <div class="gis-bottom-box">
       <div class="gis-bottom-item">
         <div class="button-bg" @click="isPlay=!isPlay">
           <img v-if="isPlay" class="button-bg-c" style="margin-left: 3px"  src="../../../assets/images/stop.svg"/>
@@ -295,14 +295,15 @@
       <div class="gis-bottom-item">
         <div class="gis-bottom-hei-state">当前时间 {{formatTooltip(value2)}}</div>
       </div>
-    </div>   
+    </div>
   </div>
-  
+
 
 </template>
 
   <script setup lang="ts">
   import { ref, reactive, onMounted } from "vue";
+  import imglogo from '/src/assets/images/logo.svg'
   import 'ol/ol.css';
   import TileLayer from 'ol/layer/Tile';
   import OverviewMap from 'ol/control/OverviewMap';
@@ -334,13 +335,13 @@
 
 
   const showNineGrid = ref(false); // 控制九宫格显示与否
-  const dataValues = ref(Array(9).fill(0)); // 替换为实际的数据 
+  const dataValues = ref(Array(9).fill(0)); // 替换为实际的数据
   const currentStationIndex = ref(0); // 选择的站点索引
   // const stationCoordinates = { longitude: 116.397128, latitude: 39.916527 }; // 示例经纬度（北京天安门）
 
   // 存储站点的经纬度和数据值
   const stations = ref([
-    { lat: 34.638163632, lon: 116.426066261, value: 10 }, 
+    { lat: 34.638163632, lon: 116.426066261, value: 10 },
     { lat: 34.638263632, lon: 116.426166261, value: 20 },
     { lat: 34.638363632, lon: 116.426266261, value: 30 },
     // 继续添加其他站点
@@ -400,10 +401,10 @@
   const checkList = ref(['Value selected and disabled', 'Value A']);
   const isPlay = ref(true);
   const isEagleEyeOn = ref(true); // 鹰眼开关状态
-  const isjGG = ref(false); // 九宫格开关状态 默认关闭  
-  const isboxDrawn = ref(false); // 框选开关状态 默认关闭  boxDrawn 
+  const isjGG = ref(false); // 九宫格开关状态 默认关闭
+  const isboxDrawn = ref(false); // 框选开关状态 默认关闭  boxDrawn
   const isstationName = ref(false); // 站名开关状态 默认关闭  isstationName
-  const isstreet = ref(true); // 街道地图开关状态 默认关闭  
+  const isstreet = ref(true); // 街道地图开关状态 默认关闭
   const searchParam = reactive({ base: undefined, station: undefined });
   const baseOptions = ref([{ value: 0, label: '基地1' }, { value: 1, label: '基地2' }]);
   const stationOptions = ref([{ value: 0, label: 'M1986' }, { value: 1, label: 'M1987' }]);
@@ -419,14 +420,14 @@
   const getPlatforms = async () => {
     try{
       const { data } = await getPlatformList(queryas.value);
-      platformList.value = data.list;    
-      console.log("platformList.value:",+ platformList.value); // 在控制台输出平台列表    
+      platformList.value = data.list;
+      console.log("platformList.value:",+ platformList.value); // 在控制台输出平台列表
 
       getStations(data.list);
       // console.log("打印data.list的数据：",+data.list)
     }catch(error){
       console.log("获取平台列表失败：",error)
-    }    
+    }
   };
 
   const pageable = ref<any>({
@@ -446,7 +447,7 @@
       const { data } = await getDataItemList(pageable.value); // 假设此函数调用成功并返回数据
       processTableData.value = data.list || []; //保证processTableData不会为null
       getStations(platformList.value);  //更新getStation更新站点
-      
+
       return data.list; // 确保返回数据
     } catch (error) {
       console.error("获取数据时出错:", error);
@@ -454,17 +455,17 @@
     }
   };
 
-  // 地图台站信息标注 
+  // 地图台站信息标注
   const getStations = (stations) => {
-    console.log(stations,'getstation2');  
-    
+    console.log(stations,'getstation2');
+
     stationSource.clear();  // 清除之前的站点标记
     stations.forEach(station => {
-      console.log(processTableData.value,'11');    
-    
+      console.log(processTableData.value,'11');
+
       if (station.as_lon && station.as_lat) {
       const result = processTableData.value.find(item => item.as_code === station.as_code)
-      console.log(result,'......result');    
+      console.log(result,'......result');
 
         const latitude = parseFloat(station.as_lat.replace('N', ''));
         const longitude = parseFloat(station.as_lon.replace('E', ''));
@@ -503,7 +504,7 @@
         // 设置站点图标和文字样式
         feature.setStyle(new Style({
           image: new Icon({
-            src: '/src/assets/images/logo.svg',  // 图标路径
+            src: imglogo,  // 图标路径
             scale: 0.008,
           }),
           text: new Text({
@@ -518,8 +519,8 @@
 
         // 将站点特征添加到站点源
         stationSource.addFeature(feature);
-        
-      } 
+
+      }
     });
   };
 
@@ -601,7 +602,7 @@ const initializeMap = () => {
     view: view
   });
 
- 
+
   // 定义鹰眼视图层
   const overviewMapLayer = new TileLayer({
     source: new TileWMS({
@@ -623,7 +624,7 @@ const initializeMap = () => {
     layers: [overviewMapLayer]
   });
   map.addControl(overviewMapControl);
-  
+
   // 显示小数点经纬度
   map.on('pointermove', (evt) => {
       // const [lon, lat] = toLonLat(map.getCoordinateFromPixel(evt.pixel));
@@ -636,8 +637,8 @@ const initializeMap = () => {
 watch(isEagleEyeOn, (newValue) => {
   overviewMapControl.setCollapsed(!newValue);
 });
-// 鹰眼图层的初始化  
-const initializeOverviewMap = () => {   
+// 鹰眼图层的初始化
+const initializeOverviewMap = () => {
   const overviewMapLayer = new TileLayer({
     source: new TileWMS({
       url: 'http://192.168.43.77:8080/geoserver/wms',
@@ -651,7 +652,7 @@ const initializeOverviewMap = () => {
       serverType: 'geoserver'
     })
   })
-};   
+};
 
 // 查询所有人工要素字典表
 const elementList =ref<any>([])
@@ -663,10 +664,10 @@ const getAllRgDataList = async () => {
 
 // 存放选中要素列表
 const copiedCustomizeColumns = ref<any>([]);
-// 要素的选中和取消  
+// 要素的选中和取消
 const toggleSelection = (item) => {
   item.isSelected = !item.isSelected;
-  
+
   if (item.isSelected) {
     // 添加选中的要素
     copiedCustomizeColumns.value.push(item);
@@ -686,11 +687,11 @@ const toggleSelection = (item) => {
 
 };
 
-  // 在组件挂载时初始化地图 
+  // 在组件挂载时初始化地图
   onMounted(() => {
     getAllRgDataList(); // 存放人工选择的要素列表
     initializeMap();
-    getPlatforms();    
+    getPlatforms();
   });
 
 </script>
@@ -706,7 +707,7 @@ const toggleSelection = (item) => {
 </style>
 
 <style scoped>
-.map { 
+.map {
   width: 100%;
   /* height: 100vh; */
   height: calc(100vh - 50px); /* 使用 calc() 来确保地图占满视口高度，减去上方的固定高度 */
@@ -739,25 +740,25 @@ const toggleSelection = (item) => {
 }
 
 
-.slider-scale { 
-  width: 720px; 
-  margin-top: -10px; 
+.slider-scale {
+  width: 720px;
+  margin-top: -10px;
 }
 
 .gis-bottom-box {
-  display: flex; 
-  align-items: center; 
+  display: flex;
+  align-items: center;
   }
 
 /* 经纬度所在位置 */
 .mouse-position {
-  position: absolute; 
-  bottom: 0px; 
-  right: 1px; 
-  background-color: rgba(255, 255, 255, 0.7); 
-  padding: 3px; 
-  border: 1px solid #ccc; 
-  font-size: 14px; 
-  z-index: 1000; 
+  position: absolute;
+  bottom: 0px;
+  right: 1px;
+  background-color: rgba(255, 255, 255, 0.7);
+  padding: 3px;
+  border: 1px solid #ccc;
+  font-size: 14px;
+  z-index: 1000;
 }
 </style>

src/views/alarm/software/index.vue

@@ -4,12 +4,12 @@
       <!-- 表格头部 操作按钮 -->
       <div class="table-header">
         <div class="header-button-lf">
-          <el-form :model="queryParams" label-width="auto"  :inline="true">
-            <el-form-item label="应用:">
-               <el-input v-model="queryParams.app" style="width: 200px" placeholder="请输入应用" />
-            </el-form-item>
+          <el-form :model="pageable" label-width="auto"  :inline="true">
             <el-form-item label="名称:">
-              <el-input v-model="queryParams.name" style="width: 200px" placeholder="请输入名称" />
+              <el-input v-model="pageable.processName" style="width: 200px" placeholder="请输入名称" />
+            </el-form-item>
+            <el-form-item label="应用:">
+               <el-input v-model="pageable.programName" style="width: 200px" placeholder="请输入应用" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="handleQuery"> 查询 </el-button>
@@ -19,10 +19,10 @@
         </div>
       </div>
       <!-- 表格主体 -->
-      <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small">
+      <el-table stripe ref="tableRef" :border="true" :data="showList"  size="small">
         <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true" >
           <template #default="scope">
-            {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+            {{ (pageable.pageNum - 1) * pageable.pageSize + scope.$index + 1 }}
           </template>
         </el-table-column>
         <template v-for="item in columns" :key="item">
@@ -47,84 +47,108 @@
 
 <script setup lang="ts" name="useProTable">
 import Pagination from "@/components/ProTable/components/Pagination.vue";
-import { ref, reactive } from "vue";
+import {ref, reactive, onMounted, computed} from "vue";
 import { ColumnProps } from "@/components/ProTable/interface";
+import {getQueryAllSysItem} from "@/api/modules/allData";
+
+//原始数据源
+const dataList = ref([])
 const pageable = ref<any>({
+  programName:'',
+  processName:'',
   pageNum: 1,
   pageSize: 20,
   total: 0
 });
 
-const queryParams = ref({
-  app:'',
-  name:'',
-  pageNum: 1,
-  pageSize: 20,
-  total: 0
+// 计算属性，根据分页参数和查询条件计算当前页的数据范围
+const showList = computed(() => {
+  // 过滤数据
+  const filteredData = dataList.value.filter(item => {
+    return (!pageable.value.programName || item.programName.includes(pageable.value.programName)) &&
+      (!pageable.value.processName || item.processName.includes(pageable.value.processName));
+  });
+
+  // 更新总数
+  pageable.value.total = filteredData.length;
+
+  // 计算当前页的数据范围
+  const start = (pageable.value.pageNum - 1) * pageable.value.pageSize;
+  const end = start + pageable.value.pageSize;
+  // 根据分页参数截取数据
+  return filteredData.slice(start, end);
 });
 
 // 查询功能
 const handleQuery = () => {
-  queryParams.value.pageNum = 1;
+  pageable.value.pageNum = 1; // 重置到第一页
 };
 
-//搜索功能
+// 重置功能
 const resetQuery = () => {
-  queryParams.value.pageNum = 1;
+  pageable.value.programName = ''; // 清除查询条件
+  pageable.value.processName = '';
+  pageable.value.pageNum = 1; // 重置到第一页
 };
 
-/**
- * @description 每页条数改变
- * @param {Number} val 当前条数
- * @return void
- * */
+// 每页条数改变
 const handleSizeChange = (val: number) => {
-  console.log(val);
+  pageable.value.pageSize = val;
 };
 
-/**
- * @description 当前页改变
- * @param {Number} val 当前页
- * @return void
- * */
+// 当前页改变
 const handleCurrentChange = (val: number) => {
-  console.log(val);
+  pageable.value.pageNum = val;
 };
 
-const processTableData = ref([
-  // {
-  //   id: "681913747276782417",
-  //   a: "Redis 4.0.9",
-  //   b: "Redis 4.0.9",
-  //   c: "334221",
-  //   d: "1.17M",
-  //   e: "0%",
-  //   f: "/usr/local/redis/redis-4.0.9",
-  //   g: "5118.01G",
-  //   h: "正常"
-  // },
-  // {
-  //   id: "681913747276782417",
-  //   a: "jeecg-boot",
-  //   b: "jeecg-boot",
-  //   c: "334221",
-  //   d: "1.17M",
-  //   e: "0%",
-  //   f: "/usr/local/redis/redis-4.0.9",
-  //   g: "7118.01G",
-  //   h: "正常"
-  // }
-]);
-
 // 表格配置项
 const columns = reactive<ColumnProps[]>([
-  { prop: "a", label: "名称" },
-  { prop: "b", label: "应用" },
-  { prop: "c", label: "PID" },
-  { prop: "d", label: "内存" },
-  { prop: "e", label: "CPU" },
-  { prop: "f", label: "所在盘符" },
-  { prop: "g", label: "硬盘空间"},
-  { prop: "h", label: "状态",width:100},
+  { prop: "processName", label: "名称" },
+  { prop: "programName", label: "应用" },
+  { prop: "processId", label: "PID" },
+  { prop: "cpuUsage", label: "内存" },
+  { prop: "memoryUsage", label: "CPU" },
+  { prop: "status", label: "状态",width:100},
 ]);
+
+const processData = ref([]);
+
+const getList= async ()=>{
+  const { data } = await getQueryAllSysItem();
+  processData.value = data.list
+  processData.value.forEach(function(item) {
+    if(item.item_key==='24'||item.item_key==='25'||item.item_key==='26'||item.item_key==='27'){
+      const values = item.item_value.split('|');
+      const obj = {
+        processName: values[0],
+        programName: values[1],
+        processId: values[2],
+        cpuUsage: values[4],
+        memoryUsage: values[3],
+        statusUpdateTime: new Date(parseInt(values[5]) * 1000), // 将时间戳转换为 Date 对象
+        status:''
+      };
+
+      // 获取当前时间
+      const currentTime = new Date();
+      // 计算时间差（以毫秒为单位）
+      const timeDifference = currentTime - obj.statusUpdateTime;
+      // 判断是否超过3分钟（3分钟 = 3 * 60 * 1000 毫秒）
+      if (timeDifference > 3 * 60 * 1000) {
+        obj.status = '停止中';
+      } else {
+        obj.status = '运行中';
+      }
+      dataList.value.push(obj);
+    }
+  })
+  pageable.value.total = dataList.value.length
+}
+
+
+
+onMounted(() => {
+  getList()
+});
+
 </script>

src/views/system/stations/components/newspapers.vue

@@ -20,10 +20,10 @@
         <el-radio-group v-model="searchPktFmt" style="width: 100%" @change="searchPktTypetFmt">
         <el-row :gutter="20"  style="width: 100%;">
           <el-col :span="4">
-            <el-radio v-model="radio" :value="0">空军报文格式</el-radio>
+            <el-radio :value="0">空军报文格式</el-radio>
           </el-col>
           <el-col :span="4">
-            <el-radio v-model="radio" :value="1">军队报文格式</el-radio>
+            <el-radio  :value="1">军队报文格式</el-radio>
           </el-col>
         </el-row>
         </el-radio-group>
@@ -31,22 +31,22 @@
         <el-checkbox-group v-model="pkt_jbxm" style="width: 100%" disabled>
           <el-row :gutter="20"  style="width: 100%;">
             <el-col :span="4">
-              <el-checkbox label="是否固定台站" />
+              <el-checkbox label="是否固定台站" :value="0"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="最小能见度"/>
+              <el-checkbox label="最小能见度" :value="1"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="本站气压"/>
+              <el-checkbox label="本站气压" :value="2"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="海平面气压"/>
+              <el-checkbox label="海平面气压" :value="3"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="时降水量"/>
+              <el-checkbox label="时降水量" :value="4"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="日降水量"/>
+              <el-checkbox label="日降水量" :value="5"/>
             </el-col>
           </el-row>
         </el-checkbox-group>
@@ -54,19 +54,19 @@
         <el-checkbox-group v-model="pkt_hkht" style="width: 100%" disabled>
           <el-row :gutter="20"  style="width: 100%;">
             <el-col :span="4">
-              <el-checkbox label="垂直能见度"  />
+              <el-checkbox label="垂直能见度" :value="0" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="跑道视程"/>
+              <el-checkbox label="跑道视程" :value="1"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="场面、零点、高度表"/>
+              <el-checkbox label="场面、零点、高度表" :value="2"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="静电场"/>
+              <el-checkbox label="静电场" :value="3"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="雷电"/>
+              <el-checkbox label="雷电" :value="4"/>
             </el-col>
           </el-row>
         </el-checkbox-group>
@@ -74,30 +74,30 @@
         <el-checkbox-group v-model="pkt_zywx" style="width: 100%" disabled>
           <el-row :gutter="20"  style="width: 100%;">
             <el-col :span="4">
-              <el-checkbox label="瞬时最大风速" />
+              <el-checkbox label="瞬时最大风速" :value="0"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="积雨云方向去向"/>
+              <el-checkbox label="积雨云方向去向" :value="1"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="冰雹最大直径" />
+              <el-checkbox label="冰雹最大直径"  :value="2"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="云敝山所在方向"/>
+              <el-checkbox label="云敝山所在方向" :value="3"/>
             </el-col>
           </el-row>
           <el-row :gutter="20"  style="width: 100%;">
             <el-col :span="4">
-              <el-checkbox label="低云方向去向" />
+              <el-checkbox label="低云方向去向"  :value="4"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="最大静电场强度"/>
+              <el-checkbox label="最大静电场强度" :value="5"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="雷暴方向去向" />
+              <el-checkbox label="雷暴方向去向" :value="6"/>
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="龙卷方向去向"/>
+              <el-checkbox label="龙卷方向去向" :value="7"/>
             </el-col>
           </el-row>
         </el-checkbox-group>
@@ -105,30 +105,30 @@
         <el-checkbox-group v-model="pkt_hysw" style="width: 100%" disabled>
           <el-row :gutter="20"  style="width: 100%;">
             <el-col :span="4">
-              <el-checkbox label="航向和航速"  />
+              <el-checkbox label="航向和航速" :value="0" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="表层海水温度"/>
+              <el-checkbox label="表层海水温度" :value="1" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="表层海水盐度"  />
+              <el-checkbox label="表层海水盐度"  :value="2" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="海况和波周期"/>
+              <el-checkbox label="海况和波周期" :value="3" />
             </el-col>
           </el-row>
           <el-row :gutter="20"  style="width: 100%;">
             <el-col :span="4">
-              <el-checkbox label="波级和波高" value="波级和波高" />
+              <el-checkbox label="波级和波高" :value="4"  />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="风浪和涌波" value="风浪和涌波" />
+              <el-checkbox label="风浪和涌波" :value="5"  />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="降水PH值" value="降水PH值" />
+              <el-checkbox label="降水PH值" :value="6"  />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="气溶胶" value="气溶胶" />
+              <el-checkbox label="气溶胶" :value="7"  />
             </el-col>
           </el-row>
         </el-checkbox-group>
@@ -136,19 +136,19 @@
         <el-checkbox-group v-model="pkt_fjbx" style="width: 100%" disabled>
           <el-row :gutter="20"  style="width: 100%;">
             <el-col :span="4">
-              <el-checkbox label="地表溫度"/>
+              <el-checkbox label="地表溫度" :value="0" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="地表和积雪"/>
+              <el-checkbox label="地表和积雪" :value="1" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="蒸发量组" />
+              <el-checkbox label="蒸发量组" :value="2"  />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="日照时数"/>
+              <el-checkbox label="日照时数" :value="3" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="电线结冰最大重量"/>
+              <el-checkbox label="电线结冰最大重量" :value="4" />
             </el-col>
           </el-row>
         </el-checkbox-group>
@@ -156,30 +156,30 @@
         <el-checkbox-group v-model="pkt_rjz" style="width: 100%" disabled>
           <el-row :gutter="20"  style="width: 100%;">
             <el-col :span="4">
-              <el-checkbox label="最高温度"/>
+              <el-checkbox label="最高温度" :value="0" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="最低温度" />
+              <el-checkbox label="最低温度" :value="1" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="地表最高温度"/>
+              <el-checkbox label="地表最高温度" :value="2" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="地表最低温度"/>
+              <el-checkbox label="地表最低温度" :value="3" />
             </el-col>
           </el-row>
           <el-row :gutter="20"  style="width: 100%;">
             <el-col :span="4">
-              <el-checkbox label="最高潮高"/>
+              <el-checkbox label="最高潮高" :value="4" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="最高潮时"/>
+              <el-checkbox label="最高潮时" :value="5" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="最低潮高"/>
+              <el-checkbox label="最低潮高" :value="6" />
             </el-col>
             <el-col :span="4">
-              <el-checkbox label="最低潮时"/>
+              <el-checkbox label="最低潮时" :value="7" />
             </el-col>
           </el-row>
         </el-checkbox-group>
@@ -187,22 +187,31 @@
        <el-row :gutter="20"  style="width: 100%;">
         <el-col :span="4">
           <el-form-item label="编报要素选择1" prop="element" style="width: 200px">
-            <el-select v-model="formInline.element">
-              <el-option label="漏点温度" value="1"></el-option>
+            <el-select v-model="pkt_bbys1" disabled>
+              <el-option label="露点温度" :value="109"></el-option>
+              <el-option label="相对湿度" :value="106"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
          <el-col :span="4">
            <el-form-item label="编报要素选择2" prop="element2" style="width: 200px">
-             <el-select v-model="formInline.element2">
-               <el-option label="场面气压" value="1"></el-option>
+             <el-select v-model="pkt_bbys2" disabled>
+               <el-option label="场面气压" :value="208"></el-option>
+               <el-option label="零点高度" :value="210"></el-option>
+               <el-option label="高度表拨正" :value="213"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="编报要素降水时段选择" prop="time" style="width: 200px">
-             <el-select v-model="formInline.time">
-               <el-option label="三小时" value="1"></el-option>
+             <el-select v-model="pkt_jssd" disabled>
+               <el-option label="三小时" :value="3"></el-option>
+               <el-option label="六小时" :value="6"></el-option>
+               <el-option label="十二小时" :value="12"></el-option>
+               <el-option label="十五小时" :value="15"></el-option>
+               <el-option label="十八小时" :value="18"></el-option>
+               <el-option label="二十一小时" :value="21"></el-option>
+               <el-option label="二十四小时" :value="24"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -218,7 +227,7 @@
 </template>
 <script setup lang="tsx">
 import {defineProps, onMounted, ref} from "vue";
-import {getUserList, getYaspacketList} from "@/api/modules/allData";
+import {getQueryAllSysItem, getUserList, getYaspacketList} from "@/api/modules/allData";
 
 const props = defineProps<{
   selectData?: {};
@@ -245,30 +254,39 @@ const pkt_zywx = ref([])
 const pkt_hysw = ref([])
 const pkt_fjbx = ref([])
 const pkt_rjz = ref([])
+const pkt_bbys1 = ref()
+const pkt_bbys2 = ref()
+const pkt_jssd = ref()
 
 const findData=()=>{
   const result = processTableData.value.find(item => item.pkt_type === searchPktType.value && item.pkt_fmt === searchPktFmt.value);
   if(result){
-    console.log(pkt_jbxm.value)
-    pkt_jbxm.value = result.pkt_jbxm.split('|').map(val => val === '1');
-    pkt_hkht.value =result.pkt_hkht.split('|').map(val => val === '1');
-    pkt_zywx.value =result.pkt_zywx.split('|').map(val => val === '1');
-    pkt_hysw.value =result.pkt_hysw.split('|').map(val => val === '1');
-    pkt_fjbx.value=result.pkt_fjbx.split('|').map(val => val === '1');
-    pkt_rjz.value = result.pkt_rjz.split('|').map(val => val === '1');
+    console.log(pkt_bbys1.value)
+    pkt_jbxm.value = result.pkt_jbxm.split('|').map((val, index) => val === '1' ? index : -1);
+    pkt_hkht.value =result.pkt_hkht.split('|').map((val, index) => val === '1' ? index : -1);
+    pkt_zywx.value =result.pkt_zywx.split('|').map((val, index) => val === '1' ? index : -1);
+    pkt_hysw.value =result.pkt_hysw.split('|').map((val, index) => val === '1' ? index : -1);
+    pkt_fjbx.value=result.pkt_fjbx.split('|').map((val, index) => val === '1' ? index : -1);
+    pkt_rjz.value = result.pkt_rjz.split('|').map((val, index) => val === '1' ? index : -1);
+    pkt_bbys1.value = result.pkt_bbys1
+    pkt_bbys2.value =result.pkt_bbys2
+    pkt_jssd.value = result.pkt_jssd
   }else {
+    console.log("======")
     pkt_jbxm.value = []
     pkt_hkht.value = []
     pkt_zywx.value = []
     pkt_hysw.value =[]
     pkt_fjbx.value =[]
     pkt_rjz.value =[]
+    pkt_bbys1.value = undefined
+    pkt_bbys2.value =undefined
+    pkt_jssd.value = undefined
   }
 
 }
 
 const searchPktTypetFmt = ()=>{
-  console.log(pkt_jbxm.value)
   findData()
 }
 
@@ -301,8 +319,6 @@ const submitForm = () => {
     }
   });
 }
-
-
 </script>
 
 <style scoped>