Просмотр исходного кода

refactor(api): 更新字典和设备接口路径及数据结构

zhanghaijun месяцев назад: 11
Родитель
Сommit
824d3abb09
3 измененных файлов с 106 добавлено и 97 удалено
  1. 88 90
      develop/course/json/dict.json
  2. 2 2
      src/api/dict.api.ts
  3. 16 5
      src/views/train/fault/index.vue

+ 88 - 90
develop/course/json/dict.json

@@ -1,96 +1,94 @@
-{
-  "dicts": [
-    {
-      "code": "gender",
-      "name": "性别",
-      "remark": "字典性别",
+[
+  {
+    "code": "gender",
+    "name": "性别",
+    "remark": "字典性别",
+    "sort": 1,
+    "items": [
+      { "value": "1", "label": "男", "remark": "", "sort": 1 },
+      { "value": "2", "label": "女", "remark": "", "sort": 2 }
+    ]
+  },
+  {
+      "code": "course_category",
+      "name": "课程分类",
+      "remark": "字典课程分类",
       "sort": 1,
       "items": [
-        { "value": "1", "label": "男", "remark": "", "sort": 1 },
-        { "value": "2", "label": "女", "remark": "", "sort": 2 }
+        { "value": "1001", "label": "基本操作", "remark": "", "sort": 1 },
+        { "value": "1002", "label": "故障处置", "remark": "", "sort": 2 },
+        { "value": "1003", "label": "非正常处置", "remark": "", "sort": 2 }
       ]
-    },
-    {
-        "code": "course_category",
-        "name": "课程分类",
-        "remark": "字典课程分类",
-        "sort": 1,
-        "items": [
-          { "value": "1001", "label": "基本操作", "remark": "", "sort": 1 },
-          { "value": "1002", "label": "故障处置", "remark": "", "sort": 2 },
-          { "value": "1003", "label": "非正常处置", "remark": "", "sort": 2 }
-        ]
-    },
-    {
-      "code": "course_line",
-      "name": "课程线路",
-      "remark": "字典课程线路",
+  },
+  {
+    "code": "course_line",
+    "name": "课程线路",
+    "remark": "字典课程线路",
+    "sort": 1,
+    "items": [
+      { "value": "1001", "label": "成渝高铁", "remark": "", "sort": 1 },
+      { "value": "1002", "label": "京沪高铁", "remark": "", "sort": 2 },
+      { "value": "1003", "label": "京广高铁", "remark": "", "sort": 3 },
+      { "value": "1004", "label": "京哈高铁", "remark": "", "sort": 4 },
+      { "value": "1005", "label": "沪昆高铁", "remark": "", "sort": 5 },
+      { "value": "1006", "label": "京港高铁", "remark": "", "sort": 6 },
+      { "value": "1007", "label": "呼南高铁", "remark": "", "sort": 7 },
+      { "value": "1008", "label": "京昆高铁", "remark": "", "sort": 8 },
+      { "value": "1009", "label": "包海高铁", "remark": "", "sort": 9 },
+      { "value": "1010", "label": "兰西广高铁", "remark": "", "sort": 10 },
+      { "value": "1011", "label": "广深港高铁", "remark": "", "sort": 11 },
+      { "value": "1012", "label": "贵广高铁", "remark": "", "sort": 12 },
+      { "value": "1013", "label": "南广高铁", "remark": "", "sort": 13 },
+      { "value": "1014", "label": "渝厦高铁", "remark": "", "sort": 14 },  
+      { "value": "1015", "label": "集大原高铁", "remark": "", "sort": 15 }
+    ]
+  },
+  {
+      "code": "course_run_map",
+      "name":"课程运行图",
+      "remark": "字典课程运行图",
       "sort": 1,
       "items": [
-        { "value": "1001", "label": "成渝高铁", "remark": "", "sort": 1 },
-        { "value": "1002", "label": "京沪高铁", "remark": "", "sort": 2 },
-        { "value": "1003", "label": "京广高铁", "remark": "", "sort": 3 },
-        { "value": "1004", "label": "京哈高铁", "remark": "", "sort": 4 },
-        { "value": "1005", "label": "沪昆高铁", "remark": "", "sort": 5 },
-        { "value": "1006", "label": "京港高铁", "remark": "", "sort": 6 },
-        { "value": "1007", "label": "呼南高铁", "remark": "", "sort": 7 },
-        { "value": "1008", "label": "京昆高铁", "remark": "", "sort": 8 },
-        { "value": "1009", "label": "包海高铁", "remark": "", "sort": 9 },
-        { "value": "1010", "label": "兰西广高铁", "remark": "", "sort": 10 },
-        { "value": "1011", "label": "广深港高铁", "remark": "", "sort": 11 },
-        { "value": "1012", "label": "贵广高铁", "remark": "", "sort": 12 },
-        { "value": "1013", "label": "南广高铁", "remark": "", "sort": 13 },
-        { "value": "1014", "label": "渝厦高铁", "remark": "", "sort": 14 },  
-        { "value": "1015", "label": "集大原高铁", "remark": "", "sort": 15 }
+        { "value": "1001", "label": "一号线运行图", "remark": "", "sort": 1 },
+        { "value": "1002", "label": "二号线运行图", "remark": "", "sort": 2 },
+        { "value": "1003", "label": "三号线运行图", "remark": "", "sort": 3 },
+        { "value": "1004", "label": "四号线运行图", "remark": "", "sort": 4 },
+        { "value": "1005", "label": "五号线运行图", "remark": "", "sort": 5 },
+        { "value": "1006", "label": "六号线运行图", "remark": "", "sort": 6 }
       ]
-    },
-    {
-        "code": "course_run_map",
-        "name":"课程运行图",
-        "remark": "字典课程运行图",
-        "sort": 1,
-        "items": [
-          { "value": "1001", "label": "一号线运行图", "remark": "", "sort": 1 },
-          { "value": "1002", "label": "二号线运行图", "remark": "", "sort": 2 },
-          { "value": "1003", "label": "三号线运行图", "remark": "", "sort": 3 },
-          { "value": "1004", "label": "四号线运行图", "remark": "", "sort": 4 },
-          { "value": "1005", "label": "五号线运行图", "remark": "", "sort": 5 },
-          { "value": "1006", "label": "六号线运行图", "remark": "", "sort": 6 }
-        ]
-    },
-    {
-      "code": "station_line",
-      "name": "车站号",
-      "remark": "字典车站号",
-      "sort": 2,
-      "items": [
-        { "value": "1", "label": "车站1", "remark": "", "sort": 1 },
-        { "value": "2", "label": "车站2", "remark": "", "sort": 2 },
-        { "value": "3", "label": "车站3", "remark": "", "sort": 3 }
-      ]
-    },
-    {
-      "code": "device_control_type",
-      "name": "设备控制",
-      "remark": "字典设备控制",
-      "sort": 4,
-      "items": [
-        { "value": "0", "label": "分闸", "remark": "", "sort": 1 },
-        { "value": "1", "label": "合闸", "remark": "", "sort": 2 },
-        { "value": "101", "label": "故障", "remark": "", "sort": 3 }
-      ]
-    },
-    {
-      "code": "param_type",
-      "name": "参数类型",
-      "remark": "参数数据类型字典",
-      "sort": 1,
-      "items": [
-        { "value": "1", "label": "数值", "remark": "数字类型参数", "sort": 1 },
-        { "value": "2", "label": "文本", "remark": "字符串类型参数", "sort": 2 },
-        { "value": "3", "label": "布尔", "remark": "真假值类型参数", "sort": 3 },
-        { "value": "4", "label": "数组", "remark": "数组类型参数", "sort": 4 }
-      ]
-    }
-  ]
-}
+  },
+  {
+    "code": "station_line",
+    "name": "车站号",
+    "remark": "字典车站号",
+    "sort": 2,
+    "items": [
+      { "value": "1", "label": "车站1", "remark": "", "sort": 1 },
+      { "value": "2", "label": "车站2", "remark": "", "sort": 2 },
+      { "value": "3", "label": "车站3", "remark": "", "sort": 3 }
+    ]
+  },
+  {
+    "code": "device_control_type",
+    "name": "设备控制",
+    "remark": "字典设备控制",
+    "sort": 4,
+    "items": [
+      { "value": "0", "label": "分闸", "remark": "", "sort": 1 },
+      { "value": "1", "label": "合闸", "remark": "", "sort": 2 },
+      { "value": "101", "label": "故障", "remark": "", "sort": 3 }
+    ]
+  },
+  {
+    "code": "param_type",
+    "name": "参数类型",
+    "remark": "参数数据类型字典",
+    "sort": 1,
+    "items": [
+      { "value": "1", "label": "数值", "remark": "数字类型参数", "sort": 1 },
+      { "value": "2", "label": "文本", "remark": "字符串类型参数", "sort": 2 },
+      { "value": "3", "label": "布尔", "remark": "真假值类型参数", "sort": 3 },
+      { "value": "4", "label": "数组", "remark": "数组类型参数", "sort": 4 }
+    ]
+  }
+]

