更新

src/api/modules/allData.ts

@@ -20,7 +20,7 @@ export const getRgDataList = () => {
 
 //查询观测要素
 export const getDataItemList = (params:{}) => {
-  return http.post<ResPage<any>>(PORT1 + `/querydataitem`,params);
+  return http.post<ResPage<any>>(PORT1 + `/querydataitem`,params,{ loading: false });
 };
 
 
@@ -131,7 +131,7 @@ export const getAllpartlist= () => {
 
 //获取自动站通信信息【queryascomm】
 export const getYascomm= (params:{}) => {
-  return http.post<ResPage<any>>(PORT1 + `/queryascomm`,params);
+  return http.post<ResPage<any>>(PORT1 + `/queryascomm`,params,{ loading: false });
 };
 
 //查询所有自动站状态【queryasstatelist】

src/enums/httpEnum.ts

@@ -5,7 +5,7 @@ export enum ResultEnum {
   SUCCESS = 200,
   ERROR = 500,
   OVERDUE = 401,
-  TIMEOUT = 60000,
+  TIMEOUT = 120000,
   TYPE = "success"
 }
 

src/views/alarm/allData/index.vue

@@ -21,8 +21,8 @@
         </div>
       </div>
       <!-- 表格主体 -->
-      <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small" @sort-change="handleSortChange">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+      <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small" @sort-change="handleSortChange"  style="white-space: nowrap;">
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ (pageable.pageNum - 1) * pageable.pageSize + scope.$index + 1 }}
           </template>
@@ -145,10 +145,10 @@
               </template>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="日照文">
+          <el-tab-pane label="光照度">
             <div class="container-tag">
               <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>
+                <div v-if="item.data_type==='光照度'"  :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)" >{{item.data_name}}</div>
               </template>
             </div>
           </el-tab-pane>
@@ -507,18 +507,22 @@ const updateColumns = () => {
   const column = [
     { prop: "as_name", label: "站名", width: 100 },
     { prop: "as_code", label: "站号", width: 100 },
-    { prop: "data_time_i", label: "观测时间", width: 170, sortable: true }
+    { prop: "data_time_i", label: "观测时间", width: 120, sortable: true }
   ];
 
   const newColumns = customizeColumns.value.map(item => ({
     prop: item.data_id,
     label: item.data_name +'('+item.data_unit+')',
     sortable: true,
-    width: calculateTextLengthInPixels(item.data_name)
+    // width: calculateTextLengthInPixels(item.data_name)
   }));
 
   columns = [...column, ...newColumns];
   pageable.value.data_items = [...customizeColumns.value];
+
+  columns.forEach((column, index) => {
+    renderHeader({ column });
+  });
   getList();
 }
 
@@ -644,4 +648,12 @@ onDeactivated(() => {
 });
 
 
+const renderHeader = ({ column }: { column: any }) => {
+  const span = document.createElement('span');
+  span.innerText = column.label;
+  document.body.appendChild(span);
+  column.minWidth = span.getBoundingClientRect().width + 35;
+  document.body.removeChild(span);
+};
+
 </script>

src/views/alarm/allDevice/index.vue

@@ -1,100 +1,100 @@
 <template>
-	<div class="table-box">
-		<div class="card table-search" style="overflow: hidden;">
-			<el-form ref="formRef" :model="pageable" :inline="true" label-width="auto">
-				<el-form-item label="所属基地：" prop="base">
-					<el-select v-model="pageable.base" placeholder="请选择" style="width: 200px" @change="changeBase">
-						<el-option v-for="item in baseList" :key="item.value" :label="item.label" :value="item.value" />
-					</el-select>
-				</el-form-item>
-				<el-form-item>
-					<div>
-						<el-button type="primary" @click="handleSearch">查询</el-button>
-						<el-button plain @click="resetQuery">重置</el-button>
-					</div>
-				</el-form-item>
-			</el-form>
-		</div>
-		<div class="main_list ">
-			<el-row :gutter="15">
-				<el-col :xs="24" :sm="12" :md="8" :lg="8">
-					<div class="chart_item zhuti">
-						<div style="font-weight: bold;" class="item_title">
-							<span>设备工况(单位:台)</span>
-						</div>
-						<div class="mt5">
-							<div ref="device" class="ve-ring" style="height: 200px" v-if="stateList"></div>
-							<div v-else
-								style="height: 200px; display: flex; justify-content: center; align-items: center; font-size: 20px;">
-								暂无数据</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="24" :sm="12" :md="8" :lg="8">
-					<div class="chart_item zhuti">
-						<div style="font-weight: bold;" class="item_title">
-							<span>检定周期(单位:台)</span>
-						</div>
-						<div class="mt5">
-							<div ref="period" class="ve-ring" style="height: 200px"></div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="24" :sm="12" :md="8" :lg="8">
-					<div class="chart_item zhuti">
-						<div style="font-weight: bold;" class="item_title">
-							<span>FTP链路</span>
-						</div>
-						<div class="mt5">
-							<div class="FTP_box" style="height: 200px">
-								<div class="FTP_item">
-									<img src="@/assets/images/centerStation.png" alt="">
-									<div>正常FTP({{ FTPList && FTPList.true ? FTPList?.true.length : 0 }})</div>
-								</div>
-								<div class="FTP_item" @click="gotoFTP">
-									<img src="@/assets/images/areaStation.png" alt="">
-									<div>异常FTP({{ FTPList && FTPList.false ? FTPList?.false.length : 0 }})</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</el-col>
-			</el-row>
-			<el-row :gutter="15">
-				<el-col :span="24">
-					<div class="chart_item zhuti">
-						<div style="font-weight: bold;" class="item_title">
-							<span>危险天气</span>
-						</div>
-						<el-row :gutter="15">
-							<el-col :span="8">
-								<div class="mt5">
-									<div ref="weather" class="ve-ring" style="height: 300px"></div>
-								</div>
-							</el-col>
-							<el-col :span="16" style="margin-bottom: 0;">
-								<div>
-									<div ref="element" class="ve-ring" style="height: 300px"></div>
-								</div>
-							</el-col>
-						</el-row>
-					</div>
-				</el-col>
-			</el-row>
-			<el-row :gutter="15">
-				<el-col :span="24">
-					<div class="chart_item zhuti">
-						<div style="font-weight: bold;" class="item_title">
-							<span>到报监控</span>
-						</div>
-						<div class="mt5">
-							<div ref="control" class="ve-ring" style="height: 300px"></div>
-						</div>
-					</div>
-				</el-col>
-			</el-row>
-		</div>
-	</div>
+  <div class="table-box">
+    <div class="card table-search" style="overflow: hidden;">
+      <el-form ref="formRef" :model="pageable" :inline="true" label-width="auto">
+        <el-form-item label="所属基地：" prop="base">
+          <el-select v-model="pageable.base" placeholder="请选择" style="width: 200px" @change="changeBase">
+            <el-option v-for="item in baseList" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <div>
+            <el-button type="primary" @click="handleSearch">查询</el-button>
+            <el-button plain @click="resetQuery">重置</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="main_list ">
+      <el-row :gutter="15">
+        <el-col :xs="24" :sm="12" :md="8" :lg="8">
+          <div class="chart_item zhuti">
+            <div style="font-weight: bold;" class="item_title">
+              <span>设备工况(单位:台)</span>
+            </div>
+            <div class="mt5">
+              <div ref="device" class="ve-ring" style="height: 200px" v-if="stateList"></div>
+              <div v-else
+                style="height: 200px; display: flex; justify-content: center; align-items: center; font-size: 20px;">
+                暂无数据</div>
+            </div>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="12" :md="8" :lg="8">
+          <div class="chart_item zhuti">
+            <div style="font-weight: bold;" class="item_title">
+              <span>检定周期(单位:台)</span>
+            </div>
+            <div class="mt5">
+              <div ref="period" class="ve-ring" style="height: 200px"></div>
+            </div>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="12" :md="8" :lg="8">
+          <div class="chart_item zhuti">
+            <div style="font-weight: bold;" class="item_title">
+              <span>FTP链路</span>
+            </div>
+            <div class="mt5">
+              <div class="FTP_box" style="height: 200px">
+                <div class="FTP_item">
+                  <img src="@/assets/images/centerStation.png" alt="">
+                  <div>正常FTP({{ FTPList && FTPList.true ? FTPList?.true.length : 0 }})</div>
+                </div>
+                <div class="FTP_item" @click="gotoFTP">
+                  <img src="@/assets/images/areaStation.png" alt="">
+                  <div>异常FTP({{ FTPList && FTPList.false ? FTPList?.false.length : 0 }})</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="15">
+        <el-col :span="24">
+          <div class="chart_item zhuti">
+            <div style="font-weight: bold;" class="item_title">
+              <span>危险天气</span>
+            </div>
+            <el-row :gutter="15">
+              <el-col :span="8">
+                <div class="mt5">
+                  <div ref="weather" class="ve-ring" style="height: 300px"></div>
+                </div>
+              </el-col>
+              <el-col :span="16" style="margin-bottom: 0;">
+                <div>
+                  <div ref="element" class="ve-ring" style="height: 300px"></div>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="15">
+        <el-col :span="24">
+          <div class="chart_item zhuti">
+            <div style="font-weight: bold;" class="item_title">
+              <span>到报监控</span>
+            </div>
+            <div class="mt5">
+              <div ref="control" class="ve-ring" style="height: 300px"></div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
 </template>
 
 <script setup lang="ts" name="allDevice">
@@ -110,39 +110,39 @@ import { useRouter } from "vue-router";
 import { useUserStore } from "@/stores/modules/user";
 const router = useRouter();
 const gotoFTP = () => {
-	router.push({
-		path: '/system/disposition',
-		query: {
-			status: 'distributionAutomatic',
-		}
-	})
+  router.push({
+    path: '/system/disposition',
+    query: {
+      status: 'distributionAutomatic',
+    }
+  })
 }
 // 查询自动站列表
 const queryas = ref<Platform>({
-	pageSize: 5000,
-	pageNum: 1,
-	currentpage: 1
+  pageSize: 5000,
+  pageNum: 1,
+  currentpage: 1
 })
 const pageable = ref({
-	data_type: true,
-	time_order: 1,
-	time_space: 1,
-	base: undefined,
-	as_code_list: [],
-	data_items: [
-		{
-			data_r_table: "SHI_SHI_LIU_YAO_SU_SHU_JU",
-			data_id: 101,
-			data_type: "温湿度",
-			data_item: "QI_WEN",
-			data_name: "气温",
-			data_unit: "℃",
-			data_h_table: "LI_SHI_LIU_YAO_SU_SHU_JU",
-			data_value: "",
-			data_order: 1,
-			data_condition: 0
-		}
-	],
+  data_type: true,
+  time_order: 1,
+  time_space: 1,
+  base: undefined,
+  as_code_list: [],
+  data_items: [
+    {
+      data_r_table: "SHI_SHI_LIU_YAO_SU_SHU_JU",
+      data_id: 101,
+      data_type: "温湿度",
+      data_item: "QI_WEN",
+      data_name: "气温",
+      data_unit: "℃",
+      data_h_table: "LI_SHI_LIU_YAO_SU_SHU_JU",
+      data_value: "",
+      data_order: 1,
+      data_condition: 0
+    }
+  ],
 });
 
 const userStore = useUserStore();
