From 2b4199d5f10072bfc7c20501de023eb026e8a824 Mon Sep 17 00:00:00 2001 From: xiaohuo <14141624+dsgfhrh@user.noreply.gitee.com> Date: Wed, 24 Sep 2025 21:01:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AD=97=E5=85=B8=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=88=E8=A1=A5=E4=BA=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DictAlarmParamController.java | 2 +- ALOps_sys_fe/alops-ui/package.json | 1 + ALOps_sys_fe/alops-ui/src/api/device/files.js | 6 +- ALOps_sys_fe/alops-ui/src/main.js | 2 + ALOps_sys_fe/alops-ui/src/router/index.js | 1 + .../src/views/QandA/Aiassistant/index.vue | 6 +- ALOps_sys_fe/alops-ui/src/views/index.vue | 437 +++++++++++------- ALOps_sys_fe/alops-ui/src/views/index_v1.vue | 98 ---- 8 files changed, 286 insertions(+), 267 deletions(-) delete mode 100644 ALOps_sys_fe/alops-ui/src/views/index_v1.vue diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java index 57cc7033..0eebd111 100644 --- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java +++ b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java @@ -34,7 +34,7 @@ public class DictAlarmParamController extends BaseController @PreAuthorize("@ss.hasPermi('system:param:byTable')") @GetMapping("/byTable") public AjaxResult getParamsByTableName(@RequestParam String tableName) { - return AjaxResult.success("获取预警参数成功",dictAlarmParamService.getParamsByTableName(tableName)); + return AjaxResult.success("获取预警参数成功",dictAlarmParamService.getParamsByTableName()); } /** * 查询【请填写功能名称】列表 diff --git a/ALOps_sys_fe/alops-ui/package.json b/ALOps_sys_fe/alops-ui/package.json index 7a122d05..77b1102f 100644 --- a/ALOps_sys_fe/alops-ui/package.json +++ b/ALOps_sys_fe/alops-ui/package.json @@ -24,6 +24,7 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { + "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "0.4.0", "axios": "0.28.1", "clipboard": "2.0.8", diff --git a/ALOps_sys_fe/alops-ui/src/api/device/files.js b/ALOps_sys_fe/alops-ui/src/api/device/files.js index 2d1afa91..53fc7e3d 100644 --- a/ALOps_sys_fe/alops-ui/src/api/device/files.js +++ b/ALOps_sys_fe/alops-ui/src/api/device/files.js @@ -1,6 +1,6 @@ import request from '@/utils/request' import { parseStrEmpty } from "@/utils/ruoyi"; -const api = '/equipment/' +const api = '/device/files/' // 查询详细 export function getDict() { @@ -13,8 +13,8 @@ export function getDict() { // 查询列表 export function list(query) { return request({ - url: api + 'queryByVO', - method: 'get', + url: api + 'list', + method: 'post', params: query }) } diff --git a/ALOps_sys_fe/alops-ui/src/main.js b/ALOps_sys_fe/alops-ui/src/main.js index da017509..6d9d91f7 100644 --- a/ALOps_sys_fe/alops-ui/src/main.js +++ b/ALOps_sys_fe/alops-ui/src/main.js @@ -35,6 +35,7 @@ import ImagePreview from "@/components/ImagePreview" import DictTag from '@/components/DictTag' // 字典数据组件 import DictData from '@/components/DictData' +import dataV from '@jiaminghi/data-view' // 全局方法挂载 Vue.prototype.getDicts = getDicts @@ -58,6 +59,7 @@ Vue.component('ImagePreview', ImagePreview) Vue.use(directive) Vue.use(plugins) +Vue.use(dataV) DictData.install() /** diff --git a/ALOps_sys_fe/alops-ui/src/router/index.js b/ALOps_sys_fe/alops-ui/src/router/index.js index 0ffadc7e..02ed4a52 100644 --- a/ALOps_sys_fe/alops-ui/src/router/index.js +++ b/ALOps_sys_fe/alops-ui/src/router/index.js @@ -148,6 +148,7 @@ export const dynamicRoutes = [ } ] }, + { path: '/monitor/job-log', component: Layout, diff --git a/ALOps_sys_fe/alops-ui/src/views/QandA/Aiassistant/index.vue b/ALOps_sys_fe/alops-ui/src/views/QandA/Aiassistant/index.vue index 12316a09..97029c7a 100644 --- a/ALOps_sys_fe/alops-ui/src/views/QandA/Aiassistant/index.vue +++ b/ALOps_sys_fe/alops-ui/src/views/QandA/Aiassistant/index.vue @@ -10,7 +10,7 @@
-
+
@@ -205,7 +205,7 @@ export default { padding: 15px; } .chat-section { - width: 70%; + width: 100%; display: flex; flex-direction: column; } diff --git a/ALOps_sys_fe/alops-ui/src/views/index.vue b/ALOps_sys_fe/alops-ui/src/views/index.vue index 88f6122d..4f703508 100644 --- a/ALOps_sys_fe/alops-ui/src/views/index.vue +++ b/ALOps_sys_fe/alops-ui/src/views/index.vue @@ -1,187 +1,300 @@ - // 初始化设备类型统计图表 - const typeChart = echarts.init(document.getElementById('typeChart')); - typeChart.setOption({ - title: { text: '设备类型统计', subtext: '按设备类型', left: 'center' }, - tooltip: { trigger: 'item' }, - series: [ - { - name: '设备类型', - type: 'pie', - radius: '50%', - data: [ - { value: 44, name: '自主房屋' }, - { value: 33, name: '出租房屋' }, - { value: 11, name: '空置房屋' }, - { value: 11, name: '其他' }, - ], - }, - ], - }); + \ No newline at end of file + diff --git a/ALOps_sys_fe/alops-ui/src/views/index_v1.vue b/ALOps_sys_fe/alops-ui/src/views/index_v1.vue deleted file mode 100644 index d2d2ec63..00000000 --- a/ALOps_sys_fe/alops-ui/src/views/index_v1.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - -