cxs 3 тижнів тому
батько
коміт
c7be8c04a2

+ 7 - 0
src/api/modules/allData.ts

@@ -47,3 +47,10 @@ export const getStaitemList = (params:{}) => {
 export const getQuerCertList = (params:{}) => {
   return http.post<ResPage<any>>(PORT1 + `/queryascalinfolist`,params);
 };
+
+
+
+//获取所有系统配置【queryallsysitem】
+export const getQueryAllSysItem = () => {
+  return http.post<ResPage<any>>(PORT1 + `/queryallsysitem`);
+};

+ 19 - 1
src/api/modules/login.ts

@@ -1,8 +1,12 @@
 import { Login } from "@/api/interface/index";
 import { PORT1 } from "@/api/config/servicePort";
-import authMenuList from "@/assets/json/authMenuList.json";
+import authMenuList from "@/assets/json/authMenuList.json";//管理员
+import forecasterMenuList from "@/assets/json/forecasterMenuList.json";//预报员 装备管理人员
+import observerMenuList from "@/assets/json/observerMenuList.json";//观测员
 import authButtonList from "@/assets/json/authButtonList.json";
 import http from "@/api";
+import {computed} from "vue";
+import {useUserStore} from "@/stores/modules/user";
 
 /**
  * @name 登录模块
@@ -18,8 +22,22 @@ export const loginApi = (params: Login.ReqLoginForm) => {
 
 // 获取菜单列表
 export const getAuthMenuListApi = () => {
+  const userStore = useUserStore();
+  const userForm  = computed(() => userStore.userInfo);
   // return http.get<Menu.MenuOptions[]>(PORT1 + `/menu/list`, {}, { loading: false });
   // 如果想让菜单变为本地数据,注释上一行代码,并引入本地 authMenuList.json 数据
+ if(userForm.value.role_id==='管理员'){
+   return authMenuList;
+ }
+  if(userForm.value.role_id==='观测员'){
+    return observerMenuList;
+  }
+  if(userForm.value.role_id==='预报员'){
+    return forecasterMenuList;
+  }
+  if(userForm.value.role_id==='装备管理人员'){
+    return forecasterMenuList;
+  }
   return authMenuList;
 };
 

+ 350 - 0
src/assets/json/forecasterMenuList.json

@@ -0,0 +1,350 @@
+{
+    "code": 200,
+    "data": [{
+            "path": "/monitoringAlarms",
+            "name": "monitoringAlarms",
+            "redirect": "/alarm/allData",
+            "meta": {
+                "icon": "alarm",
+                "title": "实时监测报警",
+                "isLink": "",
+                "isHide": false,
+                "isFull": false,
+                "isAffix": false,
+                "isKeepAlive": true
+            },
+            "children": [{
+                    "path": "/alarm/allData",
+                    "name": "allData",
+                    "component": "/alarm/allData/index",
+                    "meta": {
+                        "title": "全网实时数据监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/allWeather",
+                    "name": "allWeather",
+                    "component": "/alarm/allWeather/index",
+                    "meta": {
+                        "title": "全网危险天气监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/allDevice",
+                    "name": "allDevice",
+                    "component": "/alarm/allDevice/index",
+                    "meta": {
+                        "title": "全网设备状态监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/singleData",
+                    "name": "singleData",
+                    "component": "/alarm/singleStationData/index",
+                    "meta": {
+                        "title": "单站实时数据监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/singleDevice",
+                    "name": "singleDevice",
+                    "component": "/alarm/singleDevice/index",
+                    "meta": {
+                        "title": "单站设备状态监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/software",
+                    "name": "software",
+                    "component": "/alarm/software/index",
+                    "meta": {
+                        "title": "软件状态监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/gis",
+                    "name": "proTableDocument",
+                    "component": "/alarm/gis/index",
+                    "meta": {
+                        "title": "GIS展示",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                }
+            ]
+        },
+        {
+            "path": "/dataAnalysis",
+            "name": "dataAnalysis",
+            "redirect": "/analysis/dataSynthesis",
+            "meta": {
+                "icon": "analysis",
+                "title": "数据分析显示",
+                "isLink": "",
+                "isHide": false,
+                "isFull": false,
+                "isAffix": false,
+                "isKeepAlive": true
+            },
+            "children": [{
+                    "path": "/analysis/dataSynthesis",
+                    "name": "dataSynthesis",
+                    "component": "/analysis/dataSynthesis/index",
+                    "meta": {
+                        "title": "数据综合分析",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/analysis/featureCurves",
+                    "name": "featureCurves",
+                    "component": "/analysis/featureCurves/index",
+                    "meta": {
+                        "title": "要素曲线分析",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/analysis/windSpeed",
+                    "name": "windSpeed",
+                    "component": "/analysis/windSpeed/index",
+                    "meta": {
+                        "title": "风速风向玫瑰图",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/analysis/rainfall",
+                    "name": "rainfall",
+                    "component": "/analysis/rainfall/index",
+                    "meta": {
+                        "title": "雨量柱状图分析",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/analysis/lightningArea",
+                    "name": "lightningArea",
+                    "component": "/analysis/lightningArea/index",
+                    "meta": {
+                        "title": "雷电区域分析",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                }
+            ]
+        },
+        {
+            "path": "/dataQueryOutput",
+            "name": "dataQueryOutput",
+            "redirect": "/query/queryObservationData",
+            "meta": {
+                "icon": "query",
+                "title": "数据查询输出",
+                "isLink": "",
+                "isHide": false,
+                "isFull": false,
+                "isAffix": false,
+                "isKeepAlive": true
+            },
+            "children": [{
+                    "path": "/query/queryObservationData",
+                    "name": "queryObservationData",
+                    "component": "/query/queryObservationData/index",
+                    "meta": {
+                        "title": "观测数据查询",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/deviceHealth",
+                    "name": "deviceHealth",
+                    "component": "/query/deviceHealth/index",
+                    "meta": {
+                        "title": "设备健康信息查询",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/hazardousWeather",
+                    "name": "hazardousWeather",
+                    "component": "/query/hazardousWeather/index",
+                    "meta": {
+                        "title": "危险天气记录查询",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/qualityAudits",
+                    "name": "qualityAudits",
+                    "component": "/query/qualityAudits/index",
+                    "meta": {
+                        "title": "质量审核记录",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/dutyProcess",
+                    "name": "dutyProcess",
+                    "component": "/query/dutyProcess/index",
+                    "meta": {
+                        "title": "值班过程管理",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/dailyObservations",
+                    "name": "dailyObservations",
+                    "component": "/query/dailyObservations/index",
+                    "meta": {
+                        "title": "日观测纪要",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/record",
+                    "name": "record",
+                    "component": "/query/record/index",
+                    "meta": {
+                        "title": "记录簿",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+              {
+                "path": "/query/monthly",
+                "name": "monthly",
+                "component": "/query/monthly/index",
+                "meta": {
+                  "title": "月报表查询",
+                  "isLink": "",
+                  "isHide": false,
+                  "isFull": false,
+                  "isAffix": false,
+                  "isKeepAlive": true
+                }
+              },
+                {
+                    "path": "/query/log",
+                    "name": "log",
+                    "component": "/query/log/index",
+                    "meta": {
+                        "title": "天气日志",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                }
+            ]
+        },
+        {
+            "path": "/maintenance",
+            "name": "maintenance",
+            "redirect": "/maintenance/siteRecords",
+            "meta": {
+                "icon": "maintenance",
+                "title": "维护管理",
+                "isLink": "",
+                "isHide": false,
+                "isFull": false,
+                "isAffix": false,
+                "isKeepAlive": true
+            },
+            "children": [{
+                "path": "/maintenance/siteRecords",
+                "name": "siteRecords",
+                "component": "/maintenance/siteRecords/index",
+                "meta": {
+                    "title": "站点维护记录",
+                    "isLink": "",
+                    "isHide": false,
+                    "isFull": false,
+                    "isAffix": false,
+                    "isKeepAlive": true
+                }
+            }]
+        }
+    ],
+    "msg": "成功"
+}

+ 392 - 0
src/assets/json/observerMenuList.json

@@ -0,0 +1,392 @@
+{
+    "code": 200,
+    "data": [{
+            "path": "/monitoringAlarms",
+            "name": "monitoringAlarms",
+            "redirect": "/alarm/allData",
+            "meta": {
+                "icon": "alarm",
+                "title": "实时监测报警",
+                "isLink": "",
+                "isHide": false,
+                "isFull": false,
+                "isAffix": false,
+                "isKeepAlive": true
+            },
+            "children": [{
+                    "path": "/alarm/allData",
+                    "name": "allData",
+                    "component": "/alarm/allData/index",
+                    "meta": {
+                        "title": "全网实时数据监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/allWeather",
+                    "name": "allWeather",
+                    "component": "/alarm/allWeather/index",
+                    "meta": {
+                        "title": "全网危险天气监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/allDevice",
+                    "name": "allDevice",
+                    "component": "/alarm/allDevice/index",
+                    "meta": {
+                        "title": "全网设备状态监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/singleData",
+                    "name": "singleData",
+                    "component": "/alarm/singleStationData/index",
+                    "meta": {
+                        "title": "单站实时数据监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/singleDevice",
+                    "name": "singleDevice",
+                    "component": "/alarm/singleDevice/index",
+                    "meta": {
+                        "title": "单站设备状态监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/software",
+                    "name": "software",
+                    "component": "/alarm/software/index",
+                    "meta": {
+                        "title": "软件状态监测报警",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/alarm/gis",
+                    "name": "proTableDocument",
+                    "component": "/alarm/gis/index",
+                    "meta": {
+                        "title": "GIS展示",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                }
+            ]
+        },
+        {
+            "path": "/dataAnalysis",
+            "name": "dataAnalysis",
+            "redirect": "/analysis/dataSynthesis",
+            "meta": {
+                "icon": "analysis",
+                "title": "数据分析显示",
+                "isLink": "",
+                "isHide": false,
+                "isFull": false,
+                "isAffix": false,
+                "isKeepAlive": true
+            },
+            "children": [{
+                    "path": "/analysis/dataSynthesis",
+                    "name": "dataSynthesis",
+                    "component": "/analysis/dataSynthesis/index",
+                    "meta": {
+                        "title": "数据综合分析",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/analysis/featureCurves",
+                    "name": "featureCurves",
+                    "component": "/analysis/featureCurves/index",
+                    "meta": {
+                        "title": "要素曲线分析",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/analysis/windSpeed",
+                    "name": "windSpeed",
+                    "component": "/analysis/windSpeed/index",
+                    "meta": {
+                        "title": "风速风向玫瑰图",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/analysis/rainfall",
+                    "name": "rainfall",
+                    "component": "/analysis/rainfall/index",
+                    "meta": {
+                        "title": "雨量柱状图分析",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/analysis/lightningArea",
+                    "name": "lightningArea",
+                    "component": "/analysis/lightningArea/index",
+                    "meta": {
+                        "title": "雷电区域分析",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                }
+            ]
+        },
+        {
+            "path": "/dataQueryOutput",
+            "name": "dataQueryOutput",
+            "redirect": "/query/queryObservationData",
+            "meta": {
+                "icon": "query",
+                "title": "数据查询输出",
+                "isLink": "",
+                "isHide": false,
+                "isFull": false,
+                "isAffix": false,
+                "isKeepAlive": true
+            },
+            "children": [{
+                    "path": "/query/queryObservationData",
+                    "name": "queryObservationData",
+                    "component": "/query/queryObservationData/index",
+                    "meta": {
+                        "title": "观测数据查询",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/deviceHealth",
+                    "name": "deviceHealth",
+                    "component": "/query/deviceHealth/index",
+                    "meta": {
+                        "title": "设备健康信息查询",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/hazardousWeather",
+                    "name": "hazardousWeather",
+                    "component": "/query/hazardousWeather/index",
+                    "meta": {
+                        "title": "危险天气记录查询",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/qualityAudits",
+                    "name": "qualityAudits",
+                    "component": "/query/qualityAudits/index",
+                    "meta": {
+                        "title": "质量审核记录",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/dutyProcess",
+                    "name": "dutyProcess",
+                    "component": "/query/dutyProcess/index",
+                    "meta": {
+                        "title": "值班过程管理",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/dailyObservations",
+                    "name": "dailyObservations",
+                    "component": "/query/dailyObservations/index",
+                    "meta": {
+                        "title": "日观测纪要",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/query/record",
+                    "name": "record",
+                    "component": "/query/record/index",
+                    "meta": {
+                        "title": "记录簿",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+              {
+                "path": "/query/monthly",
+                "name": "monthly",
+                "component": "/query/monthly/index",
+                "meta": {
+                  "title": "月报表查询",
+                  "isLink": "",
+                  "isHide": false,
+                  "isFull": false,
+                  "isAffix": false,
+                  "isKeepAlive": true
+                }
+              },
+                {
+                    "path": "/query/log",
+                    "name": "log",
+                    "component": "/query/log/index",
+                    "meta": {
+                        "title": "天气日志",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                }
+            ]
+        },
+        {
+            "path": "/system",
+            "name": "system",
+            "redirect": "/system/user",
+            "meta": {
+                "icon": "system",
+                "title": "系统管理",
+                "isLink": "",
+                "isHide": false,
+                "isFull": false,
+                "isAffix": false,
+                "isKeepAlive": true
+            },
+            "children": [
+                {
+                    "path": "/system/stations",
+                    "name": "stations",
+                    "component": "/system/stations/index",
+                    "meta": {
+                        "title": "台站管理",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                },
+                {
+                    "path": "/system/disposition",
+                    "name": "disposition",
+                    "component": "/system/disposition/index",
+                    "meta": {
+                        "title": "系统配置",
+                        "isLink": "",
+                        "isHide": false,
+                        "isFull": false,
+                        "isAffix": false,
+                        "isKeepAlive": true
+                    }
+                }
+            ]
+        },
+        {
+            "path": "/maintenance",
+            "name": "maintenance",
+            "redirect": "/maintenance/siteRecords",
+            "meta": {
+                "icon": "maintenance",
+                "title": "维护管理",
+                "isLink": "",
+                "isHide": false,
+                "isFull": false,
+                "isAffix": false,
+                "isKeepAlive": true
+            },
+            "children": [{
+                "path": "/maintenance/siteRecords",
+                "name": "siteRecords",
+                "component": "/maintenance/siteRecords/index",
+                "meta": {
+                    "title": "站点维护记录",
+                    "isLink": "",
+                    "isHide": false,
+                    "isFull": false,
+                    "isAffix": false,
+                    "isKeepAlive": true
+                }
+            }]
+        }
+    ],
+    "msg": "成功"
+}

+ 64 - 8
src/views/system/disposition/components/configurationAuthorization.vue

@@ -6,7 +6,7 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="授时间隔" style="width: 200px">
-              <el-select v-model="formInline.region">
+              <el-select v-model="formInline.timeGrantIntervals" :disabled="isDisabled">
                 <el-option label="1小时" value="1"></el-option>
               </el-select>
             </el-form-item>
@@ -16,8 +16,14 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="补发时段" style="width: 200px">
-              <el-select v-model="formInline.region">
-                <el-option label="720小时" value="1"></el-option>
+              <el-select v-model="formInline.periodReissue" :disabled = "isDisabled">
+                <el-option label="1小时" value="1"></el-option>
+                <el-option label="6小时" value="6"></el-option>
+                <el-option label="12小时" value="12"></el-option>
+                <el-option label="24小时" value="24"></el-option>
+                <el-option label="168小时" value="168"></el-option>
+                <el-option label="360小时" value="360"></el-option>
+                <el-option label="720小时" value="720"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -26,18 +32,29 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="系统授时类型" style="width: 200px">
-              <el-select v-model="formInline.region">
+              <el-select v-model="formInline.timingType">
                 <el-option label="自动站授时" value="1"></el-option>
+                <el-option label="始终服务器授时" value="2"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="4" v-if="formInline.timingType==='1'">
             <el-form-item label="自动站" style="width: 200px">
-              <el-select v-model="formInline.region">
+              <el-select v-model="formInline.timingPlatform" :disabled = "isDisabled">
                 <el-option label="test1" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+            <el-col :span="4" v-if="formInline.timingType==='2'">
+              <el-form-item label="地址" style="width: 200px">
+                <el-input v-model="formInline.timingIP" :disabled="isDisabled"></el-input>
+              </el-form-item>
+            </el-col>
+              <el-col :span="4" v-if="formInline.timingType==='2'">
+                <el-form-item label="端口号" style="width: 200px">
+                  <el-input v-model="formInline.timingPlatformPORT" :disabled="isDisabled"></el-input>
+                </el-form-item>
+          </el-col>
         </el-row>
       </div>
       <div class="disposition-bottom">
@@ -49,12 +66,51 @@
 </template>
 
 <script setup lang="tsx">
-import {ref} from "vue";
-
+import { onMounted, ref, watch} from "vue";
+import { defineModel } from 'vue';
+const modelValue = defineModel();
+const isDisabled = ref(true)
 const formInline = ref<any>({
+  timeGrantIntervals:'1',
+  periodReissue:'',
+  timingType:'',
+  timingPlatform:'',
+  timingIP:'',
+  timingPlatformPORT:'',
+
+
+
   user:"",
   region:""
 })
+onMounted(() => {
+
+});
+watch(modelValue, (newVal) => {
+  // 在这里处理 modelValue 的变化
+  console.log("====")
+  dataProcessing()
+});
+
+const dataProcessing= async ()=>{
+  modelValue.value.forEach(function(item) {
+    const itemValue = item.item_value
+    if (!itemValue) {
+      return;
+    }
+    if(item.item_key==='10'){
+      formInline.value.periodReissue = itemValue
+      console.log(formInline.value.periodReissue)
+    }
+    if(item.item_key==='8'){
+      const [timingType, timingPlatform,timingIP,timingPlatformPORT] = itemValue.split('#');
+      formInline.value.timingType = timingType
+      formInline.value.timingPlatform = timingPlatform
+      formInline.value.timingIP = timingIP
+      formInline.value.timingPlatformPORT = timingPlatformPORT
+    }
+  });
+}
 </script>
 
 <style scoped>

+ 57 - 18
src/views/system/disposition/components/configurationBasic.vue

@@ -6,12 +6,12 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="采集服务地址" style="width: 200px">
-              <el-input v-model="formInline.user"></el-input>
+              <el-input v-model="formInline.ipPart" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="采集服务端口" style="width: 200px">
-              <el-input v-model="formInline.user" placeholder="审批人"></el-input>
+              <el-input v-model="formInline.portPart" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -19,8 +19,10 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="数据库类型" style="width: 200px">
-              <el-select v-model="formInline.region">
-                <el-option label="数据库1" value="1"></el-option>
+              <el-select v-model="formInline.region" :disabled="isDisabled">
+                <el-option label="达梦数据库" value="达梦数据库"></el-option>
+                <el-option label="SQLite数据库" value="SQLite数据库"></el-option>
+                <el-option label="SqlServer数据库" value="SqlServer数据库"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -28,27 +30,27 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="数据库实例名" style="width: 200px">
-              <el-input v-model="formInline.user"></el-input>
+              <el-input v-model="formInline.user" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="数据库地址" style="width: 200px">
-              <el-input v-model="formInline.user"></el-input>
+              <el-input v-model="formInline.user" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="数据库端口" style="width: 200px">
-              <el-input v-model="formInline.user"></el-input>
+            <el-form-item label="数据库端口" style="width: 200px" >
+              <el-input v-model="formInline.user" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="数据库账号" style="width: 200px">
-              <el-input v-model="formInline.user"></el-input>
+            <el-form-item label="数据库账号" style="width: 200px" >
+              <el-input v-model="formInline.user" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="数据库密码" style="width: 250px">
-              <el-input v-model="formInline.user"></el-input>
+              <el-input v-model="formInline.user" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -56,7 +58,7 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="前端地图地址" style="width: 200px">
-              <el-input v-model="formInline.user"></el-input>
+              <el-input v-model="formInline.user" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,12 +66,12 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="地址" style="width: 200px">
-              <el-input v-model="formInline.user"></el-input>
+              <el-input v-model="formInline.mapUrl" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="端口" style="width: 200px">
-              <el-input v-model="formInline.user"></el-input>
+              <el-input v-model="formInline.user" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -83,12 +85,49 @@
 </template>
 
 <script setup lang="tsx">
-import {ref} from "vue";
-
+import {nextTick, onMounted, ref, watch} from "vue";
+import { defineModel } from 'vue';
+const modelValue = defineModel();
+const isDisabled = ref(true)
 const formInline = ref<any>({
-  user:"",
-  region:""
+  ipPart:"",
+  portPart:"",
+  mapUrl:""
 })
+onMounted(() => {
+
+});
+watch(modelValue, (newVal) => {
+  // 在这里处理 modelValue 的变化
+  dataProcessing()
+});
+
+const dataProcessing= async ()=>{
+  await nextTick(); // 确保 DOM 更新完成
+  modelValue.value.forEach(function(item) {
+    if(item.item_key==='9'){
+      const itemValue = item.item_value
+      if (!itemValue) {
+        return;
+      }
+      const [ipPart, portPart] = itemValue.split('#');
+      if (!ipPart || !portPart) {
+        return;
+      }
+      formInline.value.ipPart = ipPart
+      formInline.value.portPart = portPart
+    }
+
+    if(item.item_key==='6'){
+      const itemValue = item.item_value
+      if (!itemValue) {
+        return;
+      }
+      formInline.value.mapUrl = itemValue
+    }
+  });
+}
+
 </script>
 
 <style scoped>

+ 270 - 40
src/views/system/disposition/components/configurationGlobal.vue

@@ -6,32 +6,32 @@
         <el-row :gutter="20">
           <el-col :span="5">
             <el-form-item style="width: 250px">
-              <el-checkbox v-model="formInline.checkboxValue">正点值班时间提醒声音选择</el-checkbox>
-              <el-select v-model="formInline.region">
+              <el-checkbox v-model="formInline.isDutyPunctual" :disabled="isDisabled">正点值班时间提醒声音选择</el-checkbox>
+              <el-select v-model="formInline.dutyPunctual" :disabled="isDisabled">
                 <el-option label="传感器故障.wav" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item style="width: 250px">
-              <el-checkbox v-model="formInline.checkboxValue">仪器检定证提醒声音选择</el-checkbox>
-              <el-select v-model="formInline.region">
+              <el-checkbox v-model="formInline.isInstrument" :disabled="isDisabled">仪器检定证提醒声音选择</el-checkbox>
+              <el-select v-model="formInline.instrument" :disabled="isDisabled">
                 <el-option label="传感器故障.wav" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item style="width: 250px">
-              <el-checkbox v-model="formInline.checkboxValue">自动编发报文声音选择</el-checkbox>
-              <el-select v-model="formInline.region">
+              <el-checkbox v-model="formInline.isDispatch" :disabled="isDisabled">自动编发报文提醒声音选择</el-checkbox>
+              <el-select v-model="formInline.dispatch" :disabled="isDisabled">
                 <el-option label="传感器故障.wav" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item style="width: 250px">
-              <el-checkbox v-model="formInline.checkboxValue">传感器故障提醒声音选择</el-checkbox>
-              <el-select v-model="formInline.region">
+              <el-checkbox v-model="formInline.isFailureSensor" :disabled="isDisabled">传感器故障提醒声音选择</el-checkbox>
+              <el-select v-model="formInline.failureSensor" :disabled="isDisabled">
                 <el-option label="传感器故障.wav" value="1"></el-option>
               </el-select>
             </el-form-item>
@@ -40,32 +40,32 @@
         <el-row :gutter="20">
           <el-col :span="5">
             <el-form-item style="width: 250px">
-              <el-checkbox v-model="formInline.checkboxValue">正点值班时间提醒声音选择</el-checkbox>
-              <el-select v-model="formInline.region">
+              <el-checkbox v-model="formInline.isFeatures" :disabled="isDisabled">要素缺测提醒声音选择</el-checkbox>
+              <el-select v-model="formInline.features" :disabled="isDisabled">
                 <el-option label="传感器故障.wav" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item style="width: 250px">
-              <el-checkbox v-model="formInline.checkboxValue">仪器检定证提醒声音选择</el-checkbox>
-              <el-select v-model="formInline.region">
+              <el-checkbox v-model="formInline.isWeatherHazardous" :disabled="isDisabled">危险天气提醒声音选择</el-checkbox>
+              <el-select v-model="formInline.weatherHazardous" :disabled="isDisabled">
                 <el-option label="传感器故障.wav" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item style="width: 250px">
-              <el-checkbox v-model="formInline.checkboxValue">自动编发报文声音选择</el-checkbox>
-              <el-select v-model="formInline.region">
+              <el-checkbox v-model="formInline.isCommunication" :disabled="isDisabled">通讯故障提醒声音选择</el-checkbox>
+              <el-select v-model="formInline.communication" :disabled="isDisabled">
                 <el-option label="传感器故障.wav" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item style="width: 250px">
-              <el-checkbox v-model="formInline.checkboxValue">传感器故障提醒声音选择</el-checkbox>
-              <el-select v-model="formInline.region">
+              <el-checkbox v-model="formInline.isProcess" :disabled="isDisabled">进程管理提醒声音选择</el-checkbox>
+              <el-select v-model="formInline.process" :disabled="isDisabled">
                 <el-option label="传感器故障.wav" value="1"></el-option>
               </el-select>
             </el-form-item>
@@ -75,57 +75,57 @@
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item>
-              <el-checkbox v-model="formInline.checkboxValue">能见度</el-checkbox>
-              <el-input v-model="formInline.user" placeholder="请输入告警条件"></el-input>
-              <el-input v-model="formInline.user" placeholder="请输入消警条件" style="margin-top: 10px"></el-input>
+              <el-checkbox v-model="formInline.isVisibility" :disabled="isDisabled">能见度</el-checkbox>
+              <el-input v-model="formInline.visibility" placeholder="请输入告警条件" :disabled="isDisabled"></el-input>
+              <el-input v-model="formInline.visibility2" placeholder="请输入消警条件" style="margin-top: 10px" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item>
-              <el-checkbox v-model="formInline.checkboxValue">大气电场</el-checkbox>
-              <el-input v-model="formInline.user" placeholder="请输入告警条件"></el-input>
-              <el-input v-model="formInline.user" placeholder="请输入消警条件" style="margin-top: 10px"></el-input>
+              <el-checkbox v-model="formInline.isWindVelocity" :disabled="isDisabled">风速</el-checkbox>
+              <el-input v-model="formInline.windVelocity" placeholder="请输入告警条件" :disabled="isDisabled"></el-input>
+              <el-input v-model="formInline.windVelocity2" placeholder="请输入消警条件" style="margin-top: 10px" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item>
-              <el-checkbox v-model="formInline.checkboxValue">能见度</el-checkbox>
-              <el-input v-model="formInline.user" placeholder="请输入告警条件"></el-input>
-              <el-input v-model="formInline.user" placeholder="请输入消警条件" style="margin-top: 10px"></el-input>
+              <el-checkbox v-model="formInline.isElectricField" :disabled="isDisabled">大气电场</el-checkbox>
+              <el-input v-model="formInline.electricField" placeholder="请输入告警条件" :disabled="isDisabled"></el-input>
+              <el-input v-model="formInline.electricField2" placeholder="请输入消警条件" style="margin-top: 10px" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item>
-              <el-checkbox v-model="formInline.checkboxValue">气温</el-checkbox>
-              <el-input v-model="formInline.user" placeholder="请输入告警条件"></el-input>
-              <el-input v-model="formInline.user" placeholder="请输入消警条件" style="margin-top: 10px"></el-input>
+              <el-checkbox v-model="formInline.isTemperature" :disabled="isDisabled">温度</el-checkbox>
+              <el-input v-model="formInline.temperature" placeholder="请输入告警条件" :disabled="isDisabled"></el-input>
+              <el-input v-model="formInline.temperature2" placeholder="请输入消警条件" style="margin-top: 10px" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item>
-              <el-checkbox v-model="formInline.checkboxValue">湿度</el-checkbox>
-              <el-input v-model="formInline.user" placeholder="请输入告警条件"></el-input>
-              <el-input v-model="formInline.user" placeholder="请输入消警条件" style="margin-top: 10px"></el-input>
+              <el-checkbox v-model="formInline.isHumidity" :disabled="isDisabled">湿度</el-checkbox>
+              <el-input v-model="formInline.humidity" placeholder="请输入告警条件" :disabled="isDisabled"></el-input>
+              <el-input v-model="formInline.humidity2" placeholder="请输入消警条件" style="margin-top: 10px" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item>
-              <el-checkbox v-model="formInline.checkboxValue">雨量</el-checkbox>
-              <el-input v-model="formInline.user" placeholder="请输入告警条件"></el-input>
-              <el-input v-model="formInline.user" placeholder="请输入消警条件" style="margin-top: 10px"></el-input>
+              <el-checkbox v-model="formInline.isRainfall" :disabled="isDisabled">雨量</el-checkbox>
+              <el-input v-model="formInline.rainfall" placeholder="请输入告警条件" :disabled="isDisabled"></el-input>
+              <el-input v-model="formInline.rainfall2" placeholder="请输入消警条件" style="margin-top: 10px" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item>
-              <el-checkbox v-model="formInline.checkboxValue">云低</el-checkbox>
-              <el-input v-model="formInline.user" placeholder="请输入告警条件"></el-input>
-              <el-input v-model="formInline.user" placeholder="请输入消警条件" style="margin-top: 10px"></el-input>
+              <el-checkbox v-model="formInline.isClouds" :disabled="isDisabled">云底高</el-checkbox>
+              <el-input v-model="formInline.clouds" placeholder="请输入告警条件" :disabled="isDisabled"></el-input>
+              <el-input v-model="formInline.clouds2" placeholder="请输入消警条件" style="margin-top: 10px" :disabled="isDisabled"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -139,13 +139,243 @@
 </template>
 
 <script setup lang="tsx">
-import {ref} from "vue";
-
+import {nextTick, onMounted, ref, watch} from "vue";
+import { defineModel } from 'vue';
+import {getRgDataList} from "@/api/modules/allData";
+const modelValue = defineModel();
+const isDisabled = ref(true)
 const formInline = ref<any>({
   user:"",
   region:"",
-  checkboxValue:false
+  checkboxValue: true,
+
+  dutyPunctual:'',
+  isDutyPunctual:false,
+  instrument:'',
+  isInstrument:false,
+  dispatch:'',
+  isDispatch:false,
+  failureSensor:'',
+  isFailureSensor:false,
+  features:'',
+  isFeatures:false,
+  weatherHazardous:'',
+  isWeatherHazardous: false,
+  communication:'',
+  isCommunication:false,
+  process:'',
+  isProcess:false,
+
+  visibility: '',
+  visibility2: '',
+  isVisibility:false,
+
+  windVelocity:'',
+  windVelocity2:'',
+  isWindVelocity:false,
+
+  electricField:'',
+  electricField2:'',
+  isElectricField:false,
+
+  temperature:'',
+  temperature2:'',
+  isTemperature: false,
+
+  humidity:'',
+  humidity2:'',
+  isHumidity: false,
+
+  rainfall:'',
+  rainfall2:'',
+  isRainfall:false,
+
+  clouds:'',
+  clouds2:'',
+  isClouds:false
+
 })
+onMounted(() => {
+  getAllRgDataList()
+});
+watch(modelValue, (newVal) => {
+  // 在这里处理 modelValue 的变化
+  dataProcessing()
+});
+
+const dataProcessing= async ()=>{
+  modelValue.value.forEach(function(item) {
+    const itemValue = item.item_value
+    if (!itemValue) {
+      return;
+    }
+    if(item.item_key==='28'){
+      formInline.value.dutyPunctual = itemValue
+      formInline.value.isDutyPunctual = true
+    }
+
+    if(item.item_key==='29'){
+      formInline.value.instrument = itemValue
+      formInline.value.isInstrument = true
+    }
+
+    if(item.item_key==='30'){
+      formInline.value.dispatch = itemValue
+      formInline.value.isDispatch = true
+    }
+
+    if(item.item_key==='31'){
+      formInline.value.failureSensor = itemValue
+      formInline.value.isFailureSensor = true
+    }
+
+    if(item.item_key==='32'){
+      formInline.value.features = itemValue
+      formInline.value.isFeatures = true
+    }
+
+    if(item.item_key==='33'){
+      formInline.value.weatherHazardous = itemValue
+      formInline.value.isWeatherHazardous = true
+    }
+
+
+    if(item.item_key==='34'){
+      formInline.value.communication = itemValue
+      formInline.value.isCommunication = true
+    }
+    if(item.item_key==='35'){
+      formInline.value.process = itemValue
+      formInline.value.isProcess = true
+    }
+
+    if(itemValue!=='NULLPTR' && item.item_key==='39'){
+      const {data,data2} = parseItemValue(itemValue);
+      formInline.value.visibility = data
+      formInline.value.visibility2 = data2
+      formInline.value.isVisibility = true
+    }
+
+    if(itemValue!=='NULLPTR' && item.item_key==='40'){
+      const {data,data2} = parseItemValue(itemValue);
+      formInline.value.windVelocity = data
+      formInline.value.windVelocity2 = data2
+      formInline.value.isWindVelocity= true
+
+    }
+
+    if(itemValue!=='NULLPTR' && item.item_key==='41'){
+      const {data,data2} = parseItemValue(itemValue);
+      formInline.value.electricField = data
+      formInline.value.electricField2 = data2
+      formInline.value.isElectricField = true
+    }
+
+    if(itemValue!=='NULLPTR' && item.item_key==='42'){
+      const {data,data2} = parseItemValue(itemValue);
+      formInline.value.temperature = data
+      formInline.value.temperature2 = data2
+      formInline.value.isTemperature = true
+    }
+
+    if(itemValue!=='NULLPTR' && item.item_key==='43'){
+      const {data,data2} = parseItemValue(itemValue);
+      formInline.value.humidity = data
+      formInline.value.humidity2 = data2
+      formInline.value.isHumidity = true
+
+    }
+
+    if(itemValue!=='NULLPTR' && item.item_key==='44'){
+      const {data,data2} = parseItemValue(itemValue);
+      formInline.value.rainfall = data
+      formInline.value.rainfall2 = data2
+      formInline.value.isRainfall = true
+    }
+
+    if(itemValue!=='NULLPTR' && item.item_key==='45'){
+      const {data,data2} = parseItemValue(itemValue);
+      formInline.value.clouds = data
+      formInline.value.clouds2 = data2
+      formInline.value.isClouds = true
+    }
+
+
+  });
+}
+
+const parseItemValue = (itemValue) => {
+  const [alarm, alarmCondition, eliminate, eliminateCondition] = itemValue.split(';');
+  const [relationshipAlarm, timeAlarm] = alarm.split('|');
+  const [relationshipEliminate, timeEliminate] = eliminate.split('|');
+
+  const [conditionAlarm, conditionAlarm2] = alarmCondition.split('#');
+  const [conditionEliminate, conditionEliminate2] = eliminateCondition.split('#');
+
+  const data = `${parseCondition(conditionAlarm)} ${parseCondition(conditionAlarm2)}`;
+  const data2 = `${parseCondition(conditionEliminate)} ${parseCondition(conditionEliminate2)}`;
+
+  return {
+    relationshipAlarm,
+    timeAlarm,
+    relationshipEliminate,
+    timeEliminate,
+    data,
+    data2
+  };
+}
+
+const parseCondition = (condition) => {
+  const [element, operator, value] = condition.split('|');
+  return `${findDataName(element)} ${operatorDataName(operator)} ${value}`;
+};
+
+// 查询所有人工要素字典表
+const elementList =ref<any>([])
+const getAllRgDataList = async () => {
+  const { data } = await getRgDataList();
+  elementList.value = data.list
+  dataProcessing()
+};
+
+const findDataName = (id) => {
+  const item = elementList.value.find(item => item.data_id == parseInt(id));
+  if (item) {
+    return  item.data_name;
+  } else {
+    return ''
+  }
+};
+
+
+const operatorDataName = (id) => {
+  const item = operatorList.find(item => item.value == parseInt(id));
+  if (item) {
+    return  item.label;
+  } else {
+    return ''
+  }
+};
+
+const operatorList= [
+  {
+    value: 0,
+    label: '>',
+  },
+  {
+    value: 1,
+    label: '<',
+  },
+  {
+    value: 3,
+    label: '=',
+  },
+  {
+    value: 4,
+    label: '≠',
+  }
+]
+
 </script>
 
 <style scoped>

+ 5 - 1
src/views/system/disposition/components/distributionAutomatic.vue

@@ -106,9 +106,13 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from "vue";
+import { ref, reactive,onMounted } from "vue";
 import { ColumnProps } from "@/components/ProTable/interface";
 import { ElMessageBox } from 'element-plus'
+onMounted(() => {
+
+});
+
 
 const queryParams = ref({
 });

+ 24 - 11
src/views/system/disposition/index.vue

@@ -1,21 +1,21 @@
 <template>
   <div class="main-box">
     <div class="card table-main">
-      <el-tabs tab-position="left" class="demo-tabs" style="height: 100%">
-        <el-tab-pane label="基本配置">
-          <configuration-basic></configuration-basic>
+      <el-tabs v-model="activeTab" tab-position="left" class="demo-tabs" style="height: 100%"  @tab-click="handleTabClick">
+        <el-tab-pane  label="基本配置" name="basicConfig">
+          <configuration-basic v-model="processData"></configuration-basic>
         </el-tab-pane>
-        <el-tab-pane label="数据自动分发">
+        <el-tab-pane label="数据自动分发" name="distributionAutomatic">
           <distribution-automatic></distribution-automatic>
         </el-tab-pane>
-        <el-tab-pane label="北斗服务配置">
+        <el-tab-pane label="北斗服务配置" name="beidouService">
           <service-beidou></service-beidou>
         </el-tab-pane>
-        <el-tab-pane label="授时服务配置">
-         <configuration-authorization></configuration-authorization>
+        <el-tab-pane label="授时服务配置" name="timingService">
+         <configuration-authorization v-model="processData"></configuration-authorization>
         </el-tab-pane>
-        <el-tab-pane label="全局配置">
-          <configuration-global></configuration-global>
+        <el-tab-pane label="全局配置" name="globalConfig">
+          <configuration-global v-model="processData"></configuration-global>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -28,8 +28,21 @@ import ConfigurationAuthorization from "./components/configurationAuthorization.
 import ServiceBeidou from "./components/serviceBeidou.vue";
 import DistributionAutomatic from "./components/distributionAutomatic.vue";
 import ConfigurationGlobal from "./components/configurationGlobal.vue";
-import { onMounted, reactive, ref } from "vue";
-onMounted(() => {
+import {onMounted,ref} from "vue";
+import {getQueryAllSysItem} from "@/api/modules/allData";
+const processData = ref([]);
+const activeTab = ref('basicConfig')
+const getList= async ()=>{
+  const { data } = await getQueryAllSysItem();
+  processData.value = data.list
+}
+
+const handleTabClick=(tab)=> {
+  console.log(tab)
+}
 
+onMounted(() => {
+  getList()
 });
+
 </script>

+ 2 - 1
src/views/system/menuMange/index.vue

@@ -29,7 +29,8 @@ import ProTable from "@/components/ProTable/index.vue";
 
 const proTable = ref();
 
-const menuData = ref(authMenuList.data);
+// const menuData = ref(authMenuList.data);
+const menuData = ref();
 
 // 表格配置项
 const columns: ColumnProps[] = [

+ 12 - 4
src/views/system/role/index.vue

@@ -17,7 +17,7 @@
         </div>
       </div>
       <!-- 表格主体 -->
-      <el-table stripe ref="tableRef" :border="true" :data="processTableData"  size="small">
+      <el-table stripe ref="tableRef" :border="true" :data="filteredData"  size="small">
         <el-table-column align="left" label="序号" width="80px" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
@@ -104,7 +104,7 @@
 
 <script setup lang="ts" name="useProTable">
 import Pagination from "@/components/ProTable/components/Pagination.vue";
-import { ref, reactive } from "vue";
+import {ref, reactive, computed} from "vue";
 import { ColumnProps } from "@/components/ProTable/interface";
 import { ElMessageBox } from 'element-plus'
 const menuExpand = ref(false)
@@ -201,14 +201,14 @@ const handleCheckedTreeConnect = (value: any, type: string) => {
 const pageable = ref<any>({
   pageNum: 1,
   pageSize: 20,
-  total: 1
+  total: 4
 });
 
 const queryParams = ref({
   name: '',
   pageNum: 1,
   pageSize: 20,
-  total: 2
+  total: 4
 });
 
 // 查询功能
@@ -218,6 +218,7 @@ const handleQuery = () => {
 
 //搜索功能
 const resetQuery = () => {
+  queryParams.value.name = ''
   queryParams.value.pageNum = 1;
 };
 
@@ -239,6 +240,13 @@ const handleCurrentChange = (val: number) => {
   console.log(val);
 };
 
+const filteredData = computed(() => {
+  if (!queryParams.value.name) {
+    return processTableData.value;
+  }
+  return processTableData.value.filter(item => item.a.includes(queryParams.value.name));
+});
+
 const processTableData = ref([
   {
     id: "1",

Різницю між файлами не показано, бо вона завелика
+ 326 - 0
vite.config.ts.timestamp-1730205545594-1f953ca57717e.mjs


Деякі файли не було показано, через те що забагато файлів було змінено