@@ -151,43 +151,43 @@ const baseList = ref<any>([])
 const selectPlatform = ref()
 
 const getPlatforms = async () => {
-	baseList.value = groupByType(platformList.value)
+  baseList.value = groupByType(platformList.value)
 
-	pageable.value.base = baseList.value[0].value
-	pageable.value.as_code_list = baseList.value[0].children
-	selectPlatform.value = baseList.value[0]
-	// getDeviceStatus()
-	// getArrive()
-	// getHistoryList()
+  pageable.value.base = baseList.value[0].value
+  pageable.value.as_code_list = baseList.value[0].children
+  selectPlatform.value = baseList.value[0]
+  // getDeviceStatus()
+  // getArrive()
+  // getHistoryList()
 
 };
 const resetQuery = () => {
 
-	pageable.value.base = baseList.value[0].value
-	pageable.value.as_code_list = baseList.value[0].children
-	handleSearch()
+  pageable.value.base = baseList.value[0].value
+  pageable.value.as_code_list = baseList.value[0].children
+  handleSearch()
 
 };
 
 const changeBase = (e) => {
-	const item = baseList.value.find(item => item.value === e);
-	pageable.value.as_code_list = item.children
-
-	// getCertificate()
-	// getFTP()
-	// getDeviceStatus()
-	// getArrive()
-	// getHistoryList()
+  const item = baseList.value.find(item => item.value === e);
+  pageable.value.as_code_list = item.children
+
+  // getCertificate()
+  // getFTP()
+  // getDeviceStatus()
+  // getArrive()
+  // getHistoryList()
 }
 watch(() => pageable.value.as_code_list, (newValue, oldValue) => {
-	if (newValue) {
-		weatherInfo();
-		getCertificate();
-		getFTP();
-		getDeviceStatus();
-		getArrive();
-		// getHistoryList();
-	}
+  if (newValue) {
+    weatherInfo();
+    getCertificate();
+    getFTP();
+    getDeviceStatus();
+    getArrive();
+    // getHistoryList();
+  }
 });
 
 const formRef = ref()
@@ -201,45 +201,45 @@ const control = ref()
 const arriveList = ref<any>({ aa: [], bb: [], cc: [] })
 const arriveTime = ref<any>()
 const getArrive = async () => {
-	const { data } = await getArriveList({ ...pageable.value, time_space: 60, data_type: false, end_time: getStamp(parseTime(new Date(), '{y}-{m}-{d} {h}') + ':01'), begin_time: getStamp(parseTime(new Date(), '{y}-{m}-{d}') + ' 01:00') })
-	// 提取键并排序
-	const sortedKeys = Object.keys(data).sort((a, b) => {
-		const [timeA] = a.split(':').map(Number);
-		const [timeB] = b.split(':').map(Number);
-		return timeA - timeB;
-	});
-
-	// 根据排序后的键构建新对象
-	const sortedObj = {};
-	sortedKeys.forEach(key => {
-		sortedObj[key] = data[key];
-	});
-
-	arriveTime.value = Object.keys(sortedObj)
-
-	const arr = <any>{ aa: [], bb: [], cc: [] }
-	arriveTime.value?.forEach((item, index) => {
-		arr.aa.push(pageable.value.as_code_list.length)
-		arr.bb.push(data[item].length)
-		arr.cc.push(pageable.value.as_code_list.length - data[item].length)
-	});
-	arriveList.value = arr
-
-	nextTick(() => {
-		showControl()
-	})
+  const { data } = await getArriveList({ ...pageable.value, time_space: 60, data_type: false, end_time: getStamp(parseTime(new Date(), '{y}-{m}-{d} {h}') + ':01'), begin_time: getStamp(parseTime(new Date(), '{y}-{m}-{d}') + ' 01:00') })
+  // 提取键并排序
+  const sortedKeys = Object.keys(data).sort((a, b) => {
+    const [timeA] = a.split(':').map(Number);
+    const [timeB] = b.split(':').map(Number);
+    return timeA - timeB;
+  });
+
+  // 根据排序后的键构建新对象
+  const sortedObj = {};
+  sortedKeys.forEach(key => {
+    sortedObj[key] = data[key];
+  });
+
+  arriveTime.value = Object.keys(sortedObj)
+
+  const arr = <any>{ aa: [], bb: [], cc: [] }
+  arriveTime.value?.forEach((item, index) => {
+    arr.aa.push(pageable.value.as_code_list.length)
+    arr.bb.push(data[item].length)
+    arr.cc.push(pageable.value.as_code_list.length - data[item].length)
+  });
+  arriveList.value = arr
+
+  nextTick(() => {
+    showControl()
+  })
 };
 
 
 
 const wertherColumns = ref<any>({
-	tact_state_on: true,
-	tact_data_on: false,
-	tact_state: 0,
-	// tact_state: 0,
-	// tact_data: 0,
-	pageNum: 1,
-	pageSize: 999,
+  tact_state_on: true,
+  tact_data_on: false,
+  tact_state: 0,
+  // tact_state: 0,
+  // tact_data: 0,
+  pageNum: 1,
+  pageSize: 999,
 
 });
 
@@ -249,89 +249,95 @@ const dangetWeatherNum = ref(0)
 const weatherNormal = ref()
 const weatherWarning = ref()
 const weatherInfo = async () => {
-	const { data } = await getTacRecordList({ ...wertherColumns.value, as_code_list: pageable.value.as_code_list });
-	dangetWeatherNum.value = [...new Set(data.list?.map(obj => obj.as_code))].length
-	weatherInfoArr.value = data.list
-
-	let arr2 = new Array(8).fill(0);
-	let arr1 = new Array(8).fill(pageable.value.as_code_list.length);
-
-	data.list?.forEach((item, index) => {
-		arr1[item.data_type]--
-		arr2[item.data_type]++
-	})
-	weatherNormal.value = arr1
-	weatherWarning.value = arr2
-
-	nextTick(() => {
-		showWeather()
-		showElement()
-	})
+  const { data } = await getTacRecordList({ ...wertherColumns.value, as_code_list: pageable.value.as_code_list });
+  dangetWeatherNum.value = [...new Set(data.list?.map(obj => obj.as_code))].length
+  weatherInfoArr.value = data.list
+
+  let arr2 = new Array(8).fill(0);
+  let arr1 = new Array(8).fill(pageable.value.as_code_list.length);
+
+  data.list?.forEach((item, index) => {
+    arr1[item.data_type]--
+    arr2[item.data_type]++
+  })
+  weatherNormal.value = arr1
+  weatherWarning.value = arr2
+
+  nextTick(() => {
+    showWeather()
+    showElement()
+  })
 };
 
 // 获取自动站定检证书
 // 返回两个数组中相同的个数
 function findCommonCount(arr1, arr2) {
-	const common = arr1.filter(item => arr2.includes(item));
-	return common.length;
+  const common = arr1.filter(item => arr2.includes(item));
+  return common.length;
 }
 const certificateList = ref<any>({})
 const getCertificate = async () => {
 
-	const { data } = await getCertificateList()
-	// certificateList.value.a = data[0]?.length || 0
-	certificateList.value.a = findCommonCount(pageable.value.as_code_list, data[0]?.length ? data[0] : [])
-	certificateList.value.b = findCommonCount(pageable.value.as_code_list, data[1]?.length ? data[1] : [])
-	certificateList.value.c = findCommonCount(pageable.value.as_code_list, data[2]?.length ? data[2] : [])
+  const { data } = await getCertificateList()
+  // certificateList.value.a = data[0]?.length || 0
+  certificateList.value.a = findCommonCount(pageable.value.as_code_list, data[0]?.length ? data[0] : [])
+  certificateList.value.b = findCommonCount(pageable.value.as_code_list, data[1]?.length ? data[1] : [])
+  certificateList.value.c = findCommonCount(pageable.value.as_code_list, data[2]?.length ? data[2] : [])
 
-	nextTick(() => {
-		showPeriod()
-	})
-	// certificateList.value=data.list
+  nextTick(() => {
+    showPeriod()
+  })
+  // certificateList.value=data.list
 };
 
 // 获取FTP链路
 const FTPList = ref<any>({})
 const getFTP = async () => {
-	const { data } = await getFTPList()
-	FTPList.value = data
+  const { data } = await getFTPList()
+  FTPList.value = data
 };
 
-
-// 获取设备工况
+// 获取设备工况 stateList（用于存储设备状态）、getDeviceStatus（存储设备状态）
 const stateList = ref<any>()
 const getDeviceStatus = async () => {
-	const { data } = await getStaitemList(pageable.value);
-	const state = { normal: 0, warning: 0, error: 0 }
-
-	data?.list?.forEach(item => {
-		const staList = item.sta_list;
-		staList.forEach(sta => {
-			if (sta.state === 0) {
-				state.normal++;
-			} else if (sta.state === 2) { // 注意：你的要求中提到了state为2的个数，但原始数据中并没有state为2的例子，这里我假设你需要统计它  
-				state.warning++;
-			} else if (sta.state === 3) {
-				state.error++;
-			}
-			// 对于其他state值，这里不做处理，如果需要可以添加额外的条件分支  
-		});
-
-
-	});
-
-	stateList.value = state
-	nextTick(() => {
-		showDevice()
-	})
+  const { data } = await getStaitemList(pageable.value);
+  const state = { normal: [], warning: [], error: [] }
+
+  data?.list?.forEach(item => {
+    const staList = item.sta_list;
+    staList.forEach(sta => {
+      if (sta.state === 0) {
+        if (!state.normal.includes(item.as_code)) {
+          state.normal.push(item.as_code);
+        }
+        // state.normal++;
+      } else if (sta.state === 2) { // 注意：你的要求中提到了state为2的个数，但原始数据中并没有state为2的例子，这里我假设你需要统计它  
+        if (!state.warning.includes(item.as_code)) {
+          state.warning.push(item.as_code);
+        }
+        // state.warning++;
+      } else if (sta.state === 3) {
+        if (!state.error.includes(item.as_code)) {
+          state.error.push(item.as_code);
+        }
+        // state.error++;
+      }
+    });
+  });
+  state.normal=state.normal?.filter(item => !state.error?.includes(item)); //过滤正常状态设备，删除掉异常状态的设备代码
+
+  stateList.value = state
+  nextTick(() => {
+    showDevice()
+  })
 };
 
 const handleSearch = () => {
-	getArrive()
-	weatherInfo()
-	getCertificate()
-	getFTP()
-	getDeviceStatus()
+  getArrive()
+  weatherInfo()
+  getCertificate()
+  getFTP()
+  getDeviceStatus()
 }
 
 
