排序修改

src/styles/index.scss

@@ -114,6 +114,7 @@
       padding: 80px;
 
       .waringTable {
+        --el-table-border-color:none;
         background-color: transparent;
         border: 1px solid #053872;
 

src/views/monitoring/components/header.vue

@@ -82,9 +82,16 @@
                 stripe>
                 <el-table-column prop="deviceName" label="设备名称" align="center" />
                 <el-table-column prop="paramName" label="变量名称" align="center" />
-                <el-table-column prop="alertName" label="告警级别" align="center" />
+                <el-table-column prop="alertName" label="告警级别" align="center">
+                    <template #default="scope">
+                        <span class="level">{{ scope.row.alertName }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="totalCounts" label="告警累计" align="center" />
-                <el-table-column prop="alertFirstTime" label="首次告警时间" align="center" />
+                <el-table-column label="报警时间" align="center">
+                    <el-table-column prop="alertFirstTime" label="首次告警时间" align="center" />
+                    <el-table-column prop="alertLastTime" label="末次告警时间" align="center" />
+                </el-table-column>
                 <el-table-column fixed="right" label="操作" align="center">
                     <template #default="scope">
                         <el-button class="confirm" type="info" size="small" @click="waringConfirm(scope.row)">确认</el-button>

src/views/monitoring/screen/components/main.vue

@@ -247,11 +247,12 @@ function tableHeader() {
     // 列配置
     const tableCessText = [
       {
-        id: 1,
+        id: 0,
-        title: '设备名称',
+        title: 'ID',
-        field: 'deviceuuid',
+        field: 'id',
         type: 'html',
         formatter: formatRole,
+        visible:false
       },
     ];
     console.log(tableCessText)

src/views/monitoring/screen/components/showTree.vue

@@ -21,11 +21,11 @@
 </template>
 
 <script lang="ts" setup>
-import { getCurrentInstance } from 'vue';
+import { getCurrentInstance,ComponentInternalInstance } from 'vue';
 import mitt from '@/plugins/bus';
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance
 const defaultCheckedKeys = ref([]); //默认选项
-const checkList = ref([]); //选中的隐藏项
+const checkList = ref<TreeVo[]>([]); //选中的隐藏项
 
 interface TreeVo {
   id?: number;
@@ -33,7 +33,7 @@ interface TreeVo {
   colType: string;
   field: string;
   fixed?: string;
-  show: boolean;
+  visible: boolean;
   title: string;
   width: number;
   controlValue?: number;
@@ -51,9 +51,9 @@ const props: any = defineProps({
 
 onMounted(() => {
   treeData.value = props.headerData;
-  const checkData = [];
+  const checkData:any = [];
   props.headerData.map((item: TreeVo) => {
-    if (item.show) {
+    if (item.visible) {
       checkData.push(item.id);
       checkList.value.push(item);
       if (item.children && item.children.length) {
@@ -255,7 +255,7 @@ const defaultProps = {
 //   },
 // ];
 
-function allowDrop(draggingNode, dropNode, type) {
+function allowDrop(draggingNode:any, dropNode:any, type:any) {
   // 只允许同级拖拽，不允许改变原来的目录结构
   if (type !== 'inner') {
     let control = draggingNode.level === dropNode.level ? true : false;
@@ -266,14 +266,14 @@ function allowDrop(draggingNode, dropNode, type) {
 const treeCheckChange = (data: TreeVo, checked: boolean, indeterminate: boolean) => {
   //当复选框被点击的时候触发
   console.log(data, checked, indeterminate);
-  data.show = checked;
+  data.visible = checked;
   console.log(treeData.value);
 };
 
 const nodeDrop = () => {
   //拖拽成功完成时触发的事件
   nextTick(() => {
-    proxy.$refs.tree.setCheckedKeys(defaultCheckedKeys.value);
+    proxy?.$refs.tree.setCheckedKeys(defaultCheckedKeys.value);
   });
 };
 

vite.config.ts

@@ -45,9 +45,9 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
       hmr: true,//配置HMR
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          // target: 'http://172.1.2.106:9000/',//本地接口地址
+          target: 'http://172.1.2.106:9000/',//本地接口地址
           // target: 'http://172.1.2.48:9000/',//本地接口地址
-          target: 'http://board.heatiot.cn:8001/prod-api/',//线上接口地址
+          // target: 'http://board.heatiot.cn:8001/prod-api/',//线上接口地址
           changeOrigin: true,
           rewrite: path =>
             path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')