Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

public/js/config.js

@@ -3,8 +3,8 @@ const VUE_APP_URL = {
   webRtcUrl: '/webRtc' // rtsp服务器IP地址
 }
 const History_Type = {
-  type: 'remote', // remote、vent  (remote 代表的是历史查询走的装备院的接口，vent是走的咱们的，目前神东的项目都用remote, 其他矿用vent)
-  // type: 'vent', // remote、vent
+  // type: 'remote', // remote、vent  (remote 代表的是历史查询走的装备院的接口，vent是走的咱们的，目前神东的项目都用remote, 其他矿用vent)
+  type: 'vent', // remote、vent
   deviceType: []
 }
 

src/components/Form/src/jeecg/components/MTreeSelect.vue

@@ -74,1493 +74,7 @@
         treeData.value = treeDataValue;
       }
     }else{
-      const result = {
-        "1": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "1",
-          "leader": "",
-          "name": "布尔台煤矿",
-          "number": "75",
-          "parentDepartment": "",
-          "parentId": "0",
-          "path": ",1,",
-          "position": "1",
-          "telphone": ""
-        },
-        "2": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "2",
-          "leader": "",
-          "name": "行政办",
-          "number": "21224",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,2,",
-          "position": "10",
-          "telphone": ""
-        },
-        "3": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "3",
-          "leader": "",
-          "name": "矿领导",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,3,",
-          "position": "2",
-          "telphone": ""
-        },
-        "5": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "5",
-          "leader": "",
-          "name": "经营办",
-          "number": "86",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,5,",
-          "position": "9",
-          "telphone": ""
-        },
-        "6": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "6",
-          "leader": "",
-          "name": "安全监察管理办公室",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,6,",
-          "position": "5",
-          "telphone": ""
-        },
-        "7": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "7",
-          "leader": "",
-          "name": "生产办",
-          "number": "81",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,7,",
-          "position": "8",
-          "telphone": ""
-        },
-        "8": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "8",
-          "leader": "",
-          "name": "调度指挥中心",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,8,",
-          "position": "4",
-          "telphone": ""
-        },
-        "9": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "9",
-          "leader": "",
-          "name": "综采一队",
-          "number": "87",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,9,",
-          "position": "13",
-          "telphone": ""
-        },
-        "10": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "10",
-          "leader": "",
-          "name": "机电办",
-          "number": "82",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,10,",
-          "position": "11",
-          "telphone": ""
-        },
-        "11": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "11",
-          "leader": "",
-          "name": "综采二队",
-          "number": "88",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,11,",
-          "position": "14",
-          "telphone": ""
-        },
-        "12": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "12",
-          "leader": "",
-          "name": "综采三队",
-          "number": "10220",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,12,",
-          "position": "15",
-          "telphone": ""
-        },
-        "13": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "13",
-          "leader": "",
-          "name": "掘锚一队",
-          "number": "89",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,13,",
-          "position": "17",
-          "telphone": ""
-        },
-        "14": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "14",
-          "leader": "",
-          "name": "掘锚二队",
-          "number": "10213",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,14,",
-          "position": "18",
-          "telphone": ""
-        },
-        "15": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "15",
-          "leader": "",
-          "name": "掘锚三队",
-          "number": "10317",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,15,",
-          "position": "19",
-          "telphone": ""
-        },
-        "16": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "16",
-          "leader": "",
-          "name": "掘锚六队",
-          "number": "10302",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,16,",
-          "position": "21",
-          "telphone": ""
-        },
-        "18": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "18",
-          "leader": "",
-          "name": "通风队",
-          "number": "10217",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,18,",
-          "position": "28",
-          "telphone": ""
-        },
-        "19": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "19",
-          "leader": "",
-          "name": "运转一队",
-          "number": "10214",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,19,",
-          "position": "23",
-          "telphone": ""
-        },
-        "20": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "20",
-          "leader": "",
-          "name": "运转二队",
-          "number": "10215",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,20,",
-          "position": "24",
-          "telphone": ""
-        },
-        "21": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "21",
-          "leader": "",
-          "name": "机电一队",
-          "number": "10216",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,21,",
-          "position": "25",
-          "telphone": ""
-        },
-        "24": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "24",
-          "leader": "",
-          "name": "车队",
-          "number": "84",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,24,",
-          "position": "31",
-          "telphone": ""
-        },
-        "25": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "25",
-          "leader": "",
-          "name": "砼底板队",
-          "number": "10352",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,25,",
-          "position": "32",
-          "telphone": ""
-        },
-        "26": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "26",
-          "leader": "",
-          "name": "准备二队",
-          "number": "21228",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,26,",
-          "position": "33",
-          "telphone": ""
-        },
-        "28": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "28",
-          "leader": "",
-          "name": "掘锚五队",
-          "number": "21044",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,28,",
-          "position": "20",
-          "telphone": ""
-        },
-        "29": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "29",
-          "leader": "",
-          "name": "党委办",
-          "number": "25539",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,29,",
-          "position": "34",
-          "telphone": ""
-        },
-        "30": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "30",
-          "leader": "",
-          "name": "工程队",
-          "number": "24829",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,30,",
-          "position": "36",
-          "telphone": ""
-        },
-        "31": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "31",
-          "leader": "",
-          "name": "安装队",
-          "number": "24823",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,31,",
-          "position": "30",
-          "telphone": ""
-        },
-        "32": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "32",
-          "leader": "",
-          "name": "钻探准备队",
-          "number": "24824",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,32,",
-          "position": "37",
-          "telphone": ""
-        },
-        "34": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "34",
-          "leader": "",
-          "name": "机电二队",
-          "number": "25824",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,34,",
-          "position": "26",
-          "telphone": ""
-        },
-        "35": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "35",
-          "leader": "",
-          "name": "掘锚七队",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,35,",
-          "position": "22",
-          "telphone": ""
-        },
-        "162": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "162",
-          "leader": "",
-          "name": "地测公司-[地]安管办",
-          "number": "9305",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,162,",
-          "position": "192",
-          "telphone": ""
-        },
-        "164": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "164",
-          "leader": "",
-          "name": "地测公司-[地]钻探队",
-          "number": "9306",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,164,",
-          "position": "193",
-          "telphone": ""
-        },
-        "167": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "167",
-          "leader": "",
-          "name": "地测公司-[地]物探队",
-          "number": "20903",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,167,",
-          "position": "194",
-          "telphone": ""
-        },
-        "169": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "169",
-          "leader": "",
-          "name": "地测公司-[地]大柳塔站",
-          "number": "21896",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,169,",
-          "position": "195",
-          "telphone": ""
-        },
-        "170": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "170",
-          "leader": "",
-          "name": "地测公司-[地]补连塔站",
-          "number": "21897",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,170,",
-          "position": "196",
-          "telphone": ""
-        },
-        "171": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "171",
-          "leader": "",
-          "name": "地测公司-[地]上湾站",
-          "number": "21898",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,171,",
-          "position": "197",
-          "telphone": ""
-        },
-        "172": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "172",
-          "leader": "",
-          "name": "地测公司-[地]哈拉沟站",
-          "number": "21899",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,172,",
-          "position": "198",
-          "telphone": ""
-        },
-        "173": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "173",
-          "leader": "",
-          "name": "地测公司-[地]石圪台站",
-          "number": "21900",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,173,",
-          "position": "199",
-          "telphone": ""
-        },
-        "175": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "175",
-          "leader": "",
-          "name": "地测公司-[地]锦界站",
-          "number": "21902",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,175,",
-          "position": "200",
-          "telphone": ""
-        },
-        "185": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "185",
-          "leader": "",
-          "name": "地测公司-[地]榆家梁站",
-          "number": "21912",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,185,",
-          "position": "201",
-          "telphone": ""
-        },
-        "276": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "276",
-          "leader": "",
-          "name": "贵宾",
-          "number": "0",
-          "parentDepartment": "",
-          "parentId": "0",
-          "path": ",276,",
-          "position": "295",
-          "telphone": ""
-        },
-        "284": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "284",
-          "leader": "李政15",
-          "name": "智能运维队",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,284,",
-          "position": "29",
-          "telphone": ""
-        },
-        "285": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "285",
-          "leader": "",
-          "name": "本矿车辆",
-          "number": "0",
-          "parentDepartment": "",
-          "parentId": "0",
-          "path": ",285,",
-          "position": "291",
-          "telphone": ""
-        },
-        "288": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "288",
-          "leader": "",
-          "name": "外委车辆",
-          "number": "0",
-          "parentDepartment": "",
-          "parentId": "0",
-          "path": ",288,",
-          "position": "292",
-          "telphone": ""
-        },
-        "311": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "311",
-          "leader": "",
-          "name": "地测公司",
-          "number": "0",
-          "parentDepartment": "",
-          "parentId": "0",
-          "path": ",311,",
-          "position": "161",
-          "telphone": ""
-        },
-        "380": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "380",
-          "leader": "白国勇",
-          "name": "车辆管理组",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,380,",
-          "position": "12",
-          "telphone": "18047388802"
-        },
-        "393": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "393",
-          "leader": "",
-          "name": "地测公司-[地]布尔台站",
-          "number": "15011",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,393,",
-          "position": "191",
-          "telphone": ""
-        },
-        "399": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "399",
-          "leader": "高平",
-          "name": "地质防治水办",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,399,",
-          "position": "3",
-          "telphone": ""
-        },
-        "400": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "400",
-          "leader": "任建慧33",
-          "name": "矿压办",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,400,",
-          "position": "7",
-          "telphone": "18047388848"
-        },
-        "402": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "402",
-          "leader": "潘吉成",
-          "name": "通风办",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,402,",
-          "position": "6",
-          "telphone": ""
-        },
-        "405": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "405",
-          "leader": "",
-          "name": "核算中心",
-          "number": "0",
-          "parentDepartment": "",
-          "parentId": "0",
-          "path": ",405,",
-          "position": "274",
-          "telphone": ""
-        },
-        "406": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "406",
-          "leader": "",
-          "name": "核算中心-中心领导",
-          "number": "100",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,406,",
-          "position": "286",
-          "telphone": ""
-        },
-        "412": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "412",
-          "leader": "",
-          "name": "核算中心-寸草塔二矿",
-          "number": "100",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,412,",
-          "position": "285",
-          "telphone": ""
-        },
-        "413": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "413",
-          "leader": "",
-          "name": "核算中心-寸草塔二矿财务科",
-          "number": "101",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,413,",
-          "position": "284",
-          "telphone": ""
-        },
-        "414": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "414",
-          "leader": "",
-          "name": "核算中心-大柳塔煤矿财务科",
-          "number": "102",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,414,",
-          "position": "283",
-          "telphone": ""
-        },
-        "415": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "415",
-          "leader": "",
-          "name": "核算中心-哈拉沟煤矿财务科",
-          "number": "103",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,415,",
-          "position": "282",
-          "telphone": ""
-        },
-        "416": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "416",
-          "leader": "",
-          "name": "核算中心-锦界煤矿管理处财务科",
-          "number": "104",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,416,",
-          "position": "281",
-          "telphone": ""
-        },
-        "417": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "417",
-          "leader": "",
-          "name": "核算中心-上湾煤矿财务科",
-          "number": "105",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,417,",
-          "position": "280",
-          "telphone": ""
-        },
-        "418": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "418",
-          "leader": "",
-          "name": "核算中心-神东露天煤矿财务科",
-          "number": "106",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,418,",
-          "position": "279",
-          "telphone": ""
-        },
-        "419": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "419",
-          "leader": "",
-          "name": "核算中心-乌兰木伦矿财务科",
-          "number": "107",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,419,",
-          "position": "278",
-          "telphone": ""
-        },
-        "420": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "420",
-          "leader": "",
-          "name": "核算中心-驻大柳塔煤矿财务科",
-          "number": "108",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,420,",
-          "position": "277",
-          "telphone": ""
-        },
-        "467": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "467",
-          "leader": "",
-          "name": "核算中心-补连塔财务科",
-          "number": "0",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,467,",
-          "position": "276",
-          "telphone": ""
-        },
-        "469": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "469",
-          "leader": "",
-          "name": "核算中心--驻布尔台矿财务科",
-          "number": "0",
-          "parentDepartment": "核算中心",
-          "parentId": "405",
-          "path": ",405,469,",
-          "position": "275",
-          "telphone": ""
-        },
-        "470": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "470",
-          "leader": "张新祯25",
-          "name": "综采五队",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,470,",
-          "position": "16",
-          "telphone": "18047388168"
-        },
-        "471": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "471",
-          "leader": "",
-          "name": "生产服务中心车队",
-          "number": "0",
-          "parentDepartment": "",
-          "parentId": "0",
-          "path": ",471,",
-          "position": "288",
-          "telphone": ""
-        },
-        "489": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "489",
-          "leader": "",
-          "name": "布尔台煤矿-[地]布尔台站",
-          "number": "0",
-          "parentDepartment": "",
-          "parentId": "0",
-          "path": ",489,",
-          "position": "294",
-          "telphone": ""
-        },
-        "499": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "作业部门",
-          "id": "499",
-          "leader": "姚涛",
-          "name": "综掘六队",
-          "number": "0",
-          "parentDepartment": "开拓准备中心",
-          "parentId": "310",
-          "path": ",310,499,",
-          "position": "40",
-          "telphone": ""
-        },
-        "501": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "作业部门",
-          "id": "501",
-          "leader": "郝斌",
-          "name": "机电三队",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,501,",
-          "position": "27",
-          "telphone": ""
-        },
-        "503": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "503",
-          "leader": "",
-          "name": "中铁十一局",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,503,",
-          "position": "38",
-          "telphone": ""
-        },
-        "524": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "作业部门",
-          "id": "524",
-          "leader": "",
-          "name": "专业化单位",
-          "number": "0",
-          "parentDepartment": "",
-          "parentId": "0",
-          "path": ",524,",
-          "position": "298",
-          "telphone": ""
-        },
-        "525": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "525",
-          "leader": "",
-          "name": "准备三队",
-          "number": "0",
-          "parentDepartment": "布尔台煤矿",
-          "parentId": "1",
-          "path": ",1,525,",
-          "position": "35",
-          "telphone": ""
-        },
-        "536": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "536",
-          "leader": "",
-          "name": "地测公司-地测领导",
-          "number": "200111",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,536,",
-          "position": "190",
-          "telphone": ""
-        },
-        "537": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "537",
-          "leader": "",
-          "name": "地测公司-党委办公室?(行政办公室)",
-          "number": "200112",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,537,",
-          "position": "189",
-          "telphone": ""
-        },
-        "538": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "538",
-          "leader": "",
-          "name": "地测公司-经营办公室",
-          "number": "200113",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,538,",
-          "position": "188",
-          "telphone": ""
-        },
-        "539": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "539",
-          "leader": "",
-          "name": "地测公司-生产技术办公室",
-          "number": "200114",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,539,",
-          "position": "187",
-          "telphone": ""
-        },
-        "540": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "540",
-          "leader": "",
-          "name": "地测公司-安全监察管理办公室",
-          "number": "200115",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,540,",
-          "position": "186",
-          "telphone": ""
-        },
-        "541": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "541",
-          "leader": "",
-          "name": "地测公司-设备管理办公室",
-          "number": "200116",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,541,",
-          "position": "185",
-          "telphone": ""
-        },
-        "542": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "542",
-          "leader": "",
-          "name": "地测公司-大柳塔地测站",
-          "number": "200117",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,542,",
-          "position": "184",
-          "telphone": ""
-        },
-        "543": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "543",
-          "leader": "",
-          "name": "地测公司-补连塔地测站",
-          "number": "200119",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,543,",
-          "position": "183",
-          "telphone": ""
-        },
-        "544": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "544",
-          "leader": "",
-          "name": "地测公司-布尔台地测站",
-          "number": "200120",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,544,",
-          "position": "182",
-          "telphone": ""
-        },
-        "545": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "545",
-          "leader": "",
-          "name": "地测公司-锦界地测站",
-          "number": "200121",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,545,",
-          "position": "181",
-          "telphone": ""
-        },
-        "546": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "546",
-          "leader": "",
-          "name": "地测公司-哈拉沟地测站",
-          "number": "200122",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,546,",
-          "position": "180",
-          "telphone": ""
-        },
-        "547": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "547",
-          "leader": "",
-          "name": "地测公司-石圪台地测站",
-          "number": "200124",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,547,",
-          "position": "179",
-          "telphone": ""
-        },
-        "548": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "548",
-          "leader": "",
-          "name": "地测公司-上湾地测站",
-          "number": "200125",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,548,",
-          "position": "178",
-          "telphone": ""
-        },
-        "549": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "549",
-          "leader": "",
-          "name": "地测公司-榆家梁地测站",
-          "number": "200126",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,549,",
-          "position": "177",
-          "telphone": ""
-        },
-        "550": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "550",
-          "leader": "",
-          "name": "地测公司-乌兰木伦地测站",
-          "number": "200123",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,550,",
-          "position": "176",
-          "telphone": ""
-        },
-        "551": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "551",
-          "leader": "",
-          "name": "地测公司-柳塔地测站",
-          "number": "200128",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,551,",
-          "position": "175",
-          "telphone": ""
-        },
-        "552": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "552",
-          "leader": "",
-          "name": "地测公司-寸草塔地测站",
-          "number": "200129",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,552,",
-          "position": "174",
-          "telphone": ""
-        },
-        "553": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "553",
-          "leader": "",
-          "name": "地测公司-寸草塔二矿地测站",
-          "number": "200130",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,553,",
-          "position": "173",
-          "telphone": ""
-        },
-        "554": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "554",
-          "leader": "",
-          "name": "地测公司-地方煤矿监测站",
-          "number": "200131",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,554,",
-          "position": "172",
-          "telphone": ""
-        },
-        "555": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "555",
-          "leader": "",
-          "name": "地测公司-大柳塔三盘区管理处地测站",
-          "number": "200132",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,555,",
-          "position": "171",
-          "telphone": ""
-        },
-        "556": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "556",
-          "leader": "",
-          "name": "地测公司-测量队",
-          "number": "200133",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,556,",
-          "position": "170",
-          "telphone": ""
-        },
-        "557": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "557",
-          "leader": "",
-          "name": "地测公司-勘探队",
-          "number": "200134",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,557,",
-          "position": "169",
-          "telphone": ""
-        },
-        "558": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "558",
-          "leader": "",
-          "name": "地测公司-物探队",
-          "number": "200135",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,558,",
-          "position": "168",
-          "telphone": ""
-        },
-        "559": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "559",
-          "leader": "",
-          "name": "地测公司-地测探放水一队",
-          "number": "200136",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,559,",
-          "position": "167",
-          "telphone": ""
-        },
-        "560": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "560",
-          "leader": "",
-          "name": "地测公司-地测探放水二队",
-          "number": "200137",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,560,",
-          "position": "166",
-          "telphone": ""
-        },
-        "561": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "561",
-          "leader": "",
-          "name": "地测公司-维修队",
-          "number": "200138",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,561,",
-          "position": "165",
-          "telphone": ""
-        },
-        "562": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "562",
-          "leader": "",
-          "name": "地测公司-防灭火队",
-          "number": "200139",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,562,",
-          "position": "164",
-          "telphone": ""
-        },
-        "563": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "563",
-          "leader": "",
-          "name": "地测公司-大龄转岗人员",
-          "number": "200140",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,563,",
-          "position": "163",
-          "telphone": ""
-        },
-        "564": {
-          "companyUnit": "本矿",
-          "companyUnitId": "1",
-          "departmentTypeId": "0",
-          "departmentTypeName": "其他部门",
-          "id": "564",
-          "leader": "",
-          "name": "地测公司-党委办公室",
-          "number": "200110",
-          "parentDepartment": "地测公司",
-          "parentId": "311",
-          "path": ",311,564,",
-          "position": "162",
-          "telphone": ""
-        }
-      }
+      
       // try {
       //   let res = await defHttp.get({ url: props.api, params });
       //   if (res && res.success) {