@@ -342,466 +348,471 @@ const isDark = computed(() => globalStore.isDark);
 const showDevice = () => {
 
 
-	let mychart = echarts.init(device.value);
-	let option = {
-		tooltip: {
-			trigger: 'item',
-			formatter: "{a} <br/>{b}: {c}台"
-		},
-		legend: {
-			bottom: '0%',
-			left: 'center',
-			textStyle: {//图例文字的样式
-				color: isDark.value ? '#fff' : "#000",
-			}
-		},
-		series: [
-			{
-				name: '设备工况',
-				type: 'pie',
-				radius: ['50%', '68%'],
-				center: ['50%', '45%'],
-				hoverAnimation: false,
-				itemStyle: {
-					borderRadius: 3,
-					borderColor: '#fff',
-					borderWidth: 1
-				},
-				label: {
-					normal: {
-						show: true,
-						position: 'outer',
-						formatter: '{b}：{c}',
-						overflow: 'none',
-						fontSize: 15,
-					},
-				},
-				emphasis: {
-					label: {
-						show: true,
-						fontSize: 20,
-						fontWeight: 'bold'
-					}
-				},
-				//设置提示线
-				labelLine: {
-					normal: {
-						show: true,//开启提示线展示
-						length: 10,//设置第一条提示线长度
-						length2: 30,//设置第二条提示线长度
-
-					}
-				},
-
-				data: [
-					{
-						value: stateList.value ? stateList.value.normal : 0,
-						name: '正常',
-						itemStyle: { color: '#00C4B3' },
-						label: { color: '#00C4B3' }
-					},
-					{
-						value: stateList.value ? stateList.value.warning : 0,
-						name: '告警',
-						itemStyle: { color: '#EF6666' },
-						label: { color: '#EF6666' }
-					},
-					{
-						value: stateList.value ? stateList.value.error : 0,
-						name: '故障',
-						itemStyle: { color: '#FAC858' },
-						label: { color: '#FAC858' }
-					}
-				]
-			}
-		]
-	};
-	mychart.setOption(option)
-	window.addEventListener("resize", function () {
-		mychart.resize();
-	});
+  let mychart = echarts.init(device.value);
+  let option = {
+    tooltip: {
+      trigger: 'item',
+      formatter:function(params) {
+        return `<div>${params.name}：${params.value}台</div>`;
+      }
+    },
+    legend: {
+      bottom: '0%',
+      left: 'center',
+      textStyle: {//图例文字的样式
+        color: isDark.value ? '#fff' : "#000",
+      }
+    },
+    series: [
+      {
+        name: '设备工况',
+        type: 'pie',
+        radius: ['50%', '68%'],
+        center: ['50%', '45%'],
+        hoverAnimation: false,
+        itemStyle: {
+          borderRadius: 3,
+          borderColor: '#fff',
+          borderWidth: 1
+        },
+        label: {
+          normal: {
+            show: true,
+            position: 'outer',
+            formatter: '{b}：{c}',
+            overflow: 'none',
+            fontSize: 15,
+          },
+        },
+        emphasis: {
+          label: {
+            show: true,
+            fontSize: 20,
+            fontWeight: 'bold'
+          }
+        },
+        //设置提示线
+        labelLine: {
+          normal: {
+            show: true,//开启提示线展示
+            length: 10,//设置第一条提示线长度
+            length2: 30,//设置第二条提示线长度
+
+          }
+        },
+
+        data: [
+          {
+            value: stateList.value ? stateList.value.normal.length : 0,
+            name: '正常',
+            list: stateList.value ? stateList.value.normal : [],
+            itemStyle: { color: '#00C4B3' },
+            label: { color: '#00C4B3' }
+          },
+          {
+            value: stateList.value ? stateList.value.warning.length : 0,
+            name: '告警',
+            list: stateList.value ? stateList.value.warning : [],
+            itemStyle: { color: '#EF6666' },
+            label: { color: '#EF6666' }
+          },
+          {
+            value: stateList.value ? stateList.value.error.length : 0,
+            name: '故障',
+            list: stateList.value ? stateList.value.error : [],
+            itemStyle: { color: '#FAC858' },
+            label: { color: '#FAC858' }
+          }
+        ]
+      }
+    ]
+  };
+  mychart.setOption(option)
+  window.addEventListener("resize", function () {
+    mychart.resize();
+  });
 }
 const showPeriod = () => {
-	let mychart = echarts.init(period.value);
-	let option = {
-		tooltip: {
-			trigger: 'item',
-			formatter: "{a} <br/>{b}: {c}台"
-
-		},
-		legend: {
-			bottom: 0,
-			left: 'center',
-			textStyle: {//图例文字的样式
-				color: isDark.value ? '#fff' : "#000",
-			}
-		},
-		series: [
-			{
-				name: '检定周期',
-				type: 'pie',
-				radius: '65%',
-				center: ['50%', '45%'],
-				label: {
-					normal: {
-						show: true,
-						position: 'outer',
-						formatter: '{b}：{c}',
-						fontSize: 14,
-					},
-				},
-
-				data: [
-					{ value: certificateList.value.c ? certificateList.value.c : 0, name: '剩余31-60天', itemStyle: { color: '#5470C6' } },
-					{ value: certificateList.value.b ? certificateList.value.b : 0, name: '剩余1-30天', itemStyle: { color: '#FAC858' } },
-					{ value: certificateList.value.a ? certificateList.value.a : 0, name: '已过检', itemStyle: { color: '#EF6666' } }
-				],
-				emphasis: {
-					itemStyle: {
-						shadowBlur: 10,
-						shadowOffsetX: 0,
-						shadowColor: 'rgba(0, 0, 0, 0.5)'
-					}
-				}
-			}
-		]
-	};
-
-	mychart.setOption(option)
-	window.addEventListener("resize", function () {
-		mychart.resize();
-	});
+  let mychart = echarts.init(period.value);
+  let option = {
+    tooltip: {
+      trigger: 'item',
+      formatter: "{a} <br/>{b}: {c}台"
+
+    },
+    legend: {
+      bottom: 0,
+      left: 'center',
+      textStyle: {//图例文字的样式
+        color: isDark.value ? '#fff' : "#000",
+      }
+    },
+    series: [
+      {
+        name: '检定周期',
+        type: 'pie',
+        radius: '65%',
+        center: ['50%', '45%'],
+        label: {
+          normal: {
+            show: true,
+            position: 'outer',
+            formatter: '{b}：{c}',
+            fontSize: 14,
+          },
+        },
+
+        data: [
+          { value: certificateList.value.c ? certificateList.value.c : 0, name: '剩余31-60天', itemStyle: { color: '#5470C6' } },
+          { value: certificateList.value.b ? certificateList.value.b : 0, name: '剩余1-30天', itemStyle: { color: '#FAC858' } },
+          { value: certificateList.value.a ? certificateList.value.a : 0, name: '已过检', itemStyle: { color: '#EF6666' } }
+        ],
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+      }
+    ]
+  };
+
+  mychart.setOption(option)
+  window.addEventListener("resize", function () {
+    mychart.resize();
+  });
 }
 
 const allSataion = ref(5)
 const showWeather = () => {
-	let mychart = echarts.init(weather.value);
-	let option = {
-		title: {
-			text: `${pageable.value.as_code_list.length} \n 总站数 `,
-			left: "center",
-			top: "38%",
-			textStyle: {
-				fontSize: 20,
-				color: '#000',
-			},
-		},
-		tooltip: {
-			trigger: 'item',
-			formatter: "{a} <br/>{b}: {c}"
-		},
-		legend: {
-			bottom: '1%',
-			left: 'center',
-			textStyle: {//图例文字的样式
-				color: isDark.value ? '#fff' : "#000",
-			}
-		},
-		series: [
-			{
-				name: '设备工况',
-				type: 'pie',
-				radius: ['50%', '70%'],
-				center: ['50%', '45%'],
-				hoverAnimation: false,
-				itemStyle: {
-					borderRadius: 3,
-					borderColor: '#fff',
-					borderWidth: 1
-				},
-				label: {
-					normal: {
-						show: true,
-						position: 'outer',
-						formatter: '{b}：{c}',
-						overflow: 'none',
-						fontSize: 15,
-					},
-				},
-				emphasis: {
-					label: {
-						show: true,
-						fontSize: 20,
-						fontWeight: 'bold'
-					}
-				},
-				//设置提示线
-				labelLine: {
-					normal: {
-						show: true,//开启提示线展示
-						length: 15,//设置第一条提示线长度
-						length2: 30,//设置第二条提示线长度
-
-					}
-				},
-
-				data: [
-					{
-						value: pageable.value.as_code_list.length - dangetWeatherNum.value,
-						name: '正常',
-						itemStyle: { color: '#5470C6' },
-						label: { color: '#5470C6' }
-					},
-					{
-						value: dangetWeatherNum.value,
-						name: '告警',
-						itemStyle: { color: '#EF6666' },
-						label: { color: '#EF6666' }
-					}
-				]
-			}
-		]
-	};
-	mychart.setOption(option)
-	window.addEventListener("resize", function () {
-		mychart.resize();
-	});
+  let mychart = echarts.init(weather.value);
+  let option = {
+    title: {
+      text: `${pageable.value.as_code_list.length} \n 总站数 `,
+      left: "center",
+      top: "38%",
+      textStyle: {
+        fontSize: 20,
+        color: '#000',
+      },
+    },
+    tooltip: {
+      trigger: 'item',
+      formatter: "{a} <br/>{b}: {c}"
+    },
+    legend: {
+      bottom: '1%',
+      left: 'center',
+      textStyle: {//图例文字的样式
+        color: isDark.value ? '#fff' : "#000",
+      }
+    },
+    series: [
+      {
+        name: '天气状况',
+        type: 'pie',
+        radius: ['50%', '70%'],
+        center: ['50%', '45%'],
+        hoverAnimation: false,
+        itemStyle: {
+          borderRadius: 3,
+          borderColor: '#fff',
+          borderWidth: 1
+        },
+        label: {
+          normal: {
+            show: true,
+            position: 'outer',
+            formatter: '{b}：{c}',
+            overflow: 'none',
+            fontSize: 15,
+          },
+        },
+        emphasis: {
+          label: {
+            show: true,
+            fontSize: 20,
+            fontWeight: 'bold'
+          }
+        },
+        //设置提示线
+        labelLine: {
+          normal: {
+            show: true,//开启提示线展示
+            length: 15,//设置第一条提示线长度
+            length2: 30,//设置第二条提示线长度
+
+          }
+        },
+
+        data: [
+          {
+            value: pageable.value.as_code_list.length - dangetWeatherNum.value,
+            name: '正常',
+            itemStyle: { color: '#5470C6' },
+            label: { color: '#5470C6' }
+          },
+          {
+            value: dangetWeatherNum.value,
+            name: '告警',
+            itemStyle: { color: '#EF6666' },
+            label: { color: '#EF6666' }
+          }
+        ]
+      }
+    ]
+  };
+  mychart.setOption(option)
+  window.addEventListener("resize", function () {
+    mychart.resize();
+  });
 }
 
 const showElement = () => {
-	let mychart = echarts.init(element.value);
-	let option = {
-		tooltip: {
-			trigger: 'axis',
-			axisPointer: {
-				type: 'shadow'
-			}
-		},
-		grid: {
-			top: '3%',
-			left: '3%',
-			right: '4%',
-			bottom: '0%',
-			containLabel: true
-		},
-		xAxis: [
-			{
-				type: 'category',
-				data: [
-					'能见度',
-					'风速',
-					'大气电场',
-					'云量',
-					'云高',
-					'温度',
-					'湿度',
-					'小时雨量'
-				]
-			}
-		],
-		yAxis: [
-			{
-				type: 'value'
-			}
-		],
-		series: [
-			{
-				name: '正常',
-				barWidth: '50%',
-				type: 'bar',
-				stack: 'Ad',
-				emphasis: {
-					focus: 'series'
-				},
-				itemStyle: {
-					color: '#5470C6'
-				},
-				data: weatherNormal.value
-			},
-			{
-				name: '告警',
-				barWidth: '50%',
-				type: 'bar',
-				stack: 'Ad',
-				emphasis: {
-					focus: 'series'
-				},
-				itemStyle: {
-					color: '#EF6666'
-				},
-				data: weatherWarning.value
-			}
-		]
-	};
-
-	mychart.setOption(option)
-	window.addEventListener("resize", function () {
-		mychart.resize();
-	});
+  let mychart = echarts.init(element.value);
+  let option = {
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      }
+    },
+    grid: {
+      top: '3%',
+      left: '3%',
+      right: '4%',
+      bottom: '0%',
+      containLabel: true
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: [
+          '能见度',
+          '风速',
+          '大气电场',
+          '云量',
+          '云高',
+          '温度',
+          '湿度',
+          '小时雨量'
+        ]
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value'
+      }
+    ],
+    series: [
+      {
+        name: '正常',
+        barWidth: '50%',
+        type: 'bar',
+        stack: 'Ad',
+        emphasis: {
+          focus: 'series'
+        },
+        itemStyle: {
+          color: '#5470C6'
+        },
+        data: weatherNormal.value
+      },
+      {
+        name: '告警',
+        barWidth: '50%',
+        type: 'bar',
+        stack: 'Ad',
+        emphasis: {
+          focus: 'series'
+        },
+        itemStyle: {
+          color: '#EF6666'
+        },
+        data: weatherWarning.value
+      }
+    ]
+  };
+
+  mychart.setOption(option)
+  window.addEventListener("resize", function () {
+    mychart.resize();
+  });
 }
 
 const showControl = () => {
-	let mychart = echarts.init(control.value);
-	let option = {
-		tooltip: {
-			trigger: 'axis',
-			axisPointer: {
-				type: 'shadow'
-			}
-		},
-		legend: {
-			textStyle: {//图例文字的样式
-				color: isDark.value ? '#fff' : "#000",
-			}
-		},
-		grid: {
-			left: '15',
-			right: '15',
-			bottom: '3%',
-			containLabel: true
-		},
-		xAxis: [
-			{
-				type: 'category',
-				data: arriveTime.value
-			}
-		],
-		yAxis: [
-			{
-				type: 'value'
-			}
-		],
-		series: [
-
-			{
-				name: '应报情况',
-				type: 'bar',
-				stack: 'Ad',
-				emphasis: {
-					focus: 'series'
-				},
-				itemStyle: {
-					color: '#3BA272' // 蓝色
-				},
-				data: arriveList.value.aa.length ? arriveList.value.aa : [],
-			},
-			{
-				name: '实报情况',
-				type: 'bar',
-				stack: 'Ad',
-				emphasis: {
-					focus: 'series'
-				},
-				itemStyle: {
-					color: '#5470C6' // 绿色
-				},
-				data: arriveList.value.bb.length ? arriveList.value.bb : [],
-			},
-			{
-				name: '未报情况',
-				type: 'bar',
-				stack: 'Ad',
-				emphasis: {
-					focus: 'series'
-				},
-				itemStyle: {
-					color: '#EF6666' // 红色
-				},
-				data: arriveList.value.cc.length ? arriveList.value.cc : [],
-			},
-
-		]
-	};
-
-	mychart.setOption(option)
-	window.addEventListener("resize", function () {
-		mychart.resize();
-	});
+  let mychart = echarts.init(control.value);
+  let option = {
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      }
+    },
+    legend: {
+      textStyle: {//图例文字的样式
+        color: isDark.value ? '#fff' : "#000",
+      }
+    },
+    grid: {
+      left: '15',
+      right: '15',
+      bottom: '3%',
+      containLabel: true
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: arriveTime.value
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value'
+      }
+    ],
+    series: [
+
+      {
+        name: '应报情况',
+        type: 'bar',
+        stack: 'Ad',
+        emphasis: {
+          focus: 'series'
+        },
+        itemStyle: {
+          color: '#3BA272' // 蓝色
+        },
+        data: arriveList.value.aa.length ? arriveList.value.aa : [],
+      },
+      {
+        name: '实报情况',
+        type: 'bar',
+        stack: 'Ad',
+        emphasis: {
+          focus: 'series'
+        },
+        itemStyle: {
+          color: '#5470C6' // 绿色
+        },
+        data: arriveList.value.bb.length ? arriveList.value.bb : [],
+      },
+      {
+        name: '未报情况',
+        type: 'bar',
+        stack: 'Ad',
+        emphasis: {
+          focus: 'series'
+        },
+        itemStyle: {
+          color: '#EF6666' // 红色
+        },
+        data: arriveList.value.cc.length ? arriveList.value.cc : [],
+      },
+
+    ]
+  };
+
+  mychart.setOption(option)
+  window.addEventListener("resize", function () {
+    mychart.resize();
+  });
 }
 watch(isDark, () => { showDevice(), showPeriod(), showWeather(), showElement(), showControl() });
 
 onMounted(() => {
-	// getFTP()
-	// getCertificate()
-	getPlatforms()
-	// showDevice()
-	// showPeriod()
-	// showWeather()
-	// showElement()
-	// showControl()
+  // getFTP()
+  // getCertificate()
+  getPlatforms()
+  // showDevice()
+  // showPeriod()
+  // showWeather()
+  // showElement()
+  // showControl()
 })
 let intervalId;
 
 onActivated(() => {
-	intervalId = setInterval(() => {
-		// getList();
-		weatherInfo()
-		getCertificate();
-		getFTP();
-		getDeviceStatus();
-		getArrive();
-	}, 60 * 1000);
+  intervalId = setInterval(() => {
+    // getList();
+    weatherInfo()
+    getCertificate();
+    getFTP();
+    getDeviceStatus();
+    getArrive();
+  }, 60 * 1000);
 });
 
 onDeactivated(() => {
-	clearInterval(intervalId);
+  clearInterval(intervalId);
 });
 </script>
 <style scoped lang="scss">
 .el-row .el-col {
-	margin-bottom: 15px;
+  margin-bottom: 15px;
 }
 
 .main_list {
-	background: transparent !important;
-	box-shadow: none !important;
-	padding: 0 !important;
-	height: calc(100vh - 150px);
-	margin-bottom: 10px;
-	overflow-y: scroll;
-	overflow-x: hidden;
-
-
-	.chart_item {
-		border-radius: 10px;
-		padding: 10px;
-		background-color: #fff;
-		// height: 100%;
-		// margin-bottom: 15px;
-
-
-		.item_title {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-		}
-
-		.FTP_box {
-			padding: 0 50px;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.FTP_item {
-				flex: 1;
-				flex-shrink: 0;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-
-				img {
-					width: 56px;
-					margin-bottom: 20px;
-				}
-			}
-
-		}
-	}
-
-	.info_box {
-		.info_title {
-			color: #999999;
-			font-size: 16px;
-		}
-
-		.info_content {
-			height: 40px;
-			font-weight: bold;
-			color: #000;
-			font-size: 26px;
-		}
-	}
+  background: transparent !important;
+  box-shadow: none !important;
+  padding: 0 !important;
+  height: calc(100vh - 150px);
+  margin-bottom: 10px;
+  overflow-y: scroll;
+  overflow-x: hidden;
+
+
+  .chart_item {
+    border-radius: 10px;
+    padding: 10px;
+    background-color: #fff;
+    // height: 100%;
+    // margin-bottom: 15px;
+
+
+    .item_title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+
+    .FTP_box {
+      padding: 0 50px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      .FTP_item {
+        flex: 1;
+        flex-shrink: 0;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        img {
+          width: 56px;
+          margin-bottom: 20px;
+        }
+      }
+
+    }
+  }
+
+  .info_box {
+    .info_title {
+      color: #999999;
+      font-size: 16px;
+    }
+
+    .info_content {
+      height: 40px;
+      font-weight: bold;
+      color: #000;
+      font-size: 26px;
+    }
+  }
 
 }