+ 2 - 2
src/api/dict.api.ts

@@ -18,9 +18,9 @@ export interface DictList extends Dict {
 /** 字典查询 */
 export class DictService {
   /** 获取所有字典 */
-  static dictList = async () => request.get<DictList[]>('/system/dict/all')
+  static dictList = async () => request.get<DictList[]>('/json/dict')
   // 分页查询
-  static page = (params: any) => request.post('/system/dict/all', params)
+  static page = (params: any) => request.post('/json/dict', params)
   // 详情
   static detail = (dictCode: string) => request.post<Dict>('/system/dict/detail', { dictCode })
   // 添加

+ 16 - 5
src/views/train/fault/index.vue

@@ -21,7 +21,6 @@
   import ArtTable from '@/components/core/tables/art-table/index.vue'
   import request from '@/api'
   defineOptions({ name: 'Device' })
-
   import data from './devices.json'
   import { ColumnOption } from '@/types/component'
 
@@ -55,13 +54,25 @@
     { name: '设备8', type: '类型8', status: '状态8', time: '2023-01-08 00:00:00' }
   ])
 
+  // 拓扑图数据
+  const graphData = ref<{ [k: string]: any }>({})
+  // 左键菜单
+  const leftMenu = ref<unknown[]>([])
+  // 右键菜单
+  const rightMenu = ref<unknown[]>([])
+
   onMounted(() => {
     nextTick(() => {
-      request.get('/course/device/device').then((res) => {
-        console.log(res)
+      request.get<{ [k: string]: any }>('/json/device/device').then(({ data }) => {
+        if (data) {
+          graphData.value = data
+        } else {
+          ElMessage.error('获取拓扑图数据失败,请联系管理员')
+        }
       })
-      request.get('/course/device/menus').then((res) => {
-        console.log('menu:', res)
+      request.get<{ left: unknown[]; right: unknown[] }>('/json/device/menus').then(({ data }) => {
+        leftMenu.value = data?.left || []
+        rightMenu.value = data?.right || []
       })
     })
   })