diff --git a/.env.development b/.env.development index 8b25e0a..2bc1099 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # 若依管理系统/开发环境 # VUE_APP_BASE_API = '/dev-api' -VUE_APP_BASE_API = 'http://192.168.0.108:9102/api' +VUE_APP_BASE_API = 'http://192.168.0.114:9102/api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/eventPage/index.js b/src/api/eventPage/index.js index 57ecb0e..47a9901 100644 --- a/src/api/eventPage/index.js +++ b/src/api/eventPage/index.js @@ -25,6 +25,14 @@ export function auditList(id,params){ }) } +// 查询工单详情 +export function getMassEvents(id){ + return request({ + url: '/earlyWarningAudit/massEvents/' + id, + method: 'get', + }) +} + // 修改事件标题 export function editTitle(data){ return request({ diff --git a/src/assets/styles/general.scss b/src/assets/styles/general.scss index e42bd17..eebea61 100644 --- a/src/assets/styles/general.scss +++ b/src/assets/styles/general.scss @@ -11,6 +11,14 @@ font-weight: 700; font-size: 18px; color: #3D3D3D; + + .title-span { + margin-left: 20px; + font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; + font-weight: 400; + font-size: 14px; + color: #CCCCCC; + } } .tabs { margin-top: 10px; diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 0d9be0a..5bf6d18 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -159,6 +159,14 @@ position: relative; cursor: pointer; + span { + margin-left: 20px; + font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; + font-weight: 400; + font-size: 14px; + color: #CCCCCC; + } + &::before { content: ""; width: 26px; @@ -170,6 +178,34 @@ } } } + .arithmetic-query { + padding: 20px; + border-bottom: 1px solid #DEE2EE; + .el-form-item { + margin-bottom: 0; + margin-right: 60px; + .el-form-item__label { + font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; + font-weight: 400; + font-size: 14px; + color: #3D3D3D; + } + .el-form-item__content { + .el-input { + .el-input__inner { + border-radius: 2px; + height: 32px; + width: 240px; + } + } + .el-date-editor { + width: 480px; + height: 32px; + border-radius: 2px; + } + } + } + } // 预警审核样式 header { padding: 0 20px; @@ -489,14 +525,27 @@ .operation { display: flex; align-items: center; + .el-radio-group { + label { + &:nth-child(1) { + margin-right: 15px; + } + } + .el-radio__label { + padding-left: 1px; + } + // input[aria-hidden="true"] { + // display: none !important; + // } + } .el-button { padding: 0; } - .tagsImg { - width: 20px; - height: 20px; - margin-right: 10px; - } + // .tagsImg { + // width: 20px; + // height: 20px; + // margin-right: 10px; + // } } } } diff --git a/src/layout/index.vue b/src/layout/index.vue index 555bfaa..9bc04bb 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -1,7 +1,7 @@