-</style>
+</style>

src/views/alarm/allWeather/index.vue

@@ -17,7 +17,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small" @sort-change="handleSortChange">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true" >
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true" >
           <template #default="scope">
             {{ (pageable.pageNum - 1) * pageable.pageSize + scope.$index + 1 }}
           </template>

src/views/alarm/singleDevice/index.vue

@@ -146,7 +146,7 @@
             <div v-if="radio1==='2'" class="table-box" style="margin-top: 10px;" >
               <!-- 表格主体 -->
               <el-table stripe ref="tableRef" :border="true" :data="processTableData2"  size="small">
-                <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+                <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
                   <template #default="scope">
                     {{scope.$index + 1 }}
                   </template>

src/views/alarm/singleStationData/index.vue

@@ -484,10 +484,10 @@
 							</template>
 						</div>
 					</el-tab-pane>
-					<el-tab-pane label="日照文">
+					<el-tab-pane label="光照度">
 						<div class="container-tag">
 							<template v-for="item in elementList" :key="item.id">
-								<div v-if="item.data_type === '日照文'"
+								<div v-if="item.data_type === '光照度'"
 									:class="item.isSelected ? 'item-tag-active' : 'item-tag'"
 									@click="toggleSelection(item)">{{ item.data_name }}</div>
 							</template>

src/views/alarm/software/index.vue

@@ -20,7 +20,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="showList"  size="small">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true" >
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true" >
           <template #default="scope">
             {{ (pageable.pageNum - 1) * pageable.pageSize + scope.$index + 1 }}
           </template>

src/views/analysis/dataSynthesis/index.vue

@@ -21,7 +21,7 @@
 						<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm"
 							:format="value1 ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm'"
 							:type="value1 ? 'daterange' : 'datetimerange'" range-separator="-" start-placeholder="开始时间"
-							end-placeholder="结束时间" :disabled-date="disabledDate" @focus="handleFocus"
+							end-placeholder="结束时间" :disabled-date="disabledDate" @focus="handleFocus" :editable="false"
 							@calendar-change="handleChange" @change="handleDateChange"
 							:default-time="[new Date(2000, 1, 1, 0, 0), new Date(2000, 1, 1, new Date().getHours(), 0)]"
 							style="width: 300px;"></el-date-picker>
@@ -29,7 +29,7 @@
 				</el-form-item>
 				<el-form-item>
 					<div>
-						<el-button type="primary" @click="getHistoryList">查询</el-button>
+						<el-button type="primary" @click="getHistoryList" :loading="buttonLoading">查询</el-button>
 						<el-button plain @click="resetForm">重置</el-button>
 					</div>
 				</el-form-item>
@@ -64,6 +64,7 @@ import { parseTime } from '@/utils/index';
 import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp, isDateFuture, isDateRangeWithinDays } from "@/utils/dateTime";
 import { ElLoading } from "element-plus";
 import { useUserStore } from "@/stores/modules/user";
+const buttonLoading=ref(false)
 
 
 const value1 = ref(true)