src/hooks/vent/useSSO.ts

@@ -2,19 +2,21 @@
 
 import QueryString from 'qs';
 import { useUserStore } from '/@/store/modules/user';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 /** 单点登录功能的Hook，该Hook是为了部署在同一局域网内的多套系统之间能够无缝切换 */
 export function useSSO() {
+  const router = useRouter();
   const userStore = useUserStore();
   const route = useRoute();
 
   /** 启用单点登录功能来跳转新的页面 */
-  function open(url: string, target?: string) {
+  function open(url: string, redirect?: string, target?: string) {
     const qs = QueryString.stringify({
       username: userStore.userInfo?.username,
       // 毫无意义的伪装，但我就是要装一下
       id: userStore.getPassword,
+      redirect,
     });
     window.open(`${url}?${qs}`, target);
   }
@@ -22,7 +24,7 @@ export function useSSO() {
   /** 用在跳转到的页面上，执行单点登录的逻辑 */
   function doSSO() {
     if (!route.query) return;
-    const { username, id } = route.query;
+    const { username, id, redirect } = route.query;
     if (!username || !id) return;
     const realPassword = userStore.decryptPassword(id as string);
     const params = {
@@ -30,7 +32,11 @@ export function useSSO() {
       password: realPassword,
       checkKey: new Date().getTime(),
     };
-    userStore.login(params);
+    userStore.login(params).then(() => {
+      if (redirect) {
+        router.push(redirect as string);
+      }
+    });
   }
 
   return {

src/layouts/default/sider/bottomSideder.vue

@@ -147,7 +147,8 @@
 
       onMounted(async () => {
         menuModules.value = await getMenus();
-        currentParentRoute.value = menuModules.value[1];
+        debugger;
+        currentParentRoute.value = menuModules.value[0];
       });
       return {
         menuModules,

src/views/vent/comment/history/HistoryTable.vue

@@ -0,0 +1,136 @@
+<template>
+  <BasicTable ref="historyTable" @register="register" :data-source="data">
+    <template #bodyCell="{ column, record }">
+      <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == '0' ? 'green' : 'red'">
+        {{ record.warnFlag == '0' ? '正常' : '报警' }}
+      </a-tag>
+      <a-tag v-if="column.dataIndex === 'netStatus'" :color="record.netStatus == '0' ? '#f00' : 'green'">
+        {{ record.netStatus == '0' ? '断开' : '连接' }}
+      </a-tag>
+    </template>
+    <template #form-submitBefore>
+      <a-button type="primary" preIcon="ant-design:search-outlined" @click="search">查询</a-button>
+    </template>
+  </BasicTable>
+</template>
+
+<script lang="ts" setup>
+  import { onMounted, ref, shallowRef } from 'vue';
+  import { BasicColumn, BasicTableProps, PaginationProps, FormProps, FormSchema, BasicTable } from '/@/components/Table';
+  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+  import { defaultFormProps, defaultPaginationProps, getDefaultSchemas, defaultTableProps } from './history.data';
+  import { getDeviceList, list } from './history.api';
+  import { useListPage } from '/@/hooks/system/useListPage';
+
+  const props = withDefaults(
+    defineProps<{
+      /** 表格项配置，默认由deviceCode获取且联动dictCode，可以覆写，覆写后将不支持联动，参考BaiscTable */
+      columns?: BasicColumn[];
+      /** 表格操作项配置，默认为空，可以覆写 */
+      actionColumns?: BasicColumn;
+      /** 查询表单项配置，默认联动dictCode，可以覆写，覆写后将不支持联动，提供formProps时此项无效，参考BaiscTable */
+      schemas?: FormSchema[];
+      /** 表格分页配置，可以覆写，参考BaiscTable */
+      pagination?: PaginationProps;
+      /** 设备编码，该编码用于从字段/点表配置中读出表头，示例：forcFan */
+      deviceCode: string;
+      /** 字典编码，该编码用于从字典配置中读出设备项，示例：forcFan_dict */
+      dictCode: string;
+      /** 表格配置，参考BaiscTable，该值会与默认的配置进行浅合并，这里提供的任何配置都是优先的 */
+      tableProps?: BasicTableProps;
+      /** 查询表单配置，参考BaiscTable */
+      formProps?: FormProps;
+    }>(),
+    {
+      deviceCode: '',
+      dictCode: '',
+    }
+  );
+
+  // 初始化表格，将默认配置与props提供的配置合并
+  const defaultSchemas = getDefaultSchemas(props.dictCode);
+  const defaultColumns = getTableHeaderColumns(props.deviceCode.concat('_history'));
+
+  const { tableContext } = useListPage({
+    tableProps: {
+      ...defaultTableProps,
+      columns: props.columns || defaultColumns,
+      actionColumn: props.actionColumns,
+      showActionColumn: Boolean(props.actionColumns),
+      formConfig: props.formProps || {
+        ...defaultFormProps,
+        schemas: props.schemas || defaultSchemas,
+      },
+      pagination: props.pagination || defaultPaginationProps,
+      ...props.tableProps,
+    },
+  });
+  const [register, { getForm, setLoading, setColumns, getPaginationRef, setPagination }] = tableContext;
+
+  // 表格数据相关
+  const data = shallowRef([]);
+
+  // 搜索
+  async function search() {
+    const form = getForm();
+    await form.validate();
+    await fetchData(form.getFieldsValue());
+  }
+
+  // 分站类型，不同的分站类型对应不同的方式获取历史数据
+  const deviceInfo = ref({});
+
+  // 获取设备列表信息，初始化一些信息
+  async function fetchDevice() {
+    const results = await getDeviceList({ devicetype: props.deviceCode, pageSize: 10000 });
+
+    const id = results[0].id || results[0].deviceID;
+    deviceInfo.value = results[0];
+    await getForm().setFieldsValue({ gdeviceid: id });
+  }
+
+  // 核心，获取表格的数据
+  function fetchData(formData: Record<string, unknown>) {
+    setLoading(true);
+
+    const pagination = getPaginationRef() as PaginationProps;
+    list(
+      props.deviceCode,
+      deviceInfo,
+      {
+        ...formData,
+        pageNo: pagination.current,
+        pageSize: pagination.pageSize,
+        column: 'createTime',
+        strtype: props.deviceCode + '*',
+        isEmployee: props.deviceCode.startsWith('vehicle') ? false : true,
+      },
+      pagination
+    )
+      .then(({ records, total, current }) => {
+        // 表格的列需要默认情况下需要和设备列表联动
+        defaultColumns.forEach((col) => {
+          col.dataIndex = `${formData.deviceid}${col.dataIndex}`;
+        });
+        setColumns(defaultColumns);
+
+        setPagination({
+          current,
+          total,
+        });
+        data.value = records;
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  }
+
+  onMounted(() => {
+    fetchDevice();
+    search();
+  });
+</script>
+
+<style scoped lang="less">
+  @import '/@/design/vent/color.less';
+</style>

src/views/vent/comment/history/TestPage.vue

@@ -0,0 +1,6 @@
+<template>
+  <HistoryTable class="w-100% h-100% mt-100px" device-code="forcFan" dict-code="forcFan_dict" />
+</template>
+<script lang="ts" setup>
+  import HistoryTable from './HistoryTable.vue';
+</script>

src/views/vent/comment/history/history.api.ts

@@ -0,0 +1,61 @@
+import { PaginationProps } from '/@/components/Table';
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  listdays = '/safety/ventanalyMonitorData/listdays',
+  getDeviceList = '/ventanaly-device/monitor/device',
+  getHistoryData = '/ventanaly-device/history/getHistoryData',
+}
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (deviceCode: string, deviceInfo: any, formData: any, pagination: PaginationProps) => {
+  if (deviceInfo.stationType === 'redis') {
+    return defHttp.post({
+      url: Api.getHistoryData,
+      params: {
+        pageNum: pagination.current,
+        pageSize: pagination.pageSize,
+        column: 'createTime',
+        startTime: formData.ttime_begin,
+        endTime: formData.ttime_end,
+        deviceId: formData.gdeviceid,
+        strtype: deviceCode + '*',
+        interval: formData.skip || '1h',
+        isEmployee: deviceCode.startsWith('vehicle') ? false : true,
+      },
+    });
+  } else {
+    return defHttp
+      .get({
+        url: Api.listdays,
+        params: {
+          pageNo: pagination.current,
+          pageSize: pagination.pageSize,
+          column: 'createTime',
+          strtype: deviceInfo.strtype || deviceCode.concat('*'),
+          ...formData,
+        },
+      })
+      .then((r) => {
+        if (r.datalist) return r.datalist;
+        return { total: 0, records: [] };
+      });
+  }
+};
+
+/**
+ * 根据设备编码获取设备列表
+ * @param params
+ */
+export const getDeviceList = (params) =>
+  defHttp.post({ url: Api.getDeviceList, params }).then((r) => {
+    if (r.records && r.records.length) {
+      return r.records;
+    }
+    if (r.msgTxt && r.msgTxt.length) {
+      return r.msgTxt[0].datalist;
+    }
+    return [];
+  });

src/views/vent/comment/history/history.data.ts

@@ -0,0 +1,134 @@
+import dayjs from 'dayjs';
+import { BasicTableProps, PaginationProps, FormProps, FormSchema } from '/@/components/Table';
+// import { getAutoScrollContainer } from '/@/utils/common/compUtils';
+
+/** 默认的查询表单项props */
+export const getDefaultSchemas: (dictCode: string) => FormSchema[] = (dictCode: string) => [
+  {
+    field: 'ttime_begin',
+    label: '开始时间',
+    component: 'DatePicker',
+    defaultValue: dayjs().startOf('date'),
+    required: true,
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      // getPopupContainer: getAutoScrollContainer,
+    },
+    colProps: {
+      span: 4,
+    },
+  },
+  {
+    field: 'ttime_end',
+    label: '结束时间',
+    component: 'DatePicker',
+    defaultValue: dayjs(),
+    required: true,
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      // getPopupContainer: getAutoScrollContainer,
+    },
+    colProps: {
+      span: 4,
+    },
+  },
+  {
+    label: '查询设备',
+    field: 'gdeviceid',
+    component: 'Input',
+    required: true,
+    // componentProps: {
+    //   onChange: (e, option) => {
+    //     nextTick(async () => {
+    //       await getDataSource();
+    //     });
+    //   },
+    // },
+    colProps: {
+      span: 4,
+    },
+  },
+  {
+    label: '子设备',
+    field: 'deviceNum',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode,
+      placeholder: '请选择',
+    },
+    colProps: {
+      span: 4,
+    },
+  },
+  {
+    label: '间隔时间',
+    field: 'skip',
+    component: 'Select',
+    defaultValue: '8',
+    componentProps: {
+      options: [
+        {
+          label: '1秒',
+          value: '1s',
+        },
+        {
+          label: '5秒',
+          value: '5s',
+        },
+        {
+          label: '10秒',
+          value: '10s',
+        },
+        {
+          label: '30秒',
+          value: '30s',
+        },
+        {
+          label: '1分钟',
+          value: '1m',
+        },
+        {
+          label: '10分钟',
+          value: '10m',
+        },
+        {
+          label: '30分钟',
+          value: '30m',
+        },
+        {
+          label: '1小时',
+          value: '1h',
+        },
+      ],
+    },
+    colProps: {
+      span: 4,
+    },
+  },
+];
+
+/** 默认的表格props，参考 BasicTable 组件 */
+export const defaultTableProps: BasicTableProps = {
+  columns: [],
+  bordered: false,
+  size: 'small',
+  showIndexColumn: true,
+};
+
+/** 默认的查询表单props，参考 BasicForm 组件 */
+export const defaultFormProps: FormProps = {
+  labelAlign: 'left',
+  showAdvancedButton: false,
+  showSubmitButton: false,
+  showResetButton: true,
+};
+
+/** 默认的表格分页props，参考 BasicTable 组件 */
+export const defaultPaginationProps: PaginationProps = {
+  current: 1,
+  pageSize: 10,
+  pageSizeOptions: ['10', '30', '50', '100'],
+  showQuickJumper: false,
+};

src/views/vent/home/billboard/billboard.data.ts

@@ -21,7 +21,7 @@ export const GAS_STATUS_COLUMN = [
 export const DUST_STATUS_COLUMN = [
   {
     name: '设备类型',
-    prop: 'deviceType',
+    prop: 'typeName',
   },
   {
     name: '监测数量',
@@ -34,6 +34,7 @@ export const DUST_STATUS_COLUMN = [
 ];
 
 // 火灾状态监测相关的内容配置项
+export const FIRE_STATUS_IGNORE_TRANSLATION_KEYS = ['tempMax'];
 export const FIRE_STATUS_LIST = [
   {
     icon: 'warning-optical-fiber',

src/views/vent/home/billboard/components/DustStatus.vue

@@ -22,22 +22,24 @@
 
   function fetchData() {
     const info = props.data.dustInfo;
-    const trans = {
-      0: '低风险',
-      101: '低风险',
-      102: '一般风险',
-      103: '较大风险',
-      104: '重大风险',
-      201: '报警',
-      1001: '网络断开',
-    };
-    risk.value = trans[info.dustWarnLevel];
-    tableData.value = info.dustTypeList.map((e) => {
-      return {
-        ...e,
-        warnLevelStr: trans[e.warnLevel],
+    if (info) {
+      const trans = {
+        0: '低风险',
+        101: '低风险',
+        102: '一般风险',
+        103: '较大风险',
+        104: '重大风险',
+        201: '报警',
+        1001: '网络断开',
       };
-    });
+      risk.value = trans[info.dustWarnLevel];
+      tableData.value = info.dustTypeList.map((e) => {
+        return {
+          ...e,
+          warnLevelStr: trans[e.warnLevel],
+        };
+      });
+    }
   }
 
   onMounted(() => {

src/views/vent/home/billboard/components/FileOverview.vue

@@ -27,7 +27,7 @@
   });
 
   function fetchData() {
-    fileData.value = props.data.fileServerInfo;
+    fileData.value = props.data.fileServerInfo || DEFAULT_TEST_DATA.fileServerInfo;
   }
 
   onMounted(() => {

src/views/vent/home/billboard/components/FireStatus.vue

@@ -12,10 +12,11 @@
   />
 </template>
 <script lang="ts" setup>
+  import _ from 'lodash-es';
   import { onMounted, ref, shallowRef } from 'vue';
   import CommonTitle from './CommonTitle.vue';
   import ListItem from './ListItem.vue';
-  import { BillboardType, DEFAULT_TEST_DATA, FIRE_STATUS_LIST } from '../billboard.data';
+  import { BillboardType, DEFAULT_TEST_DATA, FIRE_STATUS_LIST, FIRE_STATUS_IGNORE_TRANSLATION_KEYS } from '../billboard.data';
 
   const props = withDefaults(
     defineProps<{
@@ -31,8 +32,17 @@
   const listData = shallowRef<any>({});
 
   function fetchData() {
-    const info = props.data.fireInfo;
-    const trans = {
+    const info = props.data.fireInfo || DEFAULT_TEST_DATA.fireInfo;
+    const riskTrans = {
+      0: '低风险',
+      101: '低风险',
+      102: '普通风险',
+      103: '较高风险',
+      104: '高风险',
+      201: '低风险',
+      1001: '低风险',
+    };
+    const warnTrans = {
       0: '低风险',
       101: '低风险',
       102: '一般风险',
@@ -41,7 +51,11 @@
       201: '报警',
       1001: '网络断开',
     };
-    risk.value = trans[info.fireWarnLevel];
+    risk.value = riskTrans[info.fireWarnLevel];
+    _.forEach(info, (val, key) => {
+      if (FIRE_STATUS_IGNORE_TRANSLATION_KEYS.includes(key)) return;
+      info[key] = warnTrans[val];
+    });
     listData.value = info;
   }
 

src/views/vent/home/billboard/components/GasStatus.vue

@@ -28,7 +28,7 @@
   const tableData = shallowRef<BillboardType['gasInfo']['gasTypeList']>([]);
 
   function fetchData() {
-    const info = props.data.gasInfo;
+    const info = props.data.gasInfo || DEFAULT_TEST_DATA.gasInfo;
     const trans = {
       0: '低风险',
       101: '低风险',

src/views/vent/home/billboard/components/VentilationStatus.vue

@@ -35,7 +35,7 @@
   const treeData = shallowRef<TreeProps['treeData']>([]);
 
   function fetchData() {
-    const info = props.data.ventInfo;
+    const info = props.data.ventInfo || DEFAULT_TEST_DATA.ventInfo;
     const { prefix, suffix, prop, children } = VENTILATION_STATUS_TREE_CONFIG;
     ventilatorCount.value = info.fanMainList.length.toString();
     headerData.value = info;

src/views/vent/home/billboard/dust.vue

@@ -0,0 +1,7 @@
+<!-- eslint-disable vue/multi-word-component-names -->
+<template>
+  <Billboard billboard-type="DustStatus" />
+</template>
+<script lang="ts" setup>
+  import Billboard from './index.vue';
+</script>

src/views/vent/home/billboard/file.vue

@@ -0,0 +1,7 @@
+<!-- eslint-disable vue/multi-word-component-names -->
+<template>
+  <Billboard billboard-type="FileOverview" />
+</template>
+<script lang="ts" setup>
+  import Billboard from './index.vue';
+</script>

src/views/vent/home/billboard/fire.vue

@@ -0,0 +1,7 @@
+<!-- eslint-disable vue/multi-word-component-names -->
+<template>
+  <Billboard billboard-type="FireStatus" />
+</template>
+<script lang="ts" setup>
+  import Billboard from './index.vue';
+</script>

src/views/vent/home/billboard/gas.vue

@@ -0,0 +1,7 @@
+<!-- eslint-disable vue/multi-word-component-names -->
+<template>
+  <Billboard billboard-type="GasStatus" />
+</template>
+<script lang="ts" setup>
+  import Billboard from './index.vue';
+</script>

src/views/vent/home/billboard/index.vue

@@ -11,23 +11,33 @@
         </BaseCard>
       </a-col>
     </a-row>
-    <div v-if="showBtn" style="position: absolute; top: 0; left: 0">
+    <!-- <div v-if="showBtn" style="position: absolute; top: 0; left: 0">
       <a-button @click="billboardType = 'DustStatus'">切换粉尘看板</a-button>
       <a-button @click="billboardType = 'FireStatus'">切换火灾看板</a-button>
       <a-button @click="billboardType = 'FileOverview'">切换文件看板</a-button>
       <a-button @click="billboardType = 'VentilationStatus'">切换风扇看板</a-button>
       <a-button @click="billboardType = 'GasStatus'">切换瓦斯看板</a-button>
-    </div>
+    </div> -->
     <ArrowButton point-to="left" class="company__arrow_left" @click="changeCurrentPage(-1)" />
     <ArrowButton point-to="right" class="company__arrow_right" @click="changeCurrentPage(1)" />
   </div>
 </template>
 <script lang="ts" setup>
+  /**
+   * 本文件夹下的内容是公司端看板页的内容：
+   *
+   * 看板有多种类型，包含了监测、跳转矿端的功能。
+   *
+   * 菜单配置相关信息：使用vent/home/billboard/gas及类似组件进行配置（即 ./gas.vue ./fire.vue 等）
+   *
+   * 支持的看板类型如下：'DustStatus'、'FireStatus'、'FileOverview'、'VentilationStatus'、'GasStatus'
+   *
+   */
   import { computed, onMounted, ref } from 'vue';
   import BaseCard from './components/BaseCard.vue';
   import ArrowButton from './components/ArrowButton.vue';
   import { BillboardType } from './billboard.data';
-  import { useRoute } from 'vue-router';
+  // import { useRoute } from 'vue-router';
   import { getSummary } from './billboard.api';
   import { useSSO } from '/@/hooks/vent/useSSO';
   import DustStatus from './components/DustStatus.vue';
@@ -37,9 +47,14 @@
   import GasStatus from './components/GasStatus.vue';
   // import mapComponent from './components/3Dmap/index.vue';
 
-  const route = useRoute();
+  const props = defineProps<{
+    billboardType: string;
+  }>();
+
+  // const route = useRoute();
   const { open } = useSSO();
 
+  // 组件Map，不同type使用不用组件
   const componentMap = {
     DustStatus,
     FileOverview,
@@ -47,6 +62,14 @@
     GasStatus,
     FireStatus,
   };
+  // 组件Map，不同type需要跳转到不同的矿端页面
+  const routePathMap = {
+    DustStatus: '/dust/warn/home',
+    FileOverview: '/fileManager/fileDetail/home',
+    VentilationStatus: '/micro-vent-3dModal/dashboard/analysis',
+    GasStatus: '/gas/warn/home',
+    FireStatus: '/fire/warn/home',
+  };
 
   const mainTitle = '煤炭集团';
 
@@ -75,19 +98,20 @@
     currentPage.value = Math.max((currentPage.value + pagecount) % totalPage.value, 1);
   }
 
-  const billboardType = ref('DustStatus');
-  const showBtn = ref(true);
+  // const billboardType = ref('DustStatus');
+  // const showBtn = ref(true);
 
   // 页面跳转
   function openHandler(ip: string) {
-    open(`http://${ip}:8092/login`);
+    const url = `http://${ip}:8092/login`;
+    open(url, routePathMap[props.billboardType]);
   }
 
   onMounted(() => {
-    if (route.query.type) {
-      billboardType.value = route.query.type as string;
-      showBtn.value = false;
-    }
+    // if (route.query.type) {
+    //   billboardType.value = route.query.type as string;
+    //   showBtn.value = false;
+    // }
     fetchBillboards();
   });
 </script>

src/views/vent/home/billboard/vent.vue

@@ -0,0 +1,7 @@
+<!-- eslint-disable vue/multi-word-component-names -->
+<template>
+  <Billboard billboard-type="VentilationStatus" />
+</template>
+<script lang="ts" setup>
+  import Billboard from './index.vue';
+</script>

src/views/vent/home/clique/components/3Dmap/3dMap.ts

@@ -465,6 +465,14 @@ class earthtMap {
     }
   }
 
+  /** 为 tooltip 设置标题，该标题的设置过程依赖 ../dialog-modal 中的结构 */
+  setTooltipTitle(title: string) {
+    const obj = this.detailModalCSS2Obj as CSS2DObject;
+    const ele = obj.element.getElementsByClassName('modal-title')[0];
+    if (!ele) return;
+    ele.innerHTML = title;
+  }
+
   async setTag(locationInfo: any[]) {
     const loader = new FontLoader();
     const font = await loader.loadAsync('/font/STSong_Regular.json');
@@ -532,7 +540,7 @@ class earthtMap {
       boxMesh.rotateZ(-Math.PI);
       boxMesh.position.set(x - Math.abs(max.x - min.x) + 0.018, -y + 0.01, this.mapConfig.deep + 0.03);
       boxMesh.renderOrder = 1;
-      boxMesh['userData']['code'] = item['code'];
+      boxMesh['userData'] = item;
 
       this.locationNameBgArr.push(boxMesh);
 
@@ -700,6 +708,7 @@ class earthtMap {
           if (detailMesh) {
             // 发送消息
             this.detailModalCSS2Obj.visible = true;
+            this.setTooltipTitle(detailMesh.object.userData.name);
           }
         }
       }

src/views/vent/home/clique/components/3Dmap/index.vue

@@ -8,85 +8,174 @@
 </template>
 ]
 <script lang="ts" setup>
-  import { onMounted, ref } from 'vue';
+  import { onMounted, ref, inject } from 'vue';
   import earthtMap from './3dMap';
   import dialogModal from '../dialog-modal.vue';
 
+  const globalConfig = inject('globalConfig');
+
   let map: earthtMap | null = null;
+  const locationInfo =
+    globalConfig.History_Type == 'vent'
+      ? [
+          {
+            // name: 'bd',
+            name: '矿矿矿',
+            code: 'bd',
+            value: [111.102548, 38.951875],
+          },
+          {
+            // name: 'jj',
+            name: '矿矿矿',
+            code: 'jj',
+            value: [110.174801, 38.742404],
+          },
+          {
+            // name: 'yjl',
+            name: '矿矿矿',
+            code: 'yjl',
+            value: [110.526055, 39.044234],
+          },
+          {
+            // name: 'dlt',
+            name: '矿矿矿',
+            code: 'dlt',
+            value: [110.245165, 39.259314],
+          },
+          // {
+          //   name: 'sd',
+          //   value: [110.216401, 39.276499],
+          // },
+          {
+            // name: 'sw',
+            name: '矿矿矿',
+            code: 'sw',
+            value: [110.191364, 39.290282],
+          },
+          {
+            // name: 'hlg',
+            name: '矿矿矿',
+            code: 'hlg',
+            value: [110.207022, 39.308751],
+          },
+          {
+            // name: 'blt',
+            name: '矿矿矿',
+            code: 'blt',
+            value: [110.173867, 39.358305],
+          },
+          {
+            // name: 'sgt',
+            name: '矿矿矿',
+            code: 'sgt',
+            value: [110.136362, 39.418578],
+          },
+
+          {
+            // name: 'cct',
+            name: '矿矿矿',
+            code: 'cct',
+            value: [110.107954, 39.436366],
+          },
+          {
+            // name: 'wlml',
+            name: '矿矿矿',
+            code: 'wlml',
+            value: [110.102314, 39.456531],
+          },
 
-  const locationInfo = [
-    {
-      name: '保德矿',
-      code: 'bd',
-      value: [111.102548, 38.951875],
-    },
-    {
-      name: '锦界矿',
-      code: 'jj',
-      value: [110.174801, 38.742404],
-    },
-    {
-      name: '榆家梁矿',
-      code: 'yjl',
-      value: [110.526055, 39.044234],
-    },
-    {
-      name: '大柳塔矿',
-      code: 'dlt',
-      value: [110.245165, 39.259314],
-    },
-    // {
-    //   name: '神东煤炭集团',
-    //   value: [110.216401, 39.276499],
-    // },
-    {
-      name: '上湾矿',
-      code: 'sw',
-      value: [110.191364, 39.290282],
-    },
-    {
-      name: '哈拉沟矿',
-      code: 'hlg',
-      value: [110.207022, 39.308751],
-    },
-    {
-      name: '补连塔矿',
-      code: 'blt',
-      value: [110.173867, 39.358305],
-    },
-    {
-      name: '石圪台矿',
-      code: 'sgt',
-      value: [110.136362, 39.418578],
-    },
+          {
+            // name: 'bet',
+            name: '矿矿矿',
+            code: 'bet',
+            value: [110.066138, 39.480941],
+          },
+          {
+            // name: 'cce',
+            name: '矿矿矿',
+            code: 'ccte',
+            value: [110.059497, 39.505482],
+          },
+          {
+            // name: 'lt',
+            name: '矿矿矿',
+            code: 'lt',
+            value: [110.094463, 39.536514],
+          },
+        ]
+      : [
+          {
+            name: '保德矿',
+            code: 'bd',
+            value: [111.102548, 38.951875],
+          },
+          {
+            name: '锦界矿',
+            code: 'jj',
+            value: [110.174801, 38.742404],
+          },
+          {
+            name: '榆家梁矿',
+            code: 'yjl',
+            value: [110.526055, 39.044234],
+          },
+          {
+            name: '大柳塔矿',
+            code: 'dlt',
+            value: [110.245165, 39.259314],
+          },
+          // {
+          //   name: '神东煤炭集团',
+          //   value: [110.216401, 39.276499],
+          // },
+          {
+            name: '上湾矿',
+            code: 'sw',
+            value: [110.191364, 39.290282],
+          },
+          {
+            name: '哈拉沟矿',
+            code: 'hlg',
+            value: [110.207022, 39.308751],
+          },
+          {
+            name: '补连塔矿',
+            code: 'blt',
+            value: [110.173867, 39.358305],
+          },
+          {
+            name: '石圪台矿',
+            code: 'sgt',
+            value: [110.136362, 39.418578],
+          },
 
-    {
-      name: '寸草塔矿',
-      code: 'cct',
-      value: [110.107954, 39.436366],
-    },
-    {
-      name: '乌兰木伦矿',
-      code: 'wlml',
-      value: [110.102314, 39.456531],
-    },
+          {
+            name: '寸草塔矿',
+            code: 'cct',
+            value: [110.107954, 39.436366],
+          },
+          {
+            name: '乌兰木伦矿',
+            code: 'wlml',
+            value: [110.102314, 39.456531],
+          },
 
-    {
-      name: '布尔台矿',
-      code: 'bet',
-      value: [110.066138, 39.480941],
-    },
-    {
-      name: '寸草塔二矿',
-      code: 'ccte',
-      value: [110.059497, 39.505482],
-    },
-    {
-      name: '柳塔矿',
-      code: 'lt',
-      value: [110.094463, 39.536514],
-    },
-  ];
+          {
+            name: '布尔台矿',
+            code: 'bet',
+            value: [110.066138, 39.480941],
+          },
+          {
+            name: '寸草塔二矿',
+            code: 'ccte',
+            value: [110.059497, 39.505482],
+          },
+          {
+            name: '柳塔矿',
+            code: 'lt',
+            value: [110.094463, 39.536514],
+          },
+        ];
 
   onMounted(async () => {
     map = new earthtMap('container', 'tooltip');

src/views/vent/home/clique/components/dialog-modal.vue

@@ -4,7 +4,7 @@
       <i>
         <SvgIcon class="icon" size="14" name="inner-kd" />
       </i>
-      <span class="modal-title"> {{ modalTitle }}</span>
+      <span class="modal-title"> {{ title }}</span>
       <span class="close" @click="getClose">✕</span>
     </div>
     <div class="modal-card">
@@ -77,9 +77,10 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, reactive, defineProps, watch } from 'vue';
+  import { ref, reactive, defineProps, watch, inject } from 'vue';
   import { SvgIcon } from '/@/components/Icon';
   import { getAssetURL } from '/@/utils/ui';
+  const globalConfig = inject('globalConfig');
 
   let props = defineProps({
     centerDetail: {
@@ -88,9 +89,13 @@
         return {};
       },
     },
+    title: {
+      type: String,
+      default: '布尔台矿',
+    },
   });
 
-  let modalTitle = ref('布尔台矿');
+  // let modalTitle = ref('布尔台矿');
   // let modalTitle = ref('yjl');
   let modalCard = reactive([
     { imgSrc: getAssetURL('company/home/hang.png'), label: '巷道长度', value: 0 },

src/views/vent/home/clique/components/icon-light.vue

@@ -10,45 +10,50 @@
 </template>
 
 <script setup lang="ts">
-  import { ref, defineEmits } from 'vue';
+  import { ref, defineEmits, inject } from 'vue';
   import { getAssetURL } from '/@/utils/ui';
 
   const emit = defineEmits(['showDetail']);
+  const globalConfig = inject('globalConfig');
 
   const unselectBgPath = getAssetURL('company/home/unselect-bg.png');
   const selectBgPath = getAssetURL('company/home/select-bg.png');
-  let pointList = ref<any[]>([
-    // { code: 'liuTa', imgSrc: unselectBgPath, label: 'lt', leftV: '327px', topV: '40px', textColor: '#fff' },
-    // { code: 'cunCaoErTa', imgSrc: unselectBgPath, label: 'cce', leftV: '291px', topV: '69px', textColor: '#fff' },
-    // { code: 'buErTaiTa', imgSrc: selectBgPath, label: 'bet', leftV: '286px', topV: '97px', textColor: 'rgba(255, 231, 83,.9)' },
-    // { code: 'wuLunTa', imgSrc: unselectBgPath, label: 'wlml', leftV: '327px', topV: '115px', textColor: '#fff' },
-    // { code: 'cunCaoTa', imgSrc: selectBgPath, label: 'cc', leftV: '346px', topV: '132px', textColor: 'rgba(255, 231, 83,.9)' },
-    // { code: 'shiKanTa', imgSrc: unselectBgPath, label: 'skt', leftV: '373px', topV: '149px', textColor: '#fff' },
-    // { code: 'buLieTa', imgSrc: selectBgPath, label: 'blt', leftV: '408px', topV: '184px', textColor: 'rgba(255, 231, 83,.9)' },
-    // { code: 'haLaGouTa', imgSrc: unselectBgPath, label: 'hlg', leftV: '445px', topV: '214px', textColor: '#fff' },
-    // { code: 'shangWanTa', imgSrc: selectBgPath, label: 'sw', leftV: '439px', topV: '244px', textColor: 'rgba(255, 231, 83,.9)' },
-    // { code: 'huoJiTuTa', imgSrc: unselectBgPath, label: 'hjt', leftV: '398px', topV: '265px', textColor: '#fff' },
-    // { code: 'daLiuTa', imgSrc: unselectBgPath, label: 'dlt', leftV: '492px', topV: '260px', textColor: '#fff' },
-    // { code: 'jinJieTa', imgSrc: selectBgPath, label: 'jj', leftV: '565px', topV: '413px', textColor: 'rgba(255, 231, 83,.9)' },
-    // { code: 'yuJiaTa', imgSrc: unselectBgPath, label: 'yjl', leftV: '669px', topV: '308px', textColor: '#fff' },
-    // { code: 'baoDeTa', imgSrc: selectBgPath, label: 'bd', leftV: '862px', topV: '340px', textColor: 'rgba(255, 231, 83,.9)' },
-    { code: 'liuTa', imgSrc: unselectBgPath, label: '柳塔矿', leftV: '327px', topV: '40px', textColor: '#fff' },
-    { code: 'cunCaoErTa', imgSrc: unselectBgPath, label: '寸草塔二矿', leftV: '291px', topV: '69px', textColor: '#fff' },
-    { code: 'buErTaiTa', imgSrc: selectBgPath, label: '布尔台矿', leftV: '286px', topV: '97px', textColor: 'rgba(255, 231, 83,.9)' },
-    { code: 'wuLunTa', imgSrc: unselectBgPath, label: '乌兰木伦矿', leftV: '327px', topV: '115px', textColor: '#fff' },
-    { code: 'cunCaoTa', imgSrc: selectBgPath, label: '寸草塔矿', leftV: '346px', topV: '132px', textColor: 'rgba(255, 231, 83,.9)' },
-    { code: 'shiKanTa', imgSrc: unselectBgPath, label: '石坎台矿', leftV: '373px', topV: '149px', textColor: '#fff' },
-    { code: 'buLieTa', imgSrc: selectBgPath, label: '补连塔矿', leftV: '408px', topV: '184px', textColor: 'rgba(255, 231, 83,.9)' },
-    { code: 'haLaGouTa', imgSrc: unselectBgPath, label: '哈拉沟矿', leftV: '445px', topV: '214px', textColor: '#fff' },
-    { code: 'shangWanTa', imgSrc: selectBgPath, label: '上湾矿', leftV: '439px', topV: '244px', textColor: 'rgba(255, 231, 83,.9)' },
-    { code: 'huoJiTuTa', imgSrc: unselectBgPath, label: '活鸡兔井', leftV: '398px', topV: '265px', textColor: '#fff' },
-    { code: 'daLiuTa', imgSrc: unselectBgPath, label: '大柳塔矿', leftV: '492px', topV: '260px', textColor: '#fff' },
-    { code: 'jinJieTa', imgSrc: selectBgPath, label: '锦界矿', leftV: '565px', topV: '413px', textColor: 'rgba(255, 231, 83,.9)' },
-    { code: 'yuJiaTa', imgSrc: unselectBgPath, label: '榆家梁矿', leftV: '669px', topV: '308px', textColor: '#fff' },
-    { code: 'baoDeTa', imgSrc: selectBgPath, label: '宝德矿', leftV: '862px', topV: '340px', textColor: 'rgba(255, 231, 83,.9)' },
-  ]);
-
-  function openModal(code, leftV, label, topV) {
+  let pointList = ref<any[]>(
+    globalConfig.History_Type == 'vent'
+      ? [
+          { code: 'liuTa', imgSrc: unselectBgPath, label: 'lt', leftV: '327px', topV: '40px', textColor: '#fff' },
+          { code: 'cunCaoErTa', imgSrc: unselectBgPath, label: 'cce', leftV: '291px', topV: '69px', textColor: '#fff' },
+          { code: 'buErTaiTa', imgSrc: selectBgPath, label: 'bet', leftV: '286px', topV: '97px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'wuLunTa', imgSrc: unselectBgPath, label: 'wlml', leftV: '327px', topV: '115px', textColor: '#fff' },
+          { code: 'cunCaoTa', imgSrc: selectBgPath, label: 'cc', leftV: '346px', topV: '132px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'shiKanTa', imgSrc: unselectBgPath, label: 'skt', leftV: '373px', topV: '149px', textColor: '#fff' },
+          { code: 'buLieTa', imgSrc: selectBgPath, label: 'blt', leftV: '408px', topV: '184px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'haLaGouTa', imgSrc: unselectBgPath, label: 'hlg', leftV: '445px', topV: '214px', textColor: '#fff' },
+          { code: 'shangWanTa', imgSrc: selectBgPath, label: 'sw', leftV: '439px', topV: '244px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'huoJiTuTa', imgSrc: unselectBgPath, label: 'hjt', leftV: '398px', topV: '265px', textColor: '#fff' },
+          { code: 'daLiuTa', imgSrc: unselectBgPath, label: 'dlt', leftV: '492px', topV: '260px', textColor: '#fff' },
+          { code: 'jinJieTa', imgSrc: selectBgPath, label: 'jj', leftV: '565px', topV: '413px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'yuJiaTa', imgSrc: unselectBgPath, label: 'yjl', leftV: '669px', topV: '308px', textColor: '#fff' },
+          { code: 'baoDeTa', imgSrc: selectBgPath, label: 'bd', leftV: '862px', topV: '340px', textColor: 'rgba(255, 231, 83,.9)' },
+        ]
+      : [
+          { code: 'liuTa', imgSrc: unselectBgPath, label: '柳塔矿', leftV: '327px', topV: '40px', textColor: '#fff' },
+          { code: 'cunCaoErTa', imgSrc: unselectBgPath, label: '寸草塔二矿', leftV: '291px', topV: '69px', textColor: '#fff' },
+          { code: 'buErTaiTa', imgSrc: selectBgPath, label: '布尔台矿', leftV: '286px', topV: '97px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'wuLunTa', imgSrc: unselectBgPath, label: '乌兰木伦矿', leftV: '327px', topV: '115px', textColor: '#fff' },
+          { code: 'cunCaoTa', imgSrc: selectBgPath, label: '寸草塔矿', leftV: '346px', topV: '132px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'shiKanTa', imgSrc: unselectBgPath, label: '石圪台矿', leftV: '373px', topV: '149px', textColor: '#fff' },
+          { code: 'buLieTa', imgSrc: selectBgPath, label: '补连塔矿', leftV: '408px', topV: '184px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'haLaGouTa', imgSrc: unselectBgPath, label: '哈拉沟矿', leftV: '445px', topV: '214px', textColor: '#fff' },
+          { code: 'shangWanTa', imgSrc: selectBgPath, label: '上湾矿', leftV: '439px', topV: '244px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'huoJiTuTa', imgSrc: unselectBgPath, label: '活鸡兔井', leftV: '398px', topV: '265px', textColor: '#fff' },
+          { code: 'daLiuTa', imgSrc: unselectBgPath, label: '大柳塔矿', leftV: '492px', topV: '260px', textColor: '#fff' },
+          { code: 'jinJieTa', imgSrc: selectBgPath, label: '锦界矿', leftV: '565px', topV: '413px', textColor: 'rgba(255, 231, 83,.9)' },
+          { code: 'yuJiaTa', imgSrc: unselectBgPath, label: '榆家梁矿', leftV: '669px', topV: '308px', textColor: '#fff' },
+          { code: 'baoDeTa', imgSrc: selectBgPath, label: '保德矿', leftV: '862px', topV: '340px', textColor: 'rgba(255, 231, 83,.9)' },
+        ]
+  );
+  function openModal(code, label, leftV, topV) {
     emit('showDetail', code, label, leftV, topV);
   }
 </script>

src/views/vent/home/clique/index.vue

@@ -44,7 +44,7 @@
       </div>
     </div>
     <div class="area-card2" v-show="isShowDialog">
-      <dialogModal ref="dialogModalRef" @close-dialog="closeDialog" :centerDetail="centerDetail" />
+      <dialogModal ref="dialogModalRef" @close-dialog="closeDialog" :title="dialogTitle" :centerDetail="centerDetail" />
     </div>
   </div>
 </template>
@@ -59,9 +59,10 @@
   import dialogModal from './components/dialog-modal.vue';
   import { getHomeData, getList } from './clique.api';
   const dialogModalRef = ref();
-  // let mainTitle = ref('国家能源神东煤炭集团');
-  let mainTitle = ref('XXXX集团');
+  let mainTitle = ref('国家能源神东煤炭集团');
+  // let mainTitle = ref('XXXX集团');
   const isShowDialog = ref(false);
+  const dialogTitle = ref('');
 
   //矿井通风状态数据
   let airKjStatus = reactive<any[]>([]);
@@ -102,9 +103,9 @@
   async function getHomeDataList() {
     let res = await getHomeData();
     console.log(res, '公司端首页数据----------');
-    if (res.length != 0) {
+    if (res && res.length > 0) {
       earlyWarn.value = res;
-      roadData.totallength = res[0].sys_data.totallength;
+      roadData.totallength = res[0] && res[0].sys_data ? res[0].sys_data.totallength : 0;
       roadData.data.length = 0;
       roadData.data1.length = 0;
       airKjStatus.length = 0;
@@ -133,8 +134,9 @@
     }
   }
 
-  function showDetail(code, leftV, topV) {
+  function showDetail(code, label, leftV, topV) {
     if (code) {
+      dialogTitle.value = label;
       isShowDialog.value = true;
     }
     nextTick(() => {

src/views/vent/home/clique/index1.vue

@@ -57,7 +57,8 @@
   import iconLight from './components/icon-light.vue';
   // import mapComponent from './components/3Dmap/index.vue';
 
-  let mainTitle = ref('XXXX集团');
+  let mainTitle = ref('国家能源神东煤炭集团');
+  // let mainTitle = ref('XXXX集团');
   function showDetail(code) {
     if (code) {
       // isShowDialog.value = true;

src/views/vent/home/clique/testPage.vue

@@ -12,36 +12,65 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { computed, ref } from 'vue';
+  import { computed, ref, inject } from 'vue';
   // import mapComponent from './components/3Dmap/index.vue';
-
+  const globalConfig = inject('globalConfig');
   const mainTitle = ref('国家能源神东煤炭集团');
-  const cards = ref<{ title: string }[]>([
-    {
-      title: '布尔台矿',
-    },
-    {
-      title: '柳塔矿矿',
-    },
-    {
-      title: '寸草塔二矿',
-    },
-    {
-      title: '乌兰木伦矿',
-    },
-    {
-      title: '寸草塔矿',
-    },
-    {
-      title: '石坎台矿',
-    },
-    {
-      title: '补连塔矿',
-    },
-    {
-      title: '哈拉沟矿',
-    },
-  ]);
+  const cards = ref<{ title: string }[]>(
+    globalConfig.History_Type == 'vent'
+      ? [
+          {
+            title: '布尔台矿',
+          },
+          {
+            title: '柳塔矿矿',
+          },
+          {
+            title: '寸草塔二矿',
+          },
+          {
+            title: '乌兰木伦矿',
+          },
+          {
+            title: '寸草塔矿',
+          },
+          {
+            title: '石坎台矿',
+          },
+          {
+            title: '补连塔矿',
+          },
+          {
+            title: '哈拉沟矿',
+          },
+        ]
+      : [
+          {
+            title: 'betk',
+          },
+          {
+            title: 'ltk',
+          },
+          {
+            title: 'ctk',
+          },
+          {
+            title: 'wlml',
+          },
+          {
+            title: 'cctk',
+          },
+          {
+            title: 'sgtk',
+          },
+          {
+            title: 'bltk',
+          },
+          {
+            title: 'hlagk',
+          },
+        ]
+  );
 </script>
 <style lang="less" scoped>
   @font-face {

src/views/vent/performance/fileDetail/commen/CADViewer.vue

@@ -5,7 +5,7 @@
 <script lang="ts" setup>
   import { onMounted, onUnmounted } from 'vue';
   import { CADViewer, useCADViewer } from '/@/components/CADViewer';
-  import { downLoad } from '../fileDetail.api';
+  import { downloadById } from '../fileDetail.api';
   import { useRoute } from 'vue-router';
   import { message } from 'ant-design-vue';
 
@@ -24,7 +24,7 @@
     registHook('MKY_Open_File_Complete', () => {
       unregistHook('MKY_Open_File_Complete');
       const loading = message.loading('正在下载文件', 0);
-      downLoad({ id, ifMine: initByRoute }).then((res: Blob) => {
+      downloadById({ id, ifMine: initByRoute }).then((res: Blob) => {
         processFile(new File([res], filename))
           .then((path) => {
             postMessage('MKY_Open_Mxweb', path);

src/views/vent/performance/fileDetail/fileDetail.api.ts

@@ -8,10 +8,11 @@ enum Api {
   delMenu = '/ventanaly-sharefile/fileServer/delete',
   uploadApi = '/ventanaly-sharefile/fileServer/upload',
   downLoad = '/ventanaly-sharefile/fileServer/download',
-  listData ='/activiti/activiti_process/listData',
-  commit='/safety/actBusiness/commit',
-  getNowUserAgencyData='/safety/approvalBusiness/getNowUserAgencyData',
-  getNowUserApprovedData='/safety/approvalBusiness/getNowUserApprovedData'
+  downloadById = '/ventanaly-sharefile/fileServer/downloadById',
+  listData = '/activiti/activiti_process/listData',
+  commit = '/safety/actBusiness/commit',
+  getNowUserAgencyData = '/safety/approvalBusiness/getNowUserAgencyData',
+  getNowUserApprovedData = '/safety/approvalBusiness/getNowUserApprovedData',
 }
 
 /**
@@ -48,6 +49,12 @@ export const delMenu = (params) => defHttp.delete({ url: Api.delMenu, params },
  */
 export const downLoad = (params) => defHttp.post({ url: Api.downLoad, params, responseType: 'blob' });
 
+/**
+ * 下载文件接口，通过id下载
+ * @param params
+ */
+export const downloadById = (params) => defHttp.get({ url: Api.downloadById, params, responseType: 'blob' });
+
 /**
  * 删除文件/文件夹
  */