Merge branch 'master' of http://git.techwx.com/framework/SMO

src/api/modules/allData.ts

@@ -129,3 +129,7 @@ export const getAllpartlist= () => {
   return http.post<ResPage<any>>(PORT1 + `/queryallpartlist`);
 };
 
+//获取自动站通信信息【queryascomm】
+export const getYascomm= (params:{}) => {
+  return http.post<ResPage<any>>(PORT1 + `/queryascomm`,params);
+};

src/components/SCheckbox/index.vue

@@ -3,6 +3,7 @@ vue
   <div class="s-checkbox" style="width: 100%; gap: 10px">
     <template v-for="item in data" :key="item">
       <el-button
+        disabled
         v-if="data2.includes(item)"
         type="primary"
         style="min-width: 30px"
@@ -11,6 +12,7 @@ vue
         {{ item }}
       </el-button>
       <el-button
+        disabled
         v-else
         style="min-width: 30px"
         @click="toggleItem(item)"
@@ -22,7 +24,7 @@ vue
 </template>
 
 <script setup lang="ts">
-import { ref, defineProps, defineEmits } from "vue";
+import {ref, defineProps, defineEmits, watch} from "vue";
 
 // Define props with default values
 const props = defineProps<{
@@ -34,6 +36,10 @@ const props = defineProps<{
 const data = ref(props.data || []);
 const data2 = ref(props.data2 || []);
 
+watch(() => props.data2, (newVal) => {
+  data2.value =  props.data2
+});
+
 // Define emits to send data back to the parent
 const emit = defineEmits<{
   (e: 'update:data2', value: number[]): void;

src/views/alarm/allWeather/index.vue

@@ -29,7 +29,7 @@
                 {{findLabelByValue(tactStateList,scope.row.tact_state)}}
               </template>
               <template v-if="item.prop === 'tact_type'">
-                {{findLabelByValue(dataTypeList,scope.row.tact_type)}}
+                {{findLabelByValue(dataTypeList,scope.row.data_type)}}
               </template>
               <template v-if="item.prop === 'alarm_on_time_i'">
                 {{scope.row.alarm_on_time_i?formatDate(scope.row.alarm_on_time_i):'--'}}

src/views/query/hazardousWeather/index.vue

@@ -49,7 +49,7 @@
                 {{findLabelByValue(tactStateList,scope.row.tact_state)}}
               </template>
               <template v-if="item.prop === 'tact_type'">
-                {{findLabelByValue(dataTypeList,scope.row.tact_type)}}
+                {{findLabelByValue(dataTypeList,scope.row.data_type)}}
               </template>
               <template v-if="item.prop === 'alarm_on_time_i'">
                 {{scope.row.alarm_on_time_i?formatDate(scope.row.alarm_on_time_i):'--'}}

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

@@ -244,7 +244,7 @@ const pageable = ref<any>({
 });
 const getList= async ()=>{
   const { data } = await getYaspacketList(pageable.value);
-  processTableData.value = data.list[0]
+  processTableData.value = data.list
   findData()
 }
 

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

@@ -6,49 +6,73 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="部别" prop="division" style="width: 200px">
-              <el-input v-model="formInline.division"></el-input>
+              <el-input v-model="selectData.as_depart" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="台站名称" prop="name" style="width: 200px">
-              <el-input v-model="formInline.name"></el-input>
+              <el-input v-model="selectData.as_name" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="站号" prop="numberStation" style="width: 200px">
-              <el-input v-model="formInline.numberStation"></el-input>
+              <el-input v-model="selectData.as_code" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="地图级别" prop="level" style="width: 200px">
-              <el-input v-model="formInline.level"></el-input>
+              <el-select v-model="selectData.map_level" disabled>
+                <el-option label="1" :value="0"></el-option>
+                <el-option label="2" :value="1"></el-option>
+                <el-option label="3" :value="2"></el-option>
+                <el-option label="4" :value="3"></el-option>
+                <el-option label="5" :value="4"></el-option>
+                <el-option label="6" :value="5"></el-option>
+                <el-option label="7" :value="6"></el-option>
+                <el-option label="8" :value="7"></el-option>
+                <el-option label="9" :value="8"></el-option>
+                <el-option label="10" :value="9"></el-option>
+                <el-option label="11" :value="10"></el-option>
+                <el-option label="12" :value="11"></el-option>
+                <el-option label="13" :value="12"></el-option>
+                <el-option label="14" :value="13"></el-option>
+                <el-option label="15" :value="14"></el-option>
+                <el-option label="16" :value="15"></el-option>
+                <el-option label="17" :value="16"></el-option>
+                <el-option label="18" :value="17"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="所属基地" prop="base" style="width: 200px">
-              <el-input v-model="formInline.base"></el-input>
+              <el-input v-model="selectData.as_base" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="所属旅" prop="brigade" style="width: 200px">
-              <el-input v-model="formInline.brigade"></el-input>
+              <el-input v-model="selectData.as_meteoro" disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="架设方式" prop="methodErection" style="width: 200px">
-              <el-input v-model="formInline.methodErection"></el-input>
+              <el-select v-model="selectData.install_type" disabled>
+                <el-option label="业务站" :value="0"></el-option>
+                <el-option label="无人站" :value="1"></el-option>
+                <el-option label="梯度站" :value="2"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="上传间隔" prop="interval" style="width: 200px">
               <div  style="display:flex;align-items: center">
-                <el-select v-model="formInline.interval" style="width: 180px">
-                  <el-option label="1" value="1"></el-option>
-                  <el-option label="2" value="2"></el-option>
-                  <el-option label="30" value="30"></el-option>
-                  <el-option label="60" value="60"></el-option>
+                <el-select v-model="selectData.update_space" disabled style="width: 180px">
+                  <el-option label="1" :value="1"></el-option>
+                  <el-option label="5" :value="5"></el-option>
+                  <el-option label="10" :value="10"></el-option>
+                  <el-option label="60" :value="60"></el-option>
+                  <el-option label="0" :value="0"></el-option>
                 </el-select>
                 <span style="padding-left: 10px">分</span>
               </div>
@@ -56,22 +80,22 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="省" prop="provinces" style="width: 200px">
-              <el-input v-model="formInline.provinces"></el-input>
+              <el-input v-model="selectData.as_province" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="市县" prop="cities" style="width: 200px">
-              <el-input v-model="formInline.cities"></el-input>
+              <el-input v-model="selectData.as_city" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="区镇" prop="districts" style="width: 200px">
-              <el-input v-model="formInline.districts"></el-input>
+              <el-input v-model="selectData.as_area" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="乡镇" prop="townships" style="width: 200px">
-              <el-input v-model="formInline.townships"></el-input>
+              <el-input v-model="selectData.as_address" disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,47 +103,51 @@
           <el-col :span="4">
             <el-form-item label="相对县城距离" prop="interval" style="width: 200px">
               <div  style="display:flex;align-items: center">
-                <el-input v-model="formInline.distance" style="width: 160px"></el-input>
+                <el-input v-model="selectData.county_dist" disabled style="width: 160px"></el-input>
                 <span style="padding-left: 10px">公里</span>
               </div>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="相对县城方向" prop="direction" style="width: 200px">
-              <el-select v-model="formInline.direction">
-                <el-option label="东方" value="1"></el-option>
-                <el-option label="南方" value="2"></el-option>
-                <el-option label="西方" value="3"></el-option>
-                <el-option label="北方" value="4"></el-option>
+              <el-select v-model="selectData.county_pos" disabled>
+                <el-option label="东方" :value="0"></el-option>
+                <el-option label="南方" :value="1"></el-option>
+                <el-option label="西方" :value="2"></el-option>
+                <el-option label="北方"  :value="3"></el-option>
+                <el-option label="东南方" :value="4"></el-option>
+                <el-option label="东北方" :value="5"></el-option>
+                <el-option label="东北方" :value="6"></el-option>
+                <el-option label="西北方" :value="7"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="经度" prop="longitude" style="width: 200px">
               <div  style="display:flex;align-items: center">
-                <el-input v-model="formInline.longitude" style="width: 130px"></el-input>
-                <el-select v-model="formInline.longitude2" placeholder="" style="width: 60px;margin-left: 10px">
-                  <el-option label="E" value="E"></el-option>
-                  <el-option label="W" value="W"></el-option>
-                </el-select>
+                <el-input v-model="selectData.as_lon" disabled></el-input>
+<!--                <el-select v-model="formInline.longitude2" placeholder="" style="width: 60px;margin-left: 10px">-->
+<!--                  <el-option label="E" value="E"></el-option>-->
+<!--                  <el-option label="W" value="W"></el-option>-->
+<!--                </el-select>-->
               </div>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="纬度" prop="latitude" style="width: 200px">
               <div  style="display:flex;align-items: center">
-                <el-input v-model="formInline.latitude" style="width: 130px"></el-input>
-                <el-select v-model="formInline.latitude2" placeholder=""  style="width: 60px;margin-left: 10px">
-                  <el-option label="N" value="N"></el-option>
-                  <el-option label="S" value="S"></el-option>
-                </el-select>
+                <el-input v-model="selectData.as_lat" disabled></el-input>
+<!--                <el-select v-model="formInline.latitude2" placeholder=""  style="width: 60px;margin-left: 10px">-->
+<!--                  <el-option label="N" value="N"></el-option>-->
+<!--                  <el-option label="S" value="S"></el-option>-->
+<!--                </el-select>-->
               </div>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="观测场海拔高度" prop="fieldElevation" style="width: 200px">
               <div  style="display:flex;align-items: center">
-                <el-input v-model="formInline.fieldElevation" style="width: 180px"></el-input>
+                <el-input v-model="selectData.observe_height" disabled style="width: 180px"></el-input>
                 <span style="padding-left: 10px">米</span>
               </div>
             </el-form-item>
@@ -127,7 +155,7 @@
           <el-col :span="4">
             <el-form-item label="气压传感器海拔高度" prop="sensorElevation" style="width: 200px">
               <div  style="display:flex;align-items: center">
-                <el-input v-model="formInline.sensorElevation" style="width: 180px"></el-input>
+                <el-input v-model="selectData.pressure_height" disabled  style="width: 180px"></el-input>
                 <span style="padding-left: 10px">米</span>
               </div>
             </el-form-item>
@@ -137,7 +165,7 @@
           <el-col :span="4">
             <el-form-item label="测风器距地高度" prop="heightAnmometers" style="width: 200px">
               <div  style="display:flex;align-items: center">
-                <el-input v-model="formInline.heightAnmometers" style="width: 180px"></el-input>
+                <el-input v-model="selectData.tower_height" disabled style="width: 180px"></el-input>
                 <span style="padding-left: 10px">米</span>
               </div>
             </el-form-item>
@@ -145,7 +173,8 @@
           <el-col :span="4">
             <el-form-item label="建站日期" prop="buildWebsiteTime" style="width: 200px">
               <el-date-picker
-                v-model="formInline.buildWebsiteTime"
+                disabled
+                v-model="selectData.build_time"
                 type="date"
                 placeholder="请选择"
               />
@@ -153,23 +182,24 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="观测组长" prop="leader" style="width: 200px">
-              <el-input v-model="formInline.leader" style="width: 180px"></el-input>
+              <el-input v-model="selectData.check_leader" disabled style="width: 180px"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="台长" prop="drector" style="width: 200px">
-              <el-input v-model="formInline.drector" style="width: 180px"></el-input>
+              <el-input v-model="selectData.station_leader" disabled style="width: 180px"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="预审员" prop="preExaminer" style="width: 200px">
-              <el-input v-model="formInline.preExaminer" style="width: 180px"></el-input>
+              <el-input v-model="selectData.as_auditor" disabled style="width: 180px"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="授时许可" prop="grantPermission" style="width: 200px">
-              <el-select v-model="formInline.grantPermission">
-                <el-option label="不准授权" value="1"></el-option>
+              <el-select v-model="selectData.set_time" disabled>
+                <el-option label="不准授时" :value="0"></el-option>
+                <el-option label="允许授时" :value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -177,15 +207,16 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="观测方式" prop="modeObservation" style="width: 200px">
-              <el-select v-model="formInline.modeObservation">
-                <el-option label="自动" value="1"></el-option>
+              <el-select v-model="selectData.view_mode" disabled>
+                <el-option label="人工" :value="0"></el-option>
+                <el-option label="自动" :value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="观测次数" prop="numberObservation" style="width: 200px">
               <div  style="display:flex;align-items: center">
-                <el-input v-model="formInline.numberObservation" style="width: 180px"></el-input>
+                <el-input v-model="selectedItems.length" style="width: 180px" disabled></el-input>
                 <span style="padding-left: 10px">次</span>
               </div>
             </el-form-item>
@@ -196,7 +227,7 @@
             <el-form-item label="" prop="modeObservation" style="width: 200px">
               <div style="display: flex;align-items: center">
                 <span>观测时次</span>
-                <el-checkbox v-model="formInline.allTime" style="margin-left: 10px" label="全选" />
+                <el-checkbox v-model="allTime" style="margin-left: 10px" label="全选" disabled/>
               </div>
               <sCheckbox style="margin-top: 5px" :data="selectedItemData" :data2="selectedItems" @update:data2="updateSelectedItems"></sCheckbox>
             </el-form-item>
@@ -358,8 +389,9 @@
 
 <script setup lang="tsx">
 import sCheckbox from "@/components/SCheckbox/index.vue"
-import {defineProps, reactive, ref} from "vue";
+import {defineProps, onMounted, reactive, ref} from "vue";
 import {ColumnProps} from "@/components/ProTable/interface";
+import {getYasaverage, getYascomm} from "@/api/modules/allData";
 const props = defineProps<{
   selectData?: {};
 }>();
@@ -440,7 +472,7 @@ function updateSelectedItems(newSelectedItems: number[]) {
   selectedItems.value = newSelectedItems;
 }
 
-
+const allTime = ref(false)
 
 const processTableData = ref([
   {
@@ -459,6 +491,33 @@ const columns = reactive<ColumnProps[]>([
   { prop: "c", label: "命令类型" },
   { prop: "d", label: "间隔时间(分钟)"}
 ]);
+
+const pageable = ref<any>({
+  asCode: props.selectData.as_code,
+  pageNum: 1,
+  pageSize: 20,
+});
+
+const primaryCommunications = ref();
+const fromCommunication = ref();
+
+const getYascommList= async ()=> {
+  const {data} = await getYascomm(pageable.value);
+  const averageList = data[props.selectData.as_code]
+  console.log(averageList)
+}
+
+onMounted(() => {
+  const observe_time = props.selectData.observe_time
+  if (observe_time) {
+    const timeArray = observe_time.split(';').map(item => parseInt(item, 10));
+    selectedItems.value = timeArray;
+    allTime.value = selectedItems.value.length===24? true:false
+  }
+  getYascommList()
+})
+
+console.log(props.selectData)
 </script>
 
 <style scoped>

src/views/system/stations/index.vue

@@ -32,6 +32,9 @@
                 {{scope.row['as_area']}}
                 {{scope.row['as_address']}}
               </template>
+              <template v-if="item.prop === 'map_level'">
+                {{scope.row.map_level+1}}
+              </template>
               <template v-if="item.prop === 'view_mode'">
                 {{findLabelByValue(typeList,scope.row.view_mode)}}
               </template>