@@ -95,6 +96,7 @@ const handleDateRangeChange = (newVal) => {
 	}
 };
 const handleDateChange = async (e) => {
+  
 	if (isDateFuture(e[0]) || isDateFuture(e[1])) {
 		ElMessage.error("不得选择未来的时间");
 	} else {
@@ -229,7 +231,7 @@ const pressureInfo = ref<any>({
 })
 const getHistoryList = async () => {
 
-
+  buttonLoading.value=true
 	if (isDateFuture(dateRange.value[0]) || isDateFuture(dateRange.value[1])) {
 		ElMessage.error("不得选择未来的时间");
 		return false;
@@ -255,6 +257,7 @@ const getHistoryList = async () => {
 	nextTick(() => {
 		showData()
 	})
+  buttonLoading.value=false
 };
 function getMaxAndAdd50(arr) {
 

src/views/analysis/lightningArea/index.vue

@@ -21,7 +21,7 @@
 						<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm"
 							:format="value1 ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm'"
 							:type="value1 ? 'daterange' : 'datetimerange'" range-separator="-" start-placeholder="开始时间"
-							end-placeholder="结束时间" :disabled-date="disabledDate" @focus="handleFocus"
+							end-placeholder="结束时间" :disabled-date="disabledDate" @focus="handleFocus" :editable="false"
 							@calendar-change="handleChange" @change="handleDateChange"
 							:default-time="[new Date(2000, 1, 1, 0, 0), new Date(2000, 1, 1, new Date().getHours(), 0)]"
 							style="width: 300px;"></el-date-picker>
@@ -29,7 +29,7 @@
 				</el-form-item>
 				<el-form-item>
 					<div>
-						<el-button type="primary" @click="handleDateChange(dateRange)">查询</el-button>
+						<el-button type="primary" @click="handleDateChange(dateRange)" :loading="buttonLoading" >查询</el-button>
 						<el-button plain @click="resetForm">重置</el-button>
 					</div>
 				</el-form-item>
@@ -63,6 +63,7 @@ import { Platform } from "@/api/interface";
 import { parseTime } from '@/utils/index';
 import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp, isDateFuture, isDateRangeWithinDays } from "@/utils/dateTime";
 import { useUserStore } from "@/stores/modules/user";
+const buttonLoading=ref(false)
 const value1 = ref(true)
 const dateRange = ref<[any, any]>([parseTime(new Date(), '{y}-{m}-{d}') + ' 00:00', parseTime(new Date(), '{y}-{m}-{d} {h}:{i}')]);
 const changetype = (e) => {
@@ -89,6 +90,7 @@ const handleDateRangeChange = (newVal) => {
 	}
 };
 const handleDateChange = async (e) => {
+  buttonLoading.value=true
 	if (isDateFuture(e[0]) || isDateFuture(e[1])) {
 		ElMessage.error("不得选择未来的时间");
 	} else {
@@ -108,6 +110,7 @@ const handleDateChange = async (e) => {
 			}
 		}
 	}
+  buttonLoading.value=false
 }
 const pickDay = ref()
 const handleFocus = () => {

src/views/analysis/rainfall/index.vue

@@ -27,7 +27,7 @@
 						<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm"
 							:format="value1 === 1440 ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm'"
 							:type="value1 === 1440 ? 'daterange' : 'datetimerange'" range-separator="-"
-							start-placeholder="开始时间" end-placeholder="结束时间" :disabled-date="disabledDate"
+							start-placeholder="开始时间" end-placeholder="结束时间" :disabled-date="disabledDate" :editable="false"
 							@focus="handleFocus" @calendar-change="handleChange" @change="handleDateChange"
 							:default-time="[new Date(2000, 1, 1, 0, 0), new Date(2000, 1, 1, 0, 0)]"
 							style="width: 300px;"></el-date-picker>
@@ -35,7 +35,7 @@
 				</el-form-item>
 				<el-form-item>
 					<div>
-						<el-button type="primary" @click="getHistoryList">查询</el-button>
+						<el-button type="primary" @click="getHistoryList" :loading="buttonLoading">查询</el-button>
 						<el-button plain @click="resetForm">重置</el-button>
 					</div>
 				</el-form-item>
@@ -70,6 +70,7 @@ import { Platform } from "@/api/interface";
 import { parseTime } from '@/utils/index';
 import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp, isWithin48Hours, isDateFuture, isDateRangeWithinDays } from "@/utils/dateTime";
 import { useUserStore } from "@/stores/modules/user";
+const buttonLoading=ref(false)
 const value1 = ref(1440)
 const dateRange = ref<[any, any]>([parseTime(new Date(getTimeStamp(5)), '{y}-{m}-{d}') + ' 00:00', parseTime(new Date(), '{y}-{m}-{d}') + ' 00:00']);
 const changetype = (e) => {
@@ -260,6 +261,7 @@ const minArr = ref()
 const isFANDOU = ref(false)
 
 const getHistoryList = async () => {
+  buttonLoading.value=true
 	if (isDateFuture(dateRange.value[0]) || isDateFuture(dateRange.value[1])) {
 		ElMessage.error("不得选择未来的时间");
 		return false;
@@ -305,6 +307,7 @@ const getHistoryList = async () => {
 		showData()
 
 	})
+  buttonLoading.value=false
 };
 
 
@@ -493,4 +496,4 @@ onMounted(() => {
 	height: calc(100vh - 215px);
 	// height: 100%;
 }
-</style>
+</style>

src/views/analysis/windSpeed/index.vue

@@ -17,14 +17,14 @@
 				<el-form-item label="观测时间：" prop="base">
 					<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD"
 						type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"
-						:disabled-date="disabledDate" @focus="handleFocus" @calendar-change="handleChange"
+						:disabled-date="disabledDate" @focus="handleFocus" @calendar-change="handleChange" :editable="false"
 						@change="handleDateChange"
 						:default-time="[new Date(2000, 1, 1, 0, 0), new Date(2000, 1, 1, new Date().getHours(), 0)]"
 						style="width: 300px;"></el-date-picker>
 				</el-form-item>
 				<el-form-item>
 					<div>
-						<el-button type="primary" @click="getHistoryList" >查询</el-button>
+						<el-button type="primary" @click="getHistoryList" :loading="buttonLoading">查询</el-button>
 						<el-button plain @click="resetForm">重置</el-button>
 					</div>
 				</el-form-item>
@@ -62,7 +62,7 @@ import { parseTime } from '@/utils/index';
 import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp,  isDateRangeWithinDays } from "@/utils/dateTime";
 import { ElLoading } from "element-plus";
 import {useUserStore} from "@/stores/modules/user";
-
+const buttonLoading=ref(false)
 /* 全局请求 loading */
 const loading = ref()
 
@@ -208,6 +208,8 @@ const windInfo = ref<any>({
 	speedMax:6
 })
 const getHistoryList = async () => {
+  // startFullLoading()
+  buttonLoading.value=true
 	if (!isDateRangeWithinDays(dateRange.value[0], dateRange.value[1], 90)) {
 		ElMessage.error("时间间隔不能大于90天");
 		return false
@@ -216,6 +218,7 @@ const getHistoryList = async () => {
 	timeArr.value = data.list?.map(item => {
 		return formatDate(item.data_time_i, 1)
 	})
+
 	let arr1 = new Array(16).fill(0);
 	let arr2 = new Array(16).fill([]);
 	let num = 0
@@ -290,6 +293,8 @@ const getHistoryList = async () => {
 	windS.value = arr3
 	showData()
 	showWind()
+  // endFullLoading()
+  buttonLoading.value=false
 };
 // 获取时间戳的小时
 function getHourFromTimestamp(timestamp) {
@@ -584,4 +589,4 @@ onMounted(() => {
 	height: calc(100vh - 215px);
 	// height: 100%;
 }
-</style>
+</style>

src/views/maintenance/siteRecords/index.vue

@@ -36,7 +36,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="processTableData" size="small">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ (pageable.pageNum - 1) * pageable.pageSize + scope.$index + 1 }}
           </template>
@@ -250,7 +250,7 @@ const handleCurrentChange = (val: number) => {
 const processTableData = ref<any>([]);
 
 const getList = async () => {
-  
+
   if (!dateValue.value) return ElMessage.error("请选择日期");
 
   const { data } = await getMaintainrecordList({ ...pageable.value, as_code_list: [pageable.value.as_code], end_time: getStamp(parseTime(new Date(getNextDayMidnight(dateValue.value)), '{y}-{m}-{d}') + ' 00:00'), begin_time: getStamp(parseTime(new Date(dateValue.value), '{y}-{m}-{d}') + ' 00:01') })

src/views/query/deviceHealth/index.vue

@@ -102,7 +102,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small" @sort-change="handleSortChange">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true" >
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true" >
           <template #default="scope">
             {{ (pageable.pageNum - 1) * pageable.pageSize + scope.$index + 1 }}
           </template>
@@ -195,11 +195,12 @@ import {Platform} from "@/api/interface";
 import {ElNotification} from "element-plus";
 import {useUserStore} from "@/stores/modules/user";
 
-
+const userStore = useUserStore();
+const userForm  = computed(() => userStore.userInfo);
 const isStand =ref(true)
 const as_code_list = ref(undefined);
 const hot = ref(true);
-const points =ref(true);
+const points =ref(userForm.value.role_id==='预报员' ? false : true);
 const singleTime =ref(undefined)
 const multiTime =ref(undefined)
 
@@ -675,7 +676,7 @@ const updateColumns = () => {
   const column = [
     { prop: "as_name", label: "站名", width: 100 },
     { prop: "as_code", label: "站号", width: 100 },
-    { prop: "data_time_i", label: "观测时间", width: 170 }
+    { prop: "data_time_i", label: "观测时间", width: 120 }
   ];
   const newColumns = customizeColumns.value.map(item => ({
     prop: item.se_type===0?'yclq_state':item.se_type,
@@ -733,7 +734,7 @@ function loadCustomizeColumns() {
 }
 
 
-const userStore = useUserStore();
+
 const platformList =ref<any>(computed(() => userStore.stations))
 
 const getList = async () => {
@@ -816,7 +817,7 @@ const resetQuery = () => {
   isStand.value = true
   as_code_list.value = undefined;
   hot.value = true;
-  points.value = true;
+  points.value = userForm.value.role_id==='预报员' ? false : true;
   singleTime.value=undefined;
   multiTime.value = undefined;
 

src/views/query/dutyProcess/index.vue

@@ -40,7 +40,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
           </template>

src/views/query/hazardousWeather/index.vue

@@ -37,7 +37,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small" @sort-change="handleSortChange">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true" >
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true" >
           <template #default="scope">
             {{ (pageable.pageNum - 1) * pageable.pageSize + scope.$index + 1 }}
           </template>

src/views/query/queryObservationData/index.vue

@@ -98,7 +98,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small" @sort-change="handleSortChange">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ (pageable.pageNum - 1) * pageable.pageSize + scope.$index + 1 }}
           </template>
@@ -221,10 +221,10 @@
               </template>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="日照文">
+          <el-tab-pane label="光照度">
             <div class="container-tag">
               <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>
+                <div v-if="item.data_type==='光照度'"  :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)" >{{item.data_name}}</div>
               </template>
             </div>
           </el-tab-pane>
@@ -275,6 +275,8 @@ import {ElNotification, ElTable} from "element-plus";
 import {getDataItemList, getPlatformList, getRgDataList} from "@/api/modules/allData";
 import { Platform} from "@/api/interface";
 import {useUserStore} from "@/stores/modules/user";
+const userStore = useUserStore();
+const userForm  = computed(() => userStore.userInfo);
 const tableRef = ref<InstanceType<typeof ElTable>>();
 const dialog = reactive<any>({
   visible: false,
@@ -435,7 +437,7 @@ const pageable = ref<any>({
 const isStand =ref(true)
 const as_code_list = ref(undefined);
 const hot = ref(true);
-const points =ref(true);
+const points =ref(userForm.value.role_id==='预报员' ? false : true);
 const singleTime =ref(undefined)
 const multiTime =ref(undefined)
 
@@ -566,7 +568,7 @@ const resetQuery = () => {
   isStand.value = true
   as_code_list.value = undefined;
   hot.value = true;
-  points.value = true;
+  points.value = userForm.value.role_id==='预报员' ? false : true;
   singleTime.value=undefined;
   multiTime.value = undefined;
   pageable.value.time_order = 0
@@ -749,17 +751,20 @@ const updateColumns = () => {
   const column = [
     { prop: "as_name", label: "站名", width: 100 },
     { prop: "as_code", label: "站号", width: 100 },
-    { prop: "data_time_i", label: "观测时间", width: 170,sortable: true }
+    { prop: "data_time_i", label: "观测时间", width: 120,sortable: true }
   ];
 
   const newColumns = customizeColumns.value.map(item => ({
     prop: item.data_id,
     label: item.data_name +'('+item.data_unit+')',
     sortable: true,
-    width: calculateTextLengthInPixels(item.data_name)
+    // width: calculateTextLengthInPixels(item.data_name)
   }));
 
   columns = [...column, ...newColumns];
+  columns.forEach((column, index) => {
+    renderHeader({ column });
+  });
   pageable.value.data_items = [...customizeColumns.value];
   getList();
 }
@@ -768,7 +773,7 @@ const updateColumns = () => {
 const copiedCustomizeColumns = ref<any>([...customizeColumns.value]);
 
 
-const userStore = useUserStore();
+
 const platformList =ref<any>(computed(() => userStore.stations))
 
 
@@ -845,7 +850,6 @@ function formatDate(timestamp) {
 onMounted(() => {
   const allCodes = platformList.value.map(item => item.as_code);
   pageable.value.as_code_list = allCodes
-
   loadCustomizeColumns()
   updateColumns()
   getAllRgDataList()
@@ -864,6 +868,15 @@ function loadCustomizeColumns() {
     customizeColumns.value = JSON.parse(jsonString);
   }
 }
+
+const renderHeader = ({ column }: { column: any }) => {
+  const span = document.createElement('span');
+  span.innerText = column.label;
+  document.body.appendChild(span);
+  column.minWidth = span.getBoundingClientRect().width + 35;
+  document.body.removeChild(span);
+};
+
 </script>
 <style>
 .tpc .el-time-spinner__wrapper {

src/views/system/disposition/components/distributionAutomatic.vue

@@ -13,7 +13,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small" style="height: 70vh">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ scope.$index + 1 }}
           </template>

src/views/system/disposition/components/serviceBeidou.vue

@@ -13,7 +13,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small" style="height: 70vh">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ scope.$index + 1 }}
           </template>

src/views/system/role/index.vue

@@ -18,7 +18,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="filteredData"  size="small">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
           </template>

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 :value="0">空军报文格式</el-radio>
+            <el-radio :value="0">军队报文格式</el-radio>
           </el-col>
           <el-col :span="4">
-            <el-radio  :value="1">军队报文格式</el-radio>
+            <el-radio  :value="1">空军报文格式</el-radio>
           </el-col>
         </el-row>
         </el-radio-group>

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

@@ -12,8 +12,9 @@
                   :reserve-selection="item.type == 'selection'">
                   <template #default="scope">
                     <template v-if="item.prop === 'use_able'">
-                      <div style="text-align: center;"><el-checkbox v-model="scope.row.use_able" :true-value="1"
-                          :false-value="0" disabled /></div>
+                      <div style="text-align: center;">
+                        <el-checkbox v-model="scope.row.use_able" :true-value="1" :false-value="0" disabled />
+                      </div>
                     </template>
                     <template v-if="item.prop === 'part_type'">
                       <div>{{ findNameByType(1, scope.row.part_type) }}</div>
@@ -191,42 +192,62 @@ const platformInfo = ref<any>({
 })
 const getPlatformListInfo = async () => {
   let { data } = await getPlatformList({ pageNum: 1, pageSize: 20, asCode: props.selectData?.as_code })
-  const dataInfo = data?.list ? data.list[0] : {}
-  platformInfo.value = {
-    fybsjjgList: dataInfo?.fybsjjg?.split('|'),
-    mfbqytjList: dataInfo?.mfbqytj?.split('|'),
-    mfsdbdxhgxsList: dataInfo?.mfsdbdxhgxs?.split('|'),
-    fxcgqzbpcList: [dataInfo?.fxcgqzbpc ? 1 : 0, dataInfo?.fxcgqzbpc],
-    lbszdfxhqx: dataInfo?.lbszdfxhqx,
-    jyyszdfxhqx: dataInfo?.jyyszdfxhqx,
-    ljszdfxhqx: dataInfo?.ljszdfxhqx,
-    bdy300mdyszdfxhqx: dataInfo?.bdy300mdyszdfxhqx,
-    typeList: [{
-      name: '球状干湿表(自然通风速度)',
-      status: dataInfo?.qzgsb_zrtfsd?.split('|')[0],
-      nofrozen: dataInfo?.qzgsb_zrtfsd?.split('|')[1],
-      frozen: dataInfo?.qzgsb_zrtfsd?.split('|')[2],
-    }, {
-      name: '通风干湿表(通风速度0.8m/s)',
-      status: dataInfo?.tfgsb_0_8?.split('|')[0],
-      nofrozen: dataInfo?.tfgsb_0_8?.split('|')[1],
-      frozen: dataInfo?.tfgsb_0_8?.split('|')[2],
-    }, {
-      name: '通风干湿表(通风速度0.5m/s)',
-      status: dataInfo?.tfgsb_0_5?.split('|')[0],
-      nofrozen: dataInfo?.tfgsb_0_5?.split('|')[1],
-      frozen: dataInfo?.tfgsb_0_5?.split('|')[2],
-    }, {
-      name: '球状干湿表(自然通风)*',
-      status: dataInfo?.qzgsb_zrtf?.split('|')[0],
-      nofrozen: dataInfo?.qzgsb_zrtf?.split('|')[1],
-      frozen: dataInfo?.qzgsb_zrtf?.split('|')[2],
-    }, {
-      name: '柱状干湿表(自然通风)*',
-      status: dataInfo?.zzgsb_zrtf?.split('|')[0],
-      nofrozen: dataInfo?.zzgsb_zrtf?.split('|')[1],
-      frozen: dataInfo?.zzgsb_zrtf?.split('|')[2],
-    }]
+
+  const dataInfo = data?.list ? data.list[0] : null
+  console.log(dataInfo, 'list');
+
+  if (dataInfo !== null) {
+    platformInfo.value = {
+      fybsjjgList: dataInfo?.fybsjjg?.split('|'),
+      mfbqytjList: dataInfo?.mfbqytj?.split('|'),
+      mfsdbdxhgxsList: dataInfo?.mfsdbdxhgxs?.split('|'),
+      fxcgqzbpcList: [dataInfo?.fxcgqzbpc ? 1 : 0, dataInfo?.fxcgqzbpc],
+      lbszdfxhqx: dataInfo?.lbszdfxhqx,
+      jyyszdfxhqx: dataInfo?.jyyszdfxhqx,
+      ljszdfxhqx: dataInfo?.ljszdfxhqx,
+      bdy300mdyszdfxhqx: dataInfo?.bdy300mdyszdfxhqx,
+      typeList: [{
+        name: '球状干湿表(自然通风速度)',
+        status: dataInfo?.qzgsb_zrtfsd?.split('|')[0],
+        nofrozen: dataInfo?.qzgsb_zrtfsd?.split('|')[1],
+        frozen: dataInfo?.qzgsb_zrtfsd?.split('|')[2],
+      }, {
+        name: '通风干湿表(通风速度0.8m/s)',
+        status: dataInfo?.tfgsb_0_8?.split('|')[0],
+        nofrozen: dataInfo?.tfgsb_0_8?.split('|')[1],
+        frozen: dataInfo?.tfgsb_0_8?.split('|')[2],
+      }, {
+        name: '通风干湿表(通风速度0.5m/s)',
+        status: dataInfo?.tfgsb_0_5?.split('|')[0],
+        nofrozen: dataInfo?.tfgsb_0_5?.split('|')[1],
+        frozen: dataInfo?.tfgsb_0_5?.split('|')[2],
+      }, {
+        name: '球状干湿表(自然通风)*',
+        status: dataInfo?.qzgsb_zrtf?.split('|')[0],
+        nofrozen: dataInfo?.qzgsb_zrtf?.split('|')[1],
+        frozen: dataInfo?.qzgsb_zrtf?.split('|')[2],
+      }, {
+        name: '柱状干湿表(自然通风)*',
+        status: dataInfo?.zzgsb_zrtf?.split('|')[0],
+        nofrozen: dataInfo?.zzgsb_zrtf?.split('|')[1],
+        frozen: dataInfo?.zzgsb_zrtf?.split('|')[2],
+      }]
+    }
+
+  } else {
+    platformInfo.value = {
+      fybsjjgList: ['', ''],
+      mfbqytjList: ['', ''],
+      mfsdbdxhgxsList: ['', ''],
+      fxcgqzbpcList: ['', ''],
+      lbszdfxhqx: 1,
+      jyyszdfxhqx: 1,
+      ljszdfxhqx: 1,
+      bdy300mdyszdfxhqx: 1,
+      typeList: [{
+
+      }]
+    }
   }
 }
 
@@ -281,7 +302,6 @@ const processTableData = ref<any>([]);
 // 表格配置项
 const columns = reactive<ColumnProps[]>([
   { prop: "use_able", label: "", width: 40 },
-
   { prop: "part_type", label: "项目", width: 200 },
   { prop: "se_mode", label: "观测模式", width: 150 },
   { prop: "se_type", label: "传感器名称" }

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

@@ -200,6 +200,11 @@ const getCertList = async () => {
       obj1.cal_date_i = matchingObj2.cal_date_i;
       obj1.cal_period = matchingObj2.cal_period;
       obj1.next_period = addMonthsToTimestamp(matchingObj2.cal_date_i, matchingObj2.cal_period)
+    }else {
+      obj1.cal_sn = '';
+      obj1.cal_date_i = '';
+      obj1.cal_period = '';
+      obj1.next_period = ''
     }
   });
   certData2.value = props.sensorList?.filter(item =>
@@ -212,6 +217,11 @@ const getCertList = async () => {
       obj1.cal_date_i = matchingObj2.cal_date_i;
       obj1.cal_period = matchingObj2.cal_period;
       obj1.next_period = addMonthsToTimestamp(matchingObj2.cal_date_i, matchingObj2.cal_period)
+    }else {
+      obj1.cal_sn = '';
+      obj1.cal_date_i = '';
+      obj1.cal_period = '';
+      obj1.next_period = ''
     }
   });
 
@@ -224,8 +234,7 @@ const changeTop = (val: any) => {
   instrumentForm.value.element = selectInfo.value?.list[0].cal_condition
 
   selectTable.value = selectInfo.value?.list[0]
-
-
+  
 }
 
 const changeElement = (val: any) => {
@@ -369,18 +378,21 @@ const handleUpdate = async (row?: any) => {
   instrumentForm.value.type = seTypeList?.value[0]?.name
   instrumentForm.value.element = seTypeList?.value[0]?.list[0].cal_condition
   selectTable.value = seTypeList.value.length > 0 ? seTypeList.value[0]?.list[0] : {
-    cal_condition: '',
+    cal_condition: 'NA',
     cal_calsn: '',
     cal_calman: '',
     cal_type: 1,
     cal_param: '',
     cal_param_list: [],
   }
+  
+  if (selectTable.value.cal_condition === '' || selectTable.value.cal_condition === ' ') {
+    selectTable.value.cal_condition = 'NA'
 
+  }
   // instrumentForm.value = { ...instrumentForm.value, ...seTypeList.value[0].list[0] }
 
 
-
   dialog.visible = true;
   dialog.title = "编辑";
   dialog.isMode = false;

src/views/system/stations/index.vue

@@ -4,39 +4,49 @@
       <!-- 表格头部 操作按钮 -->
       <div class="table-header">
         <div class="header-button-lf">
-          <el-form :model="pageable" label-width="auto"  :inline="true">
+          <el-form :model="pageable" label-width="auto" :inline="true">
             <el-form-item label="自动站:">
-              <SelectItem :select-data="selectedData" :select-list="platformList" :is-checkbox="true" @update:selectedItems="selectedItems" style="width: 200px"> </SelectItem>
+              <SelectItem :select-data="selectedData" :select-list="platformList" :is-checkbox="true"
+                          @update:selectedItems="selectedItems" style="width: 200px"></SelectItem>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="handleQuery"> 查询 </el-button>
-              <el-button style="margin-left: 10px" @click="resetQuery"> 重置 </el-button>
-<!--              <el-button  style="margin-left: 10px" type="primary" plain  @click="handleAdd"> 新增 </el-button>-->
+              <el-button type="primary" @click="handleQuery"> 查询</el-button>
+              <el-button style="margin-left: 10px" @click="resetQuery"> 重置</el-button>
+              <!--              <el-button  style="margin-left: 10px" type="primary" plain  @click="handleAdd"> 新增 </el-button>-->
             </el-form-item>
           </el-form>
         </div>
+        <div class="header-button-ri">
+          <slot name="toolButton">
+            <img class="setting" src="@/assets/images/setting.png" @click="handleSetting"/>
+          </slot>
+        </div>
       </div>
       <!-- 表格主体 -->
-      <el-table stripe ref="tableRef" :border="true" :data="showList"  size="small">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+      <el-table stripe ref="tableRef" :border="true" :data="showList" size="small">
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ (pageable.pageNum - 1) * pageable.pageSize + scope.$index + 1 }}
           </template>
         </el-table-column>
         <template v-for="item in columns" :key="item">
-          <el-table-column v-bind="item" :align="item.align ?? 'left'" :reserve-selection="item.type == 'selection'" :show-overflow-tooltip="true">
+          <el-table-column v-bind="item" :align="item.align ?? 'left'" :reserve-selection="item.type == 'selection'"
+                           :show-overflow-tooltip="true">
             <template #default="scope">
               <template v-if="item.prop === 'address'">
-                {{scope.row['as_province']}}
-                {{scope.row['as_city']}}
-                {{scope.row['as_area']}}
-                {{scope.row['as_address']}}
+                {{ scope.row['as_province'] }}
+                {{ scope.row['as_city'] }}
+                {{ scope.row['as_area'] }}
+                {{ scope.row['as_address'] }}
               </template>
               <template v-if="item.prop === 'map_level'">
-                {{scope.row.map_level+1}}
+                {{ scope.row.map_level + 1 }}
+              </template>
+              <template v-if="item.prop === 'install_type'">
+                {{ findLabelByValue(installTypeList, scope.row.install_type) }}
               </template>
               <template v-if="item.prop === 'view_mode'">
-                {{findLabelByValue(typeList,scope.row.view_mode)}}
+                {{ findLabelByValue(typeList, scope.row.view_mode) }}
               </template>
               <template v-if="item.prop === 'operation'">
                 <el-tooltip
@@ -46,23 +56,23 @@
                   placement="top"
                 >
                   <el-button type="primary" link @click="handleUpdate(scope.row)">
-                    <el-icon >
-                      <Edit />
+                    <el-icon>
+                      <Edit/>
                     </el-icon>
                   </el-button>
                 </el-tooltip>
-<!--                <el-tooltip-->
-<!--                  class="box-item"-->
-<!--                  effect="dark"-->
-<!--                  content="删除"-->
-<!--                  placement="top"-->
-<!--                >-->
-<!--                  <el-button type="primary" link  @click="handleDelete(scope.row)">-->
-<!--                    <el-icon >-->
-<!--                      <Delete />-->
-<!--                    </el-icon>-->
-<!--                  </el-button>-->
-<!--                </el-tooltip>-->
+                <!--                <el-tooltip-->
+                <!--                  class="box-item"-->
+                <!--                  effect="dark"-->
+                <!--                  content="删除"-->
+                <!--                  placement="top"-->
+                <!--                >-->
+                <!--                  <el-button type="primary" link  @click="handleDelete(scope.row)">-->
+                <!--                    <el-icon >-->
+                <!--                      <Delete />-->
+                <!--                    </el-icon>-->
+                <!--                  </el-button>-->
+                <!--                </el-tooltip>-->
               </template>
             </template>
           </el-table-column>
@@ -72,27 +82,28 @@
         <template #empty>
           <div class="table-empty">
             <slot name="empty">
-              <img src="@/assets/images/notData.png" alt="notData" />
+              <img src="@/assets/images/notData.png" alt="notData"/>
               <div>暂无数据</div>
             </slot>
           </div>
         </template>
       </el-table>
       <!-- 分页组件 -->
-      <Pagination :pageable="pageable" :handle-size-change="handleSizeChange" :handle-current-change="handleCurrentChange" />
+      <Pagination :pageable="pageable" :handle-size-change="handleSizeChange" :handle-current-change="handleCurrentChange"/>
     </div>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog v-if="dialog.visible" :title="dialog.title" v-model="dialog.visible" width="1600px" append-to-body :close-on-click-modal="false">
+    <el-dialog v-if="dialog.visible" :title="dialog.title" v-model="dialog.visible" width="1600px" append-to-body
+               :close-on-click-modal="false">
       <el-tabs tab-position="left" class="demo-tabs" style="height: 700px">
         <el-tab-pane label="基本参数">
           <ParametersBasic :select-data="rowItem"></ParametersBasic>
         </el-tab-pane>
         <el-tab-pane label="观测要素">
-         <Translation :select-data="rowItem" :sensorList="sensorList"></Translation>
+          <Translation :select-data="rowItem" :sensorList="sensorList2"></Translation>
         </el-tab-pane>
         <el-tab-pane label="仪器检定证">
-          <VerificationCertificate :select-data="rowItem" :sensorList="sensorList"></VerificationCertificate>
+          <VerificationCertificate :select-data="rowItem" :sensorList="sensorList2"></VerificationCertificate>
         </el-tab-pane>
         <el-tab-pane label="阈值设置">
           <Threshold :select-data="rowItem"></Threshold>
@@ -105,6 +116,78 @@
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
+
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="dialog2.title" v-model="dialog2.visible" width="1200px" append-to-body>
+      <div style="height: 500px;display: flex">
+        <el-tabs tab-position="left" class="demo-tabs" style="height: 100%;flex-grow: 1">
+          <el-tab-pane label="基本信息">
+            <div class="container-tag">
+              <template v-for="item in sensorList" :key="item.prop">
+                <div v-if="item.se_type===0" :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)">
+                  {{ item.label }}
+                </div>
+              </template>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="通信方式">
+            <div class="container-tag">
+              <template v-for="item in sensorList" :key="item.prop">
+                <div v-if="item.se_type===1" :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)">
+                  {{ item.label }}
+                </div>
+              </template>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="位置信息">
+            <div class="container-tag">
+              <template v-for="item in sensorList" :key="item.prop">
+                <div v-if="item.se_type===2" :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)">
+                  {{ item.label }}
+                </div>
+              </template>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="人员信息">
+            <div class="container-tag">
+              <template v-for="item in sensorList" :key="item.prop">
+                <div v-if="item.se_type===3" :class="item.isSelected?'item-tag-active':'item-tag'" @click="toggleSelection(item)">
+                  {{ item.label }}
+                </div>
+              </template>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+        <div class="selected-list-box">
+          <div class="disposition-title" style="margin-top: 0px">已选设备</div>
+          <div class="selected-list-c">
+            <template v-for="(item,index) in copiedCustomizeColumns" :key="item.prop">
+              <div :class="selectedItemIndex===index?'selected-item-tag-active':'selected-item-tag'"
+                   @click="changeSelected(index)"
+                   draggable="true"
+                   @dragstart="dragStart($event, index)"
+                   @dragover.prevent
+                   @drop="drop($event, index)"
+              >{{ item.label }}
+              </div>
+            </template>
+          </div>
+          <div class="button-container">
+            <el-button type="primary" plain class="top-left" @click="changeMoveUp">上移</el-button>
+            <el-button type="primary" plain class="top-right" @click="changeMoveDown">下移</el-button>
+            <el-button type="primary" plain class="bottom-left" @click="changeRemove">移除</el-button>
+            <el-button type="primary" plain class="bottom-right" @click="changeCleared">清空</el-button>
+          </div>
+        </div>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel2">取 消</el-button>
+          <el-button type="primary" @click="submitForm2">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -117,27 +200,23 @@ import Threshold from "./components/threshold.vue";
 import Newspapers from "./components/newspapers.vue";
 import ParametersBasic from "./components/parametersBasic.vue";
 import StrategySafeguard from "./components/strategySafeguard.vue";
-import {ref, reactive, computed, onMounted} from "vue";
-import { ColumnProps } from "@/components/ProTable/interface";
-import { ElMessageBox } from 'element-plus'
+import {computed, onActivated, onDeactivated, onMounted, reactive, ref} from "vue";
+import {ColumnProps} from "@/components/ProTable/interface";
+import {ElMessageBox} from 'element-plus'
 import {useUserStore} from "@/stores/modules/user";
-import { getYallSensorList } from "@/api/modules/allData";
-
-
-
-
+import {getAs_status, getYallSensorList, getYascomm} from "@/api/modules/allData";
 
 // 获取传感器字典
-const sensorList = ref<any>([]);
+const sensorList2 = ref<any>([]);
 const getSensorList = async () => {
-  const { data } = await getYallSensorList();
-  sensorList.value = data.list
+  const {data} = await getYallSensorList();
+  sensorList2.value = data.list
 };
 //搜索站号
-const selectedData= ref([])
+const selectedData = ref([])
 const userStore = useUserStore();
 //下拉数据
-const platformList =ref<any>(computed(() => userStore.stations))
+const platformList = ref<any>(computed(() => userStore.stations))
 //列表展示原始数据
 const processTableData = ref(computed(() => userStore.stations));
 //列表展示查询分页后数据
@@ -167,6 +246,8 @@ const handleQuery = () => {
   pageable.value.total = filteredData.length; // 更新总数
   // 确保通过 .value 修改 ref 的值
   showList.value = filteredData;
+
+  getStatus()
 };
 
 // 重置功能
@@ -177,6 +258,8 @@ const resetQuery = () => {
   pageable.value.total = processTableData.value.length; // 重置总数
   // 确保通过 .value 修改 ref 的值
   showList.value = processTableData.value.slice((pageable.value.pageNum - 1) * pageable.value.pageSize, pageable.value.pageNum * pageable.value.pageSize);
+
+  getStatus()
 };
 // 每页条数改变
 const handleSizeChange = (val: number) => {
@@ -204,28 +287,14 @@ const updateShowList = () => {
 };
 
 
-const selectedItems =(data)=>{
-  if(data.length>0){
+const selectedItems = (data) => {
+  if (data.length > 0) {
     pageable.value.as_code = data[0]
   }
 };
 
-
 // 表格配置项
-const columns = reactive<ColumnProps[]>([
-  { prop: "as_depart", label: "部别" },
-  { prop: "as_name", label: "站名" },
-  { prop: "as_code", label: "站号" },
-  { prop: "map_level", label: "地图层级" },
-  { prop: "address", label: "地址" },
-  { prop: "as_lon", label: "经度" },
-  { prop: "as_lat", label: "纬度" },
-  { prop: "as_auditor", label: "预审员"},
-  { prop: "check_leader", label: "测试组长"},
-  { prop: "station_leader", label: "台长"},
-  { prop: "view_mode", label: "观测方式"},
-  { prop: "operation", label: "操作", width:150,align: 'center' }
-]);
+let columns = reactive<ColumnProps[]>([]);
 
 const dialog = reactive<any>({
   visible: false,
@@ -238,8 +307,8 @@ const initFormData = ref<any>(
     code: "",
     type: "",
     name: "",
-    startTime:"",
-    endTime:"",
+    startTime: "",
+    endTime: "",
     remark: ""
   }
 );
@@ -271,7 +340,7 @@ const cancel = () => {
 }
 /** 表单重置 */
 const reset = () => {
-  form.value = { ...initFormData };
+  form.value = {...initFormData};
   formRef.value?.resetFields();
 }
 
@@ -290,7 +359,7 @@ const handleDelete = async (row?: any) => {
     confirmButtonText: '删除',
     cancelButtonText: '取消',
     type: 'warning',
-    title:'删除数据',
+    title: '删除数据',
     draggable: true
   })
     .then(() => {
@@ -306,7 +375,7 @@ function findLabelByValue(noticeTypeList, value) {
   return item ? item.label : null;
 }
 
-const typeList= [
+const typeList = [
   {
     value: 0,
     label: '人工值班',
@@ -320,9 +389,430 @@ const typeList= [
     label: '自动值班',
   }
 ]
+
+const installTypeList = [
+  {
+    value: 0,
+    label: '业务站',
+  },
+  {
+    value: 1,
+    label: '无人站',
+  },
+  {
+    value: 2,
+    label: '梯度站',
+  }
+]
 onMounted(() => {
+  loadCustomizeColumns()
+  updateColumns()
   getSensorList()
+  getStatus()
   // 在组件挂载时，将计算属性 initList 的值赋值给 showList
   showList.value = [...initList.value];
 });
+
+
+/** 表单重置 */
+const cancel2 = () => {
+  dialog2.visible = false;
+}
+
+/** 提交按钮 */
+const submitForm2 = () => {
+  dialog2.visible = false;
+  customizeColumns.value = [...copiedCustomizeColumns.value]
+  updateColumns()
+  saveCustomizeColumns()
+}
+
+
+const sensorList = ref<any>([
+  {prop: "as_depart", label: "部别", se_type: 0},
+  {prop: "as_name", label: "站名", se_type: 0},
+  {prop: "as_code", label: "站号", se_type: 0},
+  {prop: "view_mode", label: "观测方式", se_type: 0},
+  {prop: "install_type", label: "架设方式", se_type: 0},
+  {prop: "address", label: "地址", se_type: 2},
+  {prop: "as_lon", label: "经度", se_type: 2},
+  {prop: "as_lat", label: "纬度", se_type: 2},
+  {prop: "as_auditor", label: "预审员", se_type: 3},
+  {prop: "check_leader", label: "测试组长", se_type: 3},
+  {prop: "station_leader", label: "台长", se_type: 3},
+  {prop: "communication_method", label: "主通信方式", se_type: 1},
+  {prop: "device_number_primary", label: "主通信设备号", se_type: 1},
+  {prop: "communication_status_primary", label: "主通信状态", se_type: 1},
+  {prop: "heartbeat_time_primary", label: "主通信心跳时间", se_type: 1},
+  {prop: "connection_status_primary", label: "主通信自动站连接状态", se_type: 1},
+  {prop: "last_data_received_time_primary", label: "主通信最近数据接收时间", se_type: 1},
+  {prop: "communication_status_secondary", label: "从通信状态", se_type: 1},
+  {prop: "device_number_secondary", label: "从通信设备号", se_type: 1},
+  {prop: "communication_method_secondary", label: "从通信方式", se_type: 1},
+  {prop: "heartbeat_time_secondary", label: "从通信心跳时间", se_type: 1},
+  {prop: "connection_status_secondary", label: "从通信自动站连接状态", se_type: 1},
+  {prop: "last_data_received_time_secondary", label: "从通信最近数据接收时间", se_type: 1},
+  {prop: "ip_address_4g", label: "4G设备IP", se_type: 1}
+])
+let customizeColumns = ref<any>([
+  {prop: "as_depart", label: "部别", se_type: 0},
+  {prop: "as_name", label: "站名", se_type: 0},
+  {prop: "as_code", label: "站号", se_type: 0},
+  {prop: "view_mode", label: "观测方式", se_type: 0},
+  {prop: "install_type", label: "架设方式", se_type: 0},
+  {prop: "address", label: "地址", se_type: 2},
+  {prop: "as_lon", label: "经度", se_type: 2},
+  {prop: "as_lat", label: "纬度", se_type: 2},
+  {prop: "as_auditor", label: "预审员", se_type: 3},
+  {prop: "check_leader", label: "测试组长", se_type: 3},
+  {prop: "station_leader", label: "台长", se_type: 3},
+  {prop: "communication_method", label: "主通信方式", se_type: 1},
+  {prop: "device_number_primary", label: "主通信设备号", se_type: 1},
+  {prop: "communication_status_primary", label: "主通信状态", se_type: 1},
+  {prop: "heartbeat_time_primary", label: "主通信心跳时间", se_type: 1},
+  {prop: "connection_status_primary", label: "主通信自动站连接状态", se_type: 1},
+  {prop: "last_data_received_time_primary", label: "主通信最近数据接收时间", se_type: 1},
+
+])
+// 被选中当条数据下标
+const selectedItemIndex = ref(0)
+
+//操作 自定义部分表头
+const copiedCustomizeColumns = ref<any>([...customizeColumns.value]);
+
+const dialog2 = reactive<any>({
+  visible: false,
+  title: ''
+});
+
+const handleSetting = () => {
+  copiedCustomizeColumns.value = [...customizeColumns.value]
+  sensorList.value.forEach(element => {
+    const column = copiedCustomizeColumns.value.find(col => col.prop === element.prop);
+    if (column) {
+      element.isSelected = true;
+    } else {
+      element.isSelected = false;
+    }
+  });
+  dialog2.title = "列表字段设置"
+  dialog2.visible = true;
+}
+
+const changeMoveUp = () => {
+//上移
+  if (selectedItemIndex.value > 0) {
+    const temp = copiedCustomizeColumns.value[selectedItemIndex.value - 1]
+    copiedCustomizeColumns.value[selectedItemIndex.value - 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
+    copiedCustomizeColumns.value[selectedItemIndex.value] = temp
+    selectedItemIndex.value--
+  }
+}
+
+const changeMoveDown = () => {
+//下移
+  if (selectedItemIndex.value < copiedCustomizeColumns.value.length - 1) {
+    const temp = copiedCustomizeColumns.value[selectedItemIndex.value + 1]
+    copiedCustomizeColumns.value[selectedItemIndex.value + 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
+    copiedCustomizeColumns.value[selectedItemIndex.value] = temp
+    selectedItemIndex.value++
+  }
+}
+
+const changeRemove = () => {
+  //删除数据
+  if (copiedCustomizeColumns.value.length > 0) {
+    const custom = copiedCustomizeColumns.value[selectedItemIndex.value];
+    const se_type = custom.prop
+    for (let i = 0; i < sensorList.value.length; i++) {
+      if (sensorList.value[i].prop === se_type) {
+        sensorList.value[i].isSelected = false;
+      }
+    }
+    copiedCustomizeColumns.value.splice(selectedItemIndex.value, 1)
+    if (selectedItemIndex.value === copiedCustomizeColumns.value.length) {
+      selectedItemIndex.value--
+    }
+
+  }
+}
+
+const changeCleared = () => {
+  //清空所有数据
+  selectedItemIndex.value = 0
+  copiedCustomizeColumns.value = []
+  for (let i = 0; i < sensorList.value.length; i++) {
+    sensorList.value[i].isSelected = false;
+  }
+}
+
+const changeSelected = (index) => {
+  selectedItemIndex.value = index
+}
+
+const dragStart = (event, index) => {
+  event.dataTransfer.effectAllowed = 'move';
+  // 保存当前拖动的元素索引
+  event.dataTransfer.setData('text/plain', index.toString());
+};
+
+
+const drop = (event, index) => {
+  const draggedIndex = parseInt(event.dataTransfer.getData('text/plain'));
+  // 移动数组中的元素来更新顺序
+  const draggedItem = copiedCustomizeColumns.value.splice(draggedIndex, 1)[0];
+  copiedCustomizeColumns.value.splice(index, 0, draggedItem);
+};
+
+
+// 要素的选中和取消
+const toggleSelection = (item) => {
+  item.isSelected = !item.isSelected
+  if (item.isSelected) {
+    //添加
+    copiedCustomizeColumns.value.push(item)
+  } else {
+    //删除
+    copiedCustomizeColumns.value = copiedCustomizeColumns.value.filter(column => column.prop !== item.prop);
+  }
+}
+
+
+// 保存customizeColumns数组到localStorage
+function saveCustomizeColumns() {
+  const jsonString = JSON.stringify(customizeColumns.value);
+  localStorage.setItem('singleStations', jsonString);
+}
+
+// 从localStorage中获取customizeColumns数组
+function loadCustomizeColumns() {
+  const jsonString = localStorage.getItem('singleStations');
+  if (jsonString) {
+    customizeColumns.value = JSON.parse(jsonString);
+  }
+}
+
+
+// {prop: "as_depart", label: "部别", se_type: 0},
+// {prop: "as_name", label: "站名", se_type: 0},
+// {prop: "as_code", label: "站号", se_type: 0},
+const updateColumns = () => {
+  const column = [
+    {prop: "operation", label: "操作", width: 150, align: 'center', fixed: "right"}
+  ];
+  customizeColumns.value.forEach(item => {
+
+    if(item.prop==='as_depart'||item.prop==='as_name'||item.prop==='as_code'){
+      item.width = 90
+    }else {
+      item.width = calculateTextLengthInPixels(item.label)
+    }
+  })
+  columns = [...column, ...customizeColumns.value];
+
+}
+
+// 大概计算字符串长度
+function calculateTextLengthInPixels(text) {
+  return (text.length * 14)+30;
+}
+
+
+
+const getStatus = ()=>{
+  if (processTableData.value && processTableData.value.length > 0) {
+    getStations_Status();
+    getYascommList();
+  }
+}
+
+// 更新站状态
+const getStations_Status =async () => {
+  const { data } = await getAs_status();
+  processTableData.value.forEach(item => {
+    const level_main= item.as_code+"|LEVEL_MAIN"
+    const level_sub= item.as_code+"|LEVEL_SUB"
+    const found_main = data.list.find(item => item.key === level_main);
+    const found_sub = data.list.find(item => item.key === level_sub);
+    item.communication_status_primary =findLabelByValue(statusList,found_main.as_link)
+    item.last_data_received_time_primary = formatTimestamp(found_main.as_last_time)
+    item.connection_status_primary =findLabelByValue(status2List,found_main.comm_link)
+    item.heartbeat_time_primary = formatTimestamp(found_main.comm_last_time)
+    item.communication_status_secondary =findLabelByValue(statusList,found_sub.as_link)
+    item.last_data_received_time_secondary = formatTimestamp(found_sub.as_last_time)
+    item.connection_status_secondary =findLabelByValue(status2List,found_sub.comm_link)
+    item.heartbeat_time_secondary = formatTimestamp(found_sub.comm_last_time)
+  });
+
+}
+
+
+
+const yascommStatus=ref<any>([])
+const getYascommList = async () => {
+  const {data} = await getYascomm({pageSize: 999, pageNum: 1});
+  yascommStatus.value = data
+  console.log(yascommStatus.value)
+  console.log(processTableData.value)
+
+  processTableData.value.forEach(item => {
+    item.communication_method =  ""
+    item.communication_method_secondary =""
+    item.device_number_primary = ""
+    item.device_number_secondary = ""
+    const list = data[item.as_code]
+
+
+    if (list != undefined) {
+      const data = list.find(station => station.comm_level === 0);
+      item.communication_method =  findLabelByValue(mannerList,data.comm_type)
+      if(data.comm_type === 0){
+        if (data.comm_param) {
+          const params = data.comm_param.split(',');
+          if (params.length >= 1) {
+            item.device_number_primary = params[0].trim()
+          }
+        }
+      }else  if(data.comm_type === 1){
+        if (data.comm_param) {
+          const params = data.comm_param.split(',');
+          if (params.length >= 2) {
+            item.device_number_primary = params[0].trim()
+          }
+        }
+      }else  if(data.comm_type === 2){
+        if (data.comm_param) {
+          const params = data.comm_param.split(',');
+          if (params.length >= 4) {
+            item.device_number_primary = params[0].trim()+','+params[2].trim()+','+params[3].trim()
+          }
+        }
+      }else  if(data.comm_type === 3){
+         item.device_number_primary=''
+      }else  if(data.comm_level === 4){
+        if (data.comm_param) {
+          const params = data.comm_param.split(',');
+          if (params.length >= 2) {
+            item.device_number_primary = params[0].trim()+','+params[1].trim()
+          }
+        }
+      }
+
+
+      const data2 = list.find(station => station.comm_level === 1);
+      item.communication_method_secondary = findLabelByValue(mannerList,data2.comm_type)
+      if(data2.comm_type === 0){
+        if (data2.comm_param) {
+          const params = data2.comm_param.split(',');
+          if (params.length >= 1) {
+            item.device_number_secondary = params[0].trim()
+          }
+        }
+      }else  if(data2.comm_type === 1){
+        if (data2.comm_param) {
+          const params = data2.comm_param.split(',');
+          if (params.length >= 2) {
+            item.device_number_secondary = params[0].trim()
+          }
+        }
+      }else  if(data2.comm_type === 2){
+        if (data2.comm_param) {
+          const params = data2.comm_param.split(',');
+          if (params.length >= 4) {
+            item.device_number_secondary = params[0].trim()+','+params[2].trim()+','+params[3].trim()
+          }
+        }
+      }else  if(data2.comm_type === 3){
+        item.device_number_secondary=''
+      }else  if(data2.comm_level === 4){
+        if (data2.comm_param) {
+          const params = data2.comm_param.split(',');
+          if (params.length >= 2) {
+            item.device_number_secondary = params[0].trim()+','+params[1].trim()
+          }
+        }
+      }
+    }
+  });
+
+
+}
+
+const status2List= [
+  {
+    value: 0,
+    label: '异常',
+  },
+  {
+    value: 1,
+    label: '正常',
+  },
+  {
+    value: 2,
+    label: '',
+  }
+]
+
+const statusList= [
+  {
+    value: 0,
+    label: '未知',
+  },
+  {
+    value: 1,
+    label: '在线',
+  },
+  {
+    value: 2,
+    label: '未连接',
+  }
+]
+const mannerList= [
+    {
+      value: 0,
+      label: '串口',
+    },
+    {
+      value: 1,
+      label: '北斗',
+    },
+    {
+      value: 2,
+      label: '4G',
+    },
+    {
+      value: 3,
+      label: '文件',
+    },
+    {
+      value: 4,
+      label: 'TCPClient',
+    }
+  ]
+function formatTimestamp(timestamp) {
+  if (timestamp === 0) {
+    return ''; // 如果时间戳为0，返回空值
+  }
+  const date = new Date(timestamp * 1000); // JavaScript的时间戳是毫秒级，所以需要乘以1000
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以加1
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hours}:${minutes}`;
+}
+
+let intervalId;
+
+onActivated(() => {
+  intervalId = setInterval(() => {
+    getStatus();
+  }, 30 * 1000);
+});
+
+onDeactivated(() => {
+  clearInterval(intervalId);
+});
+
+
 </script>

src/views/system/user/index.vue

@@ -21,7 +21,7 @@
       </div>
       <!-- 表格主体 -->
       <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small">
-        <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
+        <el-table-column align="left" label="序号" width="45px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ scope.$index + 1 }}
           </template>