diff --git a/.env.development b/.env.development index 0cb2759..a5c1579 100644 --- a/.env.development +++ b/.env.development @@ -6,8 +6,8 @@ ENV = 'development' # 若依管理系统/开发环境 # VUE_APP_BASE_API = '/dev-api' -VUE_APP_BASE_API = 'http://192.168.0.128:9102/api' -# VUE_APP_BASE_API = 'http://39.101.188.84:9102/api' +# VUE_APP_BASE_API = 'http://192.168.0.128:9102/api' +VUE_APP_BASE_API = 'http://39.101.188.84:9102/api' #是否正式环境 正式true 测试false VUE_APP_ISTEST= false diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index a3858b7..48d609a 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -6,35 +6,36 @@ overflow-y: scroll; padding: 20px 0 45px 0; // 查询重置按钮 - .onSubmit,.reset { + .onSubmit, + .reset { width: 64px; height: 30px; border-radius: 2px; padding: 7px 10px; } .reset { - border: 1px solid #DEE2EE; + border: 1px solid #dee2ee; } .el-form-item__content { // 此处是对输入框进行的样式修改 .el-input__inner { width: 230px; height: 30px; - background: #FFFFFF; + background: #ffffff; border-radius: 5px; opacity: 1; - border: 1px solid #DEE2EE; + border: 1px solid #dee2ee; &::placeholder { font-size: 14px; font-family: Source Han Sans CN; font-weight: 400; line-height: 18px; - color: #A1ABBA; + color: #a1abba; } font-size: 14px; font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-weight: 400; - color: #292F38; + color: #292f38; } } .table-box { @@ -42,25 +43,25 @@ margin-top: 10px; .table-item { .zhipaiColor { - background-color: #FF7F35; + background-color: #ff7f35; } .yizhuofei { - background-color: #7A808A; + background-color: #7a808a; } .shouliColor { - background-color: #1E80EB; + background-color: #1e80eb; } .wancengColor { - background-color: #F76359; + background-color: #f76359; } .tuihuiColor { - background-color: #FF7F35; + background-color: #ff7f35; } .yanqiColor { - background-color: #1E80EB; + background-color: #1e80eb; } .yichuliColor { - background-color: #31D9AE; + background-color: #31d9ae; } .colors { width: 8px; @@ -71,7 +72,7 @@ font-size: 12px; font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-weight: 400; - color: #292F38; + color: #292f38; line-height: 40px; height: 40px; } @@ -88,7 +89,7 @@ } .columnFactor { div { - overflow:hidden; + overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; display: -webkit-box; @@ -121,7 +122,7 @@ .sqbtn1 { background: #ebf5ff; border: 1px solid #a1cbf8; - color: #0E7CF4; + color: #0e7cf4; } .state-sub { display: flex; @@ -140,7 +141,7 @@ .headerText { width: 100%; padding: 10px 0px 8px 20px; - border-bottom: 1px solid #DEE2EE; + border-bottom: 1px solid #dee2ee; font-family: "Source Han Sans CN-Bold"; font-weight: bold; color: #323233; @@ -164,7 +165,7 @@ font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; font-weight: 400; font-size: 14px; - color: #CCCCCC; + color: #cccccc; } &::before { @@ -180,7 +181,7 @@ } .arithmetic-query { padding: 20px; - border-bottom: 1px solid #DEE2EE; + border-bottom: 1px solid #dee2ee; .el-form-item { margin-bottom: 0; margin-right: 60px; @@ -188,7 +189,7 @@ font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; font-weight: 400; font-size: 14px; - color: #3D3D3D; + color: #3d3d3d; } .el-form-item__content { .el-input { @@ -212,23 +213,24 @@ font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; font-weight: 700; font-size: 18px; - color: #3D3D3D; + color: #3d3d3d; } .tabs-header { margin-top: 10px; .tabs-title { width: 100%; - border-bottom: 1px solid #DEE2EE; + border-bottom: 1px solid #dee2ee; display: flex; margin-bottom: 20px; - .await-audit,.already-affirm { + .await-audit, + .already-affirm { cursor: pointer; padding: 8px 30px; - border-top: 1px solid #DEE2EE; - border-right: 1px solid #DEE2EE; + border-top: 1px solid #dee2ee; + border-right: 1px solid #dee2ee; } .await-audit { - border-left: 1px solid #DEE2EE; + border-left: 1px solid #dee2ee; } .active-tab { background-color: #3f3f3f; @@ -241,7 +243,7 @@ .tabs-line { width: 100%; height: 1px; - background: #DEE2EE; + background: #dee2ee; margin: 20px 0; } } @@ -255,21 +257,21 @@ font-family: "Source Han Sans CN-Regular"; margin-bottom: 15px; - &>div:nth-of-type(1) { - color: #8E9298; + & > div:nth-of-type(1) { + color: #8e9298; width: 25%; text-align: right; } - &>div:nth-of-type(2) { - color: #292F38; + & > div:nth-of-type(2) { + color: #292f38; width: 70%; } } .travel { - background: #FFFFFF; + background: #ffffff; .el-dialog__header { - background: #F8F9FA; + background: #f8f9fa; padding: 10px; .dialog-title { display: flex; @@ -283,7 +285,7 @@ font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; font-weight: 500; font-size: 18px; - color: #3D3D3D; + color: #3d3d3d; position: relative; margin-left: 5px; } @@ -294,7 +296,7 @@ height: 16px; left: -5px; top: 5px; - background-color: #2F8AE5; + background-color: #2f8ae5; } i { cursor: pointer; @@ -319,7 +321,7 @@ border-radius: 2px; height: 32px; width: 240px; - border: 1px solid #E5E5E5; + border: 1px solid #e5e5e5; padding: 0 15px; line-height: 32px; } @@ -341,7 +343,7 @@ } .el-button { margin-left: 10px; - background: rgba(47,138,229,0.1); + background: rgba(47, 138, 229, 0.1); border-radius: 2px 2px 2px 2px; padding: 8px 15px; span { @@ -350,7 +352,7 @@ font-family: "AlibabaPuHuiTi"; font-weight: 400; font-size: 14px; - color: #2F8AE5; + color: #2f8ae5; img { width: 14px; height: 14px; @@ -375,17 +377,17 @@ border-radius: 2px; height: 32px; width: 240px; - border: 1px solid #E5E5E5; + border: 1px solid #e5e5e5; padding: 0 15px; line-height: 32px; - white-space: nowrap; /* 不换行 */ - overflow: hidden; /* 隐藏超出范围的文本 */ - text-overflow: ellipsis; /* 省略号 */ + white-space: nowrap; /* 不换行 */ + overflow: hidden; /* 隐藏超出范围的文本 */ + text-overflow: ellipsis; /* 省略号 */ } } .el-button { margin-left: 10px; - background: rgba(47,138,229,0.1); + background: rgba(47, 138, 229, 0.1); border-radius: 2px 2px 2px 2px; padding: 8px 15px; span { @@ -394,7 +396,7 @@ font-family: "AlibabaPuHuiTi"; font-weight: 400; font-size: 14px; - color: #2F8AE5; + color: #2f8ae5; img { width: 14px; height: 14px; @@ -432,9 +434,9 @@ } .work-order-change-value { width: 400px; - white-space: nowrap; /* 不换行 */ - overflow: hidden; /* 隐藏超出范围的文本 */ - text-overflow: ellipsis; /* 省略号 */ + white-space: nowrap; /* 不换行 */ + overflow: hidden; /* 隐藏超出范围的文本 */ + text-overflow: ellipsis; /* 省略号 */ } } .work-order-item { @@ -464,18 +466,18 @@ } .work-order-value-value { width: 240px; - white-space: nowrap; /* 不换行 */ - overflow: hidden; /* 隐藏超出范围的文本 */ - text-overflow: ellipsis; /* 省略号 */ + white-space: nowrap; /* 不换行 */ + overflow: hidden; /* 隐藏超出范围的文本 */ + text-overflow: ellipsis; /* 省略号 */ } .value-value { - flex:1; + flex: 1; width: 100%; } } .el-button { margin-left: 10px; - background: rgba(47,138,229,0.1); + background: rgba(47, 138, 229, 0.1); border-radius: 2px 2px 2px 2px; padding: 8px 15px; span { @@ -484,7 +486,7 @@ font-family: "AlibabaPuHuiTi"; font-weight: 400; font-size: 14px; - color: #2F8AE5; + color: #2f8ae5; img { width: 14px; height: 14px; @@ -506,26 +508,26 @@ .el-table { .anjianmiaoshu { .cell { - display: -webkit-box; /* 必需的,使用弹性盒模型 */ - -webkit-box-orient: vertical; /* 必需的,设置弹性盒方向为垂直 */ - -webkit-line-clamp: 2; /* 显示的行数 */ - overflow: hidden; /* 隐藏超出范围的内容 */ - text-overflow: ellipsis; /* 省略号 */ + display: -webkit-box; /* 必需的,使用弹性盒模型 */ + -webkit-box-orient: vertical; /* 必需的,设置弹性盒方向为垂直 */ + -webkit-line-clamp: 2; /* 显示的行数 */ + overflow: hidden; /* 隐藏超出范围的内容 */ + text-overflow: ellipsis; /* 省略号 */ } } .anjianmiaoshuTwo { - display: -webkit-box; /* 必需的,使用弹性盒模型 */ - width: 20ch; - -webkit-box-orient: vertical; /* 必需的,设置弹性盒方向为垂直 */ - -webkit-line-clamp: 1; /* 显示的行数 */ - overflow: hidden; /* 隐藏超出范围的内容 */ - text-overflow: ellipsis; /* 省略号 */ + display: -webkit-box; /* 必需的,使用弹性盒模型 */ + width: 20ch; + -webkit-box-orient: vertical; /* 必需的,设置弹性盒方向为垂直 */ + -webkit-line-clamp: 1; /* 显示的行数 */ + overflow: hidden; /* 隐藏超出范围的内容 */ + text-overflow: ellipsis; /* 省略号 */ } .sign { - color: #D9001B; + color: #d9001b; } .unmark { - color: #32B16C; + color: #32b16c; } .operation-box { .cell { @@ -600,11 +602,11 @@ border-radius: 10px 10px 0 0; line-height: 40px; padding: 0 20px; - background-color: rgba(47,138,229,0.05); + background-color: rgba(47, 138, 229, 0.05); font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; font-weight: 700; font-size: 16px; - color: #3D3D3D; + color: #3d3d3d; } .warning-list-content { padding: 10px; @@ -620,7 +622,7 @@ } .el-button { border-radius: 0 5px 5px 0; - background-color:#2F8AE5; + background-color: #2f8ae5; color: #fff; } } @@ -634,7 +636,7 @@ .lists { border-radius: 10px; padding: 20px 10px; - background-color: #FAFAFA; + background-color: #fafafa; .hearder { display: flex; .warning-title { @@ -658,33 +660,34 @@ // align-content: space-between; // flex-wrap: wrap; } - // 【群体事件】1【同人同诉】2【紧急事件】3【重点人员】4【一人多诉】5 + // 【频发事件】1【同人同诉】2【紧急事件】3【重点人员】4【一人多诉】5 .qunti { - color: #F43147; - background: rgba(244,49,71,0.1); + color: #f43147; + background: rgba(244, 49, 71, 0.1); } - .tongren{ - color: #2BC4C4; - background: rgba(43,196,196,0.1); + .tongren { + color: #2bc4c4; + background: rgba(43, 196, 196, 0.1); } - .jinji{ - background: rgba(245,154,35,0.1); - color: #F59A23; + .jinji { + background: rgba(245, 154, 35, 0.1); + color: #f59a23; } - .zhongdian{ - background: rgba(162,75,243,0.1); + .zhongdian { + background: rgba(162, 75, 243, 0.1); color: #a24bf3; } - .yiren{ - color: #F954A5; - background: rgba(249,84,165,0.1); + .yiren { + color: #f954a5; + background: rgba(249, 84, 165, 0.1); } } .content { display: flex; flex-direction: column; margin: 10px 0; - .content-top,.content-bottom { + .content-top, + .content-bottom { font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; font-weight: 400; font-size: 12px; @@ -722,7 +725,8 @@ border-radius: 5px; padding: 8px 0; position: relative; - .audit,.info { + .audit, + .info { flex: 1; display: flex; align-items: center; @@ -736,7 +740,7 @@ color: #808080; } .info { - color: #2F8AE5; + color: #2f8ae5; } span { @@ -744,7 +748,7 @@ left: 50%; width: 1px; height: 40%; - background-color: #F2F2F2; + background-color: #f2f2f2; } } } @@ -770,8 +774,8 @@ grid-row-gap: 10px; border-radius: 5px; // border: 1px solid #DEE2EE; - box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1); - background: #FFFFFF; + box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1); + background: #ffffff; z-index: 1000; .warning-events-event { display: flex; @@ -804,4 +808,4 @@ top: 35px; } } -} \ No newline at end of file +} diff --git a/src/router/filterRouter.js b/src/router/filterRouter.js index f7264c3..1dcfd19 100644 --- a/src/router/filterRouter.js +++ b/src/router/filterRouter.js @@ -24,7 +24,7 @@ export function getFilterRouter() { component: () => import("@/views/warningManage/warningAudit/groupEvent"), name: "GroupEvent", - meta: { title: "驾驶舱群体事件", icon: "", affix: true }, + meta: { title: "驾驶舱频发事件", icon: "", affix: true }, }, { path: "/instancyEvent", diff --git a/src/views/components/eventAudit.vue b/src/views/components/eventAudit.vue index 10d4eae..a9e2640 100644 --- a/src/views/components/eventAudit.vue +++ b/src/views/components/eventAudit.vue @@ -1,10 +1,10 @@