diff --git a/.env.development b/.env.development index 8253cfb..8e968ab 100644 --- a/.env.development +++ b/.env.development @@ -7,9 +7,9 @@ ENV = 'development' # 开发环境 # VUE_APP_BASE_API = '/dev-api' # 后台 -VUE_APP_BASE_API = 'http://192.168.1.222:8080' +# VUE_APP_BASE_API = 'http://192.168.1.222:8080' # 云端 -# VUE_APP_BASE_API = 'http://106.55.173.225:8090' +VUE_APP_BASE_API = 'http://106.55.173.225:8090' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/alarm/alarmRecord.js b/src/api/alarm/alarmRecord.js index 74e2707..b74f707 100644 --- a/src/api/alarm/alarmRecord.js +++ b/src/api/alarm/alarmRecord.js @@ -15,4 +15,12 @@ export function getAlarmRecord(ardId) { url: "/alarm/ard/" + ardId, method: "get", }); -} \ No newline at end of file +} +// 修改报警记录状态 +export function updateAlarmRecord(data) { + return request({ + url: "/alarm/ard", + method: "put", + data: data, + }); +} diff --git a/src/api/centerairC/sysMonitor.js b/src/api/centerairC/sysMonitor.js index 50806cd..8042a94 100644 --- a/src/api/centerairC/sysMonitor.js +++ b/src/api/centerairC/sysMonitor.js @@ -65,3 +65,19 @@ export function systemMode(query) { params: query, }); } +// 查询主机参数 +export function hostDetailsData(query) { + return request({ + url: "/chillers/list", + method: "get", + params: query, + }); +} +// 主机冷冻冷却进出水温度 +export function hostTemData(data) { + return request({ + url: "/chillers/lineList", + method: "post", + data + }); +} diff --git a/src/assets/icons/svg/arrow.svg b/src/assets/icons/svg/arrow.svg new file mode 100644 index 0000000..e13aa66 --- /dev/null +++ b/src/assets/icons/svg/arrow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/back-icon.png b/src/assets/images/back-icon.png new file mode 100644 index 0000000..fb7ff9b Binary files /dev/null and b/src/assets/images/back-icon.png differ diff --git a/src/assets/images/back.png b/src/assets/images/back.png new file mode 100644 index 0000000..fb7ff9b Binary files /dev/null and b/src/assets/images/back.png differ diff --git a/src/assets/images/bar.png b/src/assets/images/bar.png new file mode 100644 index 0000000..25e6117 Binary files /dev/null and b/src/assets/images/bar.png differ diff --git a/src/assets/images/big.png b/src/assets/images/big.png new file mode 100644 index 0000000..8338984 Binary files /dev/null and b/src/assets/images/big.png differ diff --git a/src/assets/images/cicle1.png b/src/assets/images/cicle1.png new file mode 100644 index 0000000..2c0c2e2 Binary files /dev/null and b/src/assets/images/cicle1.png differ diff --git a/src/assets/images/circle.png b/src/assets/images/circle.png new file mode 100644 index 0000000..6050513 Binary files /dev/null and b/src/assets/images/circle.png differ diff --git a/src/assets/images/detail-line.png b/src/assets/images/detail-line.png new file mode 100644 index 0000000..bc79eff Binary files /dev/null and b/src/assets/images/detail-line.png differ diff --git a/src/assets/images/di.png b/src/assets/images/di.png new file mode 100644 index 0000000..86a05ba Binary files /dev/null and b/src/assets/images/di.png differ diff --git a/src/assets/images/fanBlade.png b/src/assets/images/fanBlade.png new file mode 100644 index 0000000..518fd40 Binary files /dev/null and b/src/assets/images/fanBlade.png differ diff --git a/src/assets/images/host-img3.png b/src/assets/images/host-img3.png new file mode 100644 index 0000000..76784e1 Binary files /dev/null and b/src/assets/images/host-img3.png differ diff --git a/src/assets/images/host-img4.png b/src/assets/images/host-img4.png new file mode 100644 index 0000000..e662140 Binary files /dev/null and b/src/assets/images/host-img4.png differ diff --git a/src/assets/images/menu.png b/src/assets/images/menu.png new file mode 100644 index 0000000..5f4c712 Binary files /dev/null and b/src/assets/images/menu.png differ diff --git a/src/assets/images/title-center.png b/src/assets/images/title-center.png new file mode 100644 index 0000000..b61aaeb Binary files /dev/null and b/src/assets/images/title-center.png differ diff --git a/src/assets/images/title-left.png b/src/assets/images/title-left.png new file mode 100644 index 0000000..0b83182 Binary files /dev/null and b/src/assets/images/title-left.png differ diff --git a/src/assets/images/title-right.png b/src/assets/images/title-right.png new file mode 100644 index 0000000..5f4c712 Binary files /dev/null and b/src/assets/images/title-right.png differ diff --git a/src/assets/images/标题.png b/src/assets/images/标题.png new file mode 100644 index 0000000..b61aaeb Binary files /dev/null and b/src/assets/images/标题.png differ diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 4cf878a..6654420 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -1137,7 +1137,7 @@ display: flex; flex-direction: column; align-items: center; - padding:10px !important; + padding: 10px !important; } /* 修改消息文本颜色 */ @@ -1362,13 +1362,14 @@ border: 1px solid #ff4949; background: #ff4949; } -.el-table__body tr.current-row > td.el-table__cell, .el-table__body tr.selection-row > td.el-table__cell{ +.el-table__body tr.current-row > td.el-table__cell, +.el-table__body tr.selection-row > td.el-table__cell { background-color: rgba(0, 71, 125, 0.4) !important; } -.el-loading-mask{ +.el-loading-mask { min-height: 800px; } -.el-loading-spinner{ +.el-loading-spinner { min-height: 800px; display: flex; top: 0 !important; @@ -1396,10 +1397,17 @@ .popup-result { border: 1px solid #0e5191 !important; } +<<<<<<< HEAD .popup-result table span{ border: 1px solid #0e5191 !important; } .popup-result .title{ +======= +.popup-result table span { + border: 1px solid #0e5191 !important; +} +.popup-result .title { +>>>>>>> dev background: #405e7e !important; } .el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active { @@ -1407,9 +1415,42 @@ border-right-color: transparent; border-left-color: transparent; } +<<<<<<< HEAD .el-tabs--border-card > .el-tabs__header .el-tabs__item{ color: #c3cbd4; } .drawing-item:hover > .el-form-item, .drawing-row-item:hover > .el-form-item { background: #b6b6b6 !important; +======= +.el-tabs--border-card > .el-tabs__header .el-tabs__item { + color: #c3cbd4; +} +.drawing-item:hover > .el-form-item, +.drawing-row-item:hover > .el-form-item { + background: #b6b6b6 !important; +} +.el-cascader__suggestion-list { + color: #a4b2af; +} +.el-cascader__suggestion-item:hover, +.el-cascader__suggestion-item:focus { + background-color: #00b4ff; + color: #ffffff; +} +.el-cascader__search-input { + background: transparent !important; + color: #a4b2af; + margin-left: 10px !important; + min-width: 50px !important; + z-index: 0; +} +.el-input__suffix{ + z-index: 10; +} +.el-cascader__tags { + display: flex; + flex-direction: row; + align-items: center; + flex-wrap: nowrap; +>>>>>>> dev } \ No newline at end of file diff --git a/src/components/Crontab/index.vue b/src/components/Crontab/index.vue index c9345d6..a1c6a0e 100644 --- a/src/components/Crontab/index.vue +++ b/src/components/Crontab/index.vue @@ -104,6 +104,7 @@
+<<<<<<< HEAD
确定取消
+======= +
确定
+
重置
+
取消
+>>>>>>> dev
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 3cc8b02..7ebc310 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -16,6 +16,14 @@
@@ -51,7 +59,8 @@ import TopNav from "@/components/TopNav"; import Hamburger from "@/components/Hamburger"; import Screenfull from "@/components/Screenfull"; import Search from "@/components/HeaderSearch"; - +import { alarmRecordList } from "@/api/alarm/alarmRecord"; +import { getDay } from "@/utils/datetime"; export default { components: { Breadcrumb, @@ -79,6 +88,14 @@ export default { }, }, }, + data() { + return { + isShowWarning: false, + }; + }, + mounted() { + this.getAlarnStatus(); + }, methods: { toggleSideBar() { this.$store.dispatch("app/toggleSideBar"); @@ -96,6 +113,27 @@ export default { }) .catch(() => {}); }, + // 报警列表 + getAlarnStatus() { + let data = { + pageNum: 1, + pageSize: 10, + status: "0", + }; + let timeArr = [getDay(0), getDay(0)]; + alarmRecordList(this.addDateRange(data, timeArr)).then((res) => { + console.log("请求了报警列表·············"); + if (res.code == 200 && res.rows.length > 0) { + this.isShowWarning = true; + } else { + this.isShowWarning = false; + } + }); + }, + goWarning() { + // this.exitFullscreen(); + this.$router.push("/alarm/alarmRecord"); + }, }, }; @@ -126,6 +164,23 @@ export default { background: rgba(0, 0, 0, 0.025); } } + .warning { + width: 30px; + height: 30px; + margin: 0 10px; + z-index: 10; + cursor: pointer; + /* 添加闪烁动画 */ + animation: blink 1s infinite; + } + @keyframes blink { + 100% { + opacity: 1; + } + 50% { + opacity: 0; + } + } .breadcrumb-container { float: left; @@ -206,7 +261,11 @@ export default { .hamburger-container { line-height: 0.46rem !important; } - + .warning { + width: 0.3rem !important; + height: 0.3rem !important; + margin: 0 0.1rem !important; + } .topmenu-container { left: 0.5rem !important; } @@ -225,7 +284,7 @@ export default { margin-top: 0.05rem !important; .user-avatar { - width:0.4rem !important; + width: 0.4rem !important; height: 0.4rem !important; border-radius: 0.1rem !important; } diff --git a/src/router/index.js b/src/router/index.js index 795935a..39af3ca 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -90,7 +90,8 @@ export const constantRoutes = [ }, // 综合大屏 { - path: "/bigScreen", + path: "/Screen", + name:"Screen", hidden: true, component: () => import("@/views/bigScreen/bigScreen"), meta: { title: "大屏总览", icon: "screen" }, diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index b3c216a..882a08b 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -1,9 +1,9 @@ -import auth from '@/plugins/auth' -import router, { constantRoutes, dynamicRoutes } from '@/router' -import { getRouters } from '@/api/menu' -import Layout from '@/layout/index' -import ParentView from '@/components/ParentView' -import InnerLink from '@/layout/components/InnerLink' +import auth from "@/plugins/auth"; +import router, { constantRoutes, dynamicRoutes } from "@/router"; +import { getRouters } from "@/api/menu"; +import Layout from "@/layout/index"; +import ParentView from "@/components/ParentView"; +import InnerLink from "@/layout/components/InnerLink"; const permission = { state: { @@ -11,127 +11,216 @@ const permission = { addRoutes: [], defaultRoutes: [], topbarRouters: [], - sidebarRouters: [] + sidebarRouters: [], }, mutations: { SET_ROUTES: (state, routes) => { - state.addRoutes = routes - state.routes = constantRoutes.concat(routes) + state.addRoutes = routes; + state.routes = constantRoutes.concat(routes); }, SET_DEFAULT_ROUTES: (state, routes) => { - state.defaultRoutes = constantRoutes.concat(routes) + state.defaultRoutes = constantRoutes.concat(routes); }, SET_TOPBAR_ROUTES: (state, routes) => { - state.topbarRouters = routes + state.topbarRouters = routes; }, SET_SIDEBAR_ROUTERS: (state, routes) => { - state.sidebarRouters = routes + state.sidebarRouters = routes; }, }, actions: { // 生成路由 GenerateRoutes({ commit }) { - return new Promise(resolve => { + return new Promise((resolve) => { // 向后端请求路由数据 - getRouters().then(res => { - const sdata = JSON.parse(JSON.stringify(res.data)) - const rdata = JSON.parse(JSON.stringify(res.data)) - const sidebarRoutes = filterAsyncRouter(sdata) - const rewriteRoutes = filterAsyncRouter(rdata, false, true) + getRouters().then((res) => { + const sdata = JSON.parse(JSON.stringify(res.data)); + const rdata = JSON.parse(JSON.stringify(res.data)); + const sidebarRoutes = filterAsyncRouter(sdata); + const rewriteRoutes = filterAsyncRouter(rdata, false, true); const asyncRoutes = filterDynamicRoutes(dynamicRoutes); - rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) + rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true }); + // 如果动态的路由有中央空调-系统监控-系统监测页面，那就添加一个hidden为true非Layout的大屏页面 + const result = checkRouteArray( + sidebarRoutes, + "centerairC", + "monitorControl", + "sysMonitor" + ); router.addRoutes(asyncRoutes); - commit('SET_ROUTES', rewriteRoutes) - commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes)) - commit('SET_DEFAULT_ROUTES', sidebarRoutes) - commit('SET_TOPBAR_ROUTES', sidebarRoutes) - resolve(rewriteRoutes) - }) - }) + if (result) { + // console.log( + // "满足条件,添加中央空调-系统监控-系统监测相关的大屏页面路由" + // ); + // 定义要添加的多个路由对象数组 + const additionalRoutes = [ + { + path: "/monitorCenter", + name: "monitorCenter", + hidden: true, + component: () => + import("@/views/centerairC/sysMonitor/monitorCenter"), + meta: { title: "系统监测", icon: "screen" }, + }, + { + path: "/hostDetails", + name: "hostDetails", + hidden: true, + component: () => + import("@/views/centerairC/sysMonitor/hostDetails"), + meta: { title: "主机性能", icon: "new2" }, + }, + { + path: "/performance", + name: "performance", + hidden: true, + component: () => + import("@/views/centerairC/sysMonitor/performance"), + meta: { title: "冷机性能性能", icon: "new2" }, + }, + // 可以继续添加更多路由对象 + ]; + // 循环添加额外的路由对象到各路由数组 + additionalRoutes.forEach((route) => { + sidebarRoutes.push(route); + rewriteRoutes.push(route); + asyncRoutes.push(route); + }); + } else { + // console.log("不满足条件"); + } + + commit("SET_ROUTES", rewriteRoutes); + commit("SET_SIDEBAR_ROUTERS", constantRoutes.concat(sidebarRoutes)); + commit("SET_DEFAULT_ROUTES", sidebarRoutes); + commit("SET_TOPBAR_ROUTES", sidebarRoutes); + console.log("返回的动态路由", sidebarRoutes); + console.log("静态的动态路由", constantRoutes); + resolve(rewriteRoutes); + }); + }); + }, + }, +}; +//判断是否返回特定的菜单，再添加大屏路由的动态菜单 +function checkRouteArray(routes, ...paths) { + // 检查传入路径参数的数量，用于确定要检查的层级 + const level = paths.length; + function checkLevel(route, currentLevel) { + // 如果当前层级的路径参数存在且当前路由的 path 包含该路径 + if ( + paths[currentLevel] && + route.path && + route.path.includes(paths[currentLevel]) + ) { + // 如果已经到达指定的最后一层级，返回 true + if (currentLevel === level - 1) { + return true; + } + // 如果还有下一层级且当前路由有 children 属性 + if (route.children) { + for (let i = 0; i < route.children.length; i++) { + const childRoute = route.children[i]; + // 递归检查下一层级 + if (checkLevel(childRoute, currentLevel + 1)) { + return true; + } + } + } } + return false; } + + // 遍历路由数组，对每个一级路由调用 checkLevel 函数开始检查 + for (let i = 0; i < routes.length; i++) { + const route = routes[i]; + if (checkLevel(route, 0)) { + return true; + } + } + return false; } // 遍历后台传来的路由字符串，转换为组件对象 function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { - return asyncRouterMap.filter(route => { + return asyncRouterMap.filter((route) => { if (type && route.children) { - route.children = filterChildren(route.children) + route.children = filterChildren(route.children); } if (route.component) { // Layout ParentView 组件特殊处理 - if (route.component === 'Layout') { - route.component = Layout - } else if (route.component === 'ParentView') { - route.component = ParentView - } else if (route.component === 'InnerLink') { - route.component = InnerLink + if (route.component === "Layout") { + route.component = Layout; + } else if (route.component === "ParentView") { + route.component = ParentView; + } else if (route.component === "InnerLink") { + route.component = InnerLink; } else { - route.component = loadView(route.component) + route.component = loadView(route.component); } } if (route.children != null && route.children && route.children.length) { - route.children = filterAsyncRouter(route.children, route, type) + route.children = filterAsyncRouter(route.children, route, type); } else { - delete route['children'] - delete route['redirect'] + delete route["children"]; + delete route["redirect"]; } - return true - }) + return true; + }); } function filterChildren(childrenMap, lastRouter = false) { - var children = [] + var children = []; childrenMap.forEach((el, index) => { if (el.children && el.children.length) { - if (el.component === 'ParentView' && !lastRouter) { - el.children.forEach(c => { - c.path = el.path + '/' + c.path + if (el.component === "ParentView" && !lastRouter) { + el.children.forEach((c) => { + c.path = el.path + "/" + c.path; if (c.children && c.children.length) { - children = children.concat(filterChildren(c.children, c)) - return + children = children.concat(filterChildren(c.children, c)); + return; } - children.push(c) - }) - return + children.push(c); + }); + return; } } if (lastRouter) { - el.path = lastRouter.path + '/' + el.path + el.path = lastRouter.path + "/" + el.path; if (el.children && el.children.length) { - children = children.concat(filterChildren(el.children, el)) - return + children = children.concat(filterChildren(el.children, el)); + return; } } - children = children.concat(el) - }) - return children + children = children.concat(el); + }); + return children; } // 动态路由遍历，验证是否具备权限 export function filterDynamicRoutes(routes) { - const res = [] - routes.forEach(route => { + const res = []; + routes.forEach((route) => { if (route.permissions) { if (auth.hasPermiOr(route.permissions)) { - res.push(route) + res.push(route); } } else if (route.roles) { if (auth.hasRoleOr(route.roles)) { - res.push(route) + res.push(route); } } - }) - return res + }); + return res; } export const loadView = (view) => { - if (process.env.NODE_ENV === 'development') { - return (resolve) => require([`@/views/${view}`], resolve) + if (process.env.NODE_ENV === "development") { + return (resolve) => require([`@/views/${view}`], resolve); } else { // 使用 import 实现生产环境的路由懒加载 - return () => import(`@/views/${view}`) + return () => import(`@/views/${view}`); } -} +}; -export default permission +export default permission; diff --git a/src/views/alarm/alarmCode/index.vue b/src/views/alarm/alarmCode/index.vue index e85d995..3ee0494 100644 --- a/src/views/alarm/alarmCode/index.vue +++ b/src/views/alarm/alarmCode/index.vue @@ -83,7 +83,7 @@ -
+
-
+
-
+
- + 修改 删除 diff --git a/src/views/alarm/alarmRecord/index.vue b/src/views/alarm/alarmRecord/index.vue index 5846c27..8a2dbe2 100644 --- a/src/views/alarm/alarmRecord/index.vue +++ b/src/views/alarm/alarmRecord/index.vue @@ -67,6 +67,30 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + + +
重置
-
+
@@ -125,16 +149,25 @@ - + + + + + + 处理 + 详情 @@ -226,19 +267,19 @@ - + - + - + @@ -251,13 +292,18 @@ + diff --git a/src/views/alarm/alarmRule/index.vue b/src/views/alarm/alarmRule/index.vue index 2db5229..e8cc8b2 100644 --- a/src/views/alarm/alarmRule/index.vue +++ b/src/views/alarm/alarmRule/index.vue @@ -75,7 +75,7 @@ -
+
-
+
-
+
- + 修改 删除 @@ -669,6 +669,8 @@ export default { // 请求采集位点 this.getCpmIdList(this.form.ledgerId); } + //清除采集位点 + this.form.cpmId = "" }, //采集参数列表 getCpmIdList(id) { diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue index 3862860..d8860a2 100644 --- a/src/views/bigScreen/index.vue +++ b/src/views/bigScreen/index.vue @@ -11,7 +11,7 @@ export default { toPage() { console.log("需要跳转的") // 跳转到高校导航大屏展示 - this.$router.push("/bigScreen") + this.$router.push("/Screen") }, }, }; diff --git a/src/views/centerairC/sysMonitor/components/hostChart.vue b/src/views/centerairC/sysMonitor/components/hostChart.vue new file mode 100644 index 0000000..52294c2 --- /dev/null +++ b/src/views/centerairC/sysMonitor/components/hostChart.vue @@ -0,0 +1,415 @@ + + + + + diff --git a/src/views/centerairC/sysMonitor/lineChildren.vue b/src/views/centerairC/sysMonitor/components/lineChildren.vue similarity index 100% rename from src/views/centerairC/sysMonitor/lineChildren.vue rename to src/views/centerairC/sysMonitor/components/lineChildren.vue diff --git a/src/views/centerairC/sysMonitor/components/lineSquare.vue b/src/views/centerairC/sysMonitor/components/lineSquare.vue new file mode 100644 index 0000000..f960fa1 --- /dev/null +++ b/src/views/centerairC/sysMonitor/components/lineSquare.vue @@ -0,0 +1,67 @@ + + + + + \ No newline at end of file diff --git a/src/views/centerairC/sysMonitor/components/loadData.vue b/src/views/centerairC/sysMonitor/components/loadData.vue new file mode 100644 index 0000000..dc031d7 --- /dev/null +++ b/src/views/centerairC/sysMonitor/components/loadData.vue @@ -0,0 +1,452 @@ + + + + + diff --git a/src/views/centerairC/sysMonitor/components/performanceChart.vue b/src/views/centerairC/sysMonitor/components/performanceChart.vue new file mode 100644 index 0000000..7aa38da --- /dev/null +++ b/src/views/centerairC/sysMonitor/components/performanceChart.vue @@ -0,0 +1,416 @@ + + + + + + \ No newline at end of file diff --git a/src/views/centerairC/sysMonitor/components/titleImg.vue b/src/views/centerairC/sysMonitor/components/titleImg.vue new file mode 100644 index 0000000..352709f --- /dev/null +++ b/src/views/centerairC/sysMonitor/components/titleImg.vue @@ -0,0 +1,15 @@ + + diff --git a/src/views/centerairC/sysMonitor/hostDetails.vue b/src/views/centerairC/sysMonitor/hostDetails.vue new file mode 100644 index 0000000..eb79da9 --- /dev/null +++ b/src/views/centerairC/sysMonitor/hostDetails.vue @@ -0,0 +1,1041 @@ + + + + + diff --git a/src/views/centerairC/sysMonitor/index.vue b/src/views/centerairC/sysMonitor/index.vue index c14322f..2cc9476 100644 --- a/src/views/centerairC/sysMonitor/index.vue +++ b/src/views/centerairC/sysMonitor/index.vue @@ -1,4 +1,5 @@ +<<<<<<< HEAD +======= + +>>>>>>> dev diff --git a/src/views/centerairC/sysMonitor/monitorCenter.vue b/src/views/centerairC/sysMonitor/monitorCenter.vue new file mode 100644 index 0000000..76ac4ed --- /dev/null +++ b/src/views/centerairC/sysMonitor/monitorCenter.vue @@ -0,0 +1,2658 @@ + + + + + + diff --git a/src/views/centerairC/sysMonitor/performance.vue b/src/views/centerairC/sysMonitor/performance.vue new file mode 100644 index 0000000..aa3f206 --- /dev/null +++ b/src/views/centerairC/sysMonitor/performance.vue @@ -0,0 +1,881 @@ + + + + + diff --git a/src/views/device/comm/index.vue b/src/views/device/comm/index.vue index 08ea041..2a9a9a1 100644 --- a/src/views/device/comm/index.vue +++ b/src/views/device/comm/index.vue @@ -47,7 +47,7 @@ -
+
-
+
-
+
- + 修改 删除 diff --git a/src/views/device/gateway/index.vue b/src/views/device/gateway/index.vue index d9320e8..f6560c5 100644 --- a/src/views/device/gateway/index.vue +++ b/src/views/device/gateway/index.vue @@ -55,7 +55,7 @@ -
+
-
+
-
+
- + 修改 删除 diff --git a/src/views/device/gather/index.vue b/src/views/device/gather/index.vue index 3150204..187ffdf 100644 --- a/src/views/device/gather/index.vue +++ b/src/views/device/gather/index.vue @@ -92,7 +92,7 @@ -
+
-
+
-
+
- + 修改 删除 diff --git a/src/views/device/ledger/index.vue b/src/views/device/ledger/index.vue index 1fae964..0fa78b5 100644 --- a/src/views/device/ledger/index.vue +++ b/src/views/device/ledger/index.vue @@ -77,7 +77,7 @@ -
+
-
+
-
+
- + 修改 删除 diff --git a/src/views/device/maintenance/index.vue b/src/views/device/maintenance/index.vue index b447afd..d522de3 100644 --- a/src/views/device/maintenance/index.vue +++ b/src/views/device/maintenance/index.vue @@ -153,7 +153,7 @@ -
+
-
+
-
+
- + 修改 删除 diff --git a/src/views/device/qrCode/index.vue b/src/views/device/qrCode/index.vue index a8e5b10..a57937e 100644 --- a/src/views/device/qrCode/index.vue +++ b/src/views/device/qrCode/index.vue @@ -47,7 +47,7 @@ -
+
-
+
-
+
- + 修改 删除 diff --git a/src/views/device/spare/index.vue b/src/views/device/spare/index.vue index 9ad8818..69db42c 100644 --- a/src/views/device/spare/index.vue +++ b/src/views/device/spare/index.vue @@ -63,7 +63,7 @@ -
+
-
+
-
+
- + 修改 删除 diff --git a/src/views/device/spareInOut/index.vue b/src/views/device/spareInOut/index.vue index 4b5c513..e8e9c0a 100644 --- a/src/views/device/spareInOut/index.vue +++ b/src/views/device/spareInOut/index.vue @@ -77,7 +77,7 @@ -
+
-
+
- + >>>>>> dev v-model="form.cronExpression" placeholder="请输入cron执行表达式" > @@ -428,7 +432,7 @@ import Crontab from "@/components/Crontab"; export default { components: { Crontab }, - name: "Job", + // name: "Job", dicts: ["sys_job_group", "sys_job_status"], data() { return { diff --git a/src/views/region/index.vue b/src/views/region/index.vue index b327fc1..df49d6f 100644 --- a/src/views/region/index.vue +++ b/src/views/region/index.vue @@ -178,7 +178,6 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:post:edit']" >修改 删除 diff --git a/src/views/temSys/temHistory/index.vue b/src/views/temSys/temHistory/index.vue index 0034f93..557fc7d 100644 --- a/src/views/temSys/temHistory/index.vue +++ b/src/views/temSys/temHistory/index.vue @@ -18,6 +18,7 @@ clearable v-model="selectedValue" @change="handleCascaderChange" + filterable > @@ -251,7 +252,7 @@ export default { + diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue index e48f724..daa51c6 100644 --- a/src/views/tool/build/index.vue +++ b/src/views/tool/build/index.vue @@ -599,7 +599,11 @@ $lighterBlue: #409eff; height: calc(100vh - 42px); overflow: hidden; border-left: 1px solid #0e5191; +<<<<<<< HEAD border-left: 1px solid #0e5191; +======= + border-right: 1px solid #0e5191 ; +>>>>>>> dev box-sizing: border-box; } .center-board { @@ -623,8 +627,13 @@ $lighterBlue: #409eff; height: 42px; text-align: right; padding: 0 15px; +<<<<<<< HEAD box-sizing: border-box; border: 1px solid #0e5191; +======= + box-sizing: border-box;; + border: 1px solid #0e5191 ; +>>>>>>> dev border-top: none; border-left: none; .delete-btn {