diff --git a/.env.shibei_production b/.env.shibei_production new file mode 100644 index 00000000..b227d2fa --- /dev/null +++ b/.env.shibei_production @@ -0,0 +1,4 @@ +NODE_ENV=production +VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api +VUE_APP_NODE_ENV=shibei_prod +VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/package.json b/package.json index 699ce11d..360bbcb1 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "build:sit": "vue-cli-service build --mode production.sit", "build:uat": "vue-cli-service build --mode production.uat", "build:prod": "vue-cli-service build --mode production", + "build:shibei_prod": "vue-cli-service build --mode shibei_production", "lint": "vue-cli-service lint", "et": "node_modules/.bin/et", "et:init": "node_modules/.bin/et -i", diff --git a/public/index.html b/public/index.html index 1fcf3218..7761c737 100644 --- a/public/index.html +++ b/public/index.html @@ -14,7 +14,7 @@ window.SITE_CONFIG = {} window.SITE_CONFIG['version'] = 'v2.0.0' window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>' - window.SITE_CONFIG['apiURL'] = '' // api请求地址 + window.SITE_CONFIG['apiURL'] = '<%= process.env.VUE_APP_API_SERVER %>' // api请求地址 window.SITE_CONFIG['storeState'] = {} // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态） window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象 @@ -36,7 +36,7 @@ - <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %> + + <!– 集成测试环境 dev –> <% if (process.env.VUE_APP_NODE_ENV==='prod:sit' ) { %> <% } %> - + <!– 验收测试环境 aliyun –> <% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %> <% } %> - + <!– 生产环境 –> <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> - <% } %> + <% } %>--> + + diff --git a/src/App.vue b/src/App.vue index dbd953b1..d1217999 100644 --- a/src/App.vue +++ b/src/App.vue @@ -106,6 +106,8 @@ export default { diff --git a/src/assets/img/modules/visual/popup.png b/src/assets/img/modules/visual/popup.png new file mode 100644 index 00000000..a529d926 Binary files /dev/null and b/src/assets/img/modules/visual/popup.png differ diff --git a/src/assets/scss/aui.scss b/src/assets/scss/aui.scss index 4b9f8d23..1cb1c14b 100644 --- a/src/assets/scss/aui.scss +++ b/src/assets/scss/aui.scss @@ -1,11 +1,11 @@ // 变量 -@import "~@/element-ui/theme-variables.scss"; -@import "./variables.scss"; +@import '~@/element-ui/theme-variables.scss'; +@import './variables.scss'; // 公共 -@import "./normalize.scss"; -@import "./common.scss"; +@import './normalize.scss'; +@import './common.scss'; // 页面 -@import "./pages/login.scss"; -@import "./pages/404.scss"; +@import './pages/login.scss'; +@import './pages/404.scss'; // 模块 -@import "./modules/home.scss"; +@import './modules/home.scss'; diff --git a/src/assets/scss/buttonstyle copy.scss b/src/assets/scss/buttonstyle copy.scss new file mode 100644 index 00000000..d10764f3 --- /dev/null +++ b/src/assets/scss/buttonstyle copy.scss @@ -0,0 +1,67 @@ +//新增 +.el-button--add { + color: #fff; + background-color: #22c1c3; + border-color: #22c1c3; +} +.el-button--add:hover { + color: #fff; + background-color: #05b1b4; + border-color: #05b1b4; +} +.el-button--add:focus { + color: #fff; + background-color: #22c1c3; + border-color: #22c1c3; +} + +//删除、导入 +.el-button--delete { + color: #fff; + background-color: #fe6252; + border-color: #fe6252; +} +.el-button--delete:hover { + color: #fff; + background-color: #fe6252; + border-color: #fe6252; +} +.el-button--delete:focus { + color: #fff; + background-color: #fe6252; + border-color: #fe6252; +} + +//重置、导出 +.el-button--reset { + color: #fff; + background-color: #feb349; + border-color: #feb349; +} +.el-button--reset:hover { + color: #fff; + background-color: #feb349; + border-color: #feb349; +} +.el-button--reset:focus { + color: #fff; + background-color: #feb349; + border-color: #feb349; +} + +//查询、确定 +.el-button--search:hover { + color: #fff; + background-color: #3e8ef7; + border-color: #3e8ef7; +} +.el-button--search:focus { + color: #fff; + background-color: #3e8ef7; + border-color: #3e8ef7; +} +.el-button--search { + color: #fff; + background-color: #3e8ef7; + border-color: #3e8ef7; +} diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss index 1665c1b3..a5f6b533 100644 --- a/src/assets/scss/buttonstyle.scss +++ b/src/assets/scss/buttonstyle.scss @@ -1,61 +1,103 @@ -.el-button--green { - color: #fff; - background-color: #22c1c3; - border-color: #22c1c3; +//查询、确定 +.diy-button--search { + color: #fff !important; + background-color: #3e8ef7 !important; + border-color: #3e8ef7 !important; } -.el-button--green:hover { - color: #fff; - background-color: #05b1b4; - border-color: #05b1b4; +.diy-button--search:hover { + color: #fff !important; + background-color: #3e8ef7 !important; + border-color: #3e8ef7 !important; } -.el-button--green:focus { - color: #fff; - background-color: #22c1c3; - border-color: #22c1c3; +.diy-button--search:focus { + color: #fff !important; + background-color: #3e8ef7 !important; + border-color: #3e8ef7 !important; } -.el-button--yellow:hover { - color: #fff; - background-color: #fa9200; - border-color: #fa9200; -} -.el-button--yellow:focus { - color: #fff; - background-color: #feb349; - border-color: #feb349; -} -.el-button--yellow { - color: #fff; - background-color: #feb349; - border-color: #feb349; -} -.el-button--blue:focus { - color: #fff; - background-color: #2195fe; - border-color: #2195fe; -} -.el-button--blue:hover { - color: #fff; - background-color: #0083fd; - border-color: #0083fd; -} -.el-button--blue { - color: #fff; - background-color: #2195fe; - border-color: #2195fe; -} -.el-button--red:focus { - color: #fff; - background-color: #fe6252; - border-color: #fe6252; -} -.el-button--red:hover { - color: #fff; - background-color: #fd341e; - border-color: #fd341e; -} -.el-button--red { - color: #fff; - background-color: #fe6252; - border-color: #fe6252; +//重置、导出 +.diy-button--reset { + color: #fff !important; + background-color: #feb349 !important; + border-color: #feb349 !important; +} +.diy-button--reset:hover { + color: #fff !important; + background-color: #feb349 !important; + border-color: #feb349 !important; +} +.diy-button--reset:focus { + color: #fff !important; + background-color: #feb349 !important; + border-color: #feb349 !important; +} + +//新增 +.diy-button--add { + color: #fff !important; + background-color: #22c1c3 !important; + border-color: #22c1c3 !important; +} +.diy-button--add:hover { + color: #fff !important; + background-color: #22c1c3 !important; + border-color: #22c1c3 !important; +} +.diy-button--add:focus { + color: #fff !important; + background-color: #22c1c3 !important; + border-color: #22c1c3 !important; +} + +//删除、导入 +.diy-button--delete { + color: #fff !important; + background-color: #fe6252 !important; + border-color: #fe6252 !important; +} +.diy-button--delete:hover { + color: #fff !important; + background-color: #fe6252 !important; + border-color: #fe6252 !important; +} +.diy-button--delete:focus { + color: #fff !important; + background-color: #fe6252 !important; + border-color: #fe6252 !important; +} +//下载模板 +.diy-button--export { + color: #fff !important; + background-color: #3e8ef7 !important; + border-color: #3e8ef7 !important; +} +.diy-button--export:hover { + color: #fff !important; + background-color: #3e8ef7 !important; + border-color: #3e8ef7 !important; +} +.diy-button--export:focus { + color: #fff !important; + background-color: #3e8ef7 !important; + border-color: #3e8ef7 !important; +} + +//table按钮样式 + +//查看 +.div-table-button--detail { + color: #3E8EF7 !important; + text-decoration: underline !important; +} + +//修改 +.div-table-button--edit { + color: #00a7a9 !important; + text-decoration: underline !important; +} + +//删除 +.div-table-button--delete { + color: #d51010 !important; + text-decoration: underline !important; } diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss index 7b4cb925..370c50fe 100644 --- a/src/assets/scss/modules/search.scss +++ b/src/assets/scss/modules/search.scss @@ -199,13 +199,48 @@ background-color: #fff; border-radius: 10px; padding: 30px 40px; - - .headline { + .header { + display: flex; + justify-content: space-between; + align-items: center; margin-bottom: 20px; - font-size: 24px; - font-family: PingFang SC; - font-weight: bold; - color: #333333; + + .headline { + font-size: 24px; + font-family: PingFang SC; + font-weight: bold; + color: #333333; + } + .notice { + width: 85%; + line-height: 24px; + display: flex; + justify-content: space-between; + align-items: center; + + .notice-btn { + width: 50px; + background-color: #3e8ef7; + color: #fff; + text-align: center; + border-radius: 4px; + cursor: pointer; + } + .notice-list { + // @include toe; + width: 92%; + // height: 24px; + // overflow: hidden; + a { + margin-right: 20px; + cursor: pointer; + color: #999; + &:hover { + color: #3e8ef7; + } + } + } + } } .cnt { @@ -219,3 +254,18 @@ } } } + +.m-crumbs { + padding: 10px 30px 0; + font-size: 16px; + a { + color: #666; + &:hover { + color: #094bea; + } + cursor: pointer; + } + span { + color: #094bea; + } +} diff --git a/src/assets/scss/modules/visual/basicInfoMain copy.scss b/src/assets/scss/modules/visual/basicInfoMain copy.scss new file mode 100644 index 00000000..938856f4 --- /dev/null +++ b/src/assets/scss/modules/visual/basicInfoMain copy.scss @@ -0,0 +1,499 @@ +.div_top { + margin-left: 10px; + height: 35px; + .router_line { + width: 212px; + height: 1px; + border: 1px solid #ffffff; + opacity: 0.09; + /* opacity: 0.09; */ + } + .div_router { + margin-top: 5px; + font-size: 16px; + + .router_parents { + color: #a0c3d9; + + .arrow { + padding: 0 5px; + } + } + .router_parents:hover { + cursor: pointer; + } + + .router_child { + color: #ffffff; + } + } +} + +.div_content { + display: flex; + + .div_map { + box-sizing: border-box; + width: 100%; + // padding: 10px 5px 13px; + // margin-top: 8px; + height: calc(88vh - 15px); + color: #fff; + // background: url('../../../img/modules/visual/warning-box.png') no-repeat + // center; + // background-size: 100% 100%; + } + + .div_data { + flex: 0 0 562px; + margin-left: 12px; + + .div_search { + width: 100%; + height: 56px; + text-align: center; + background-color: #011168; + border-radius: 4px 0 0 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + opacity: 0.7; + display: flex; + justify-content: space-between; + .div_search_left { + display: flex; + justify-content: flex-start; + .icon { + display: flex; + align-items: center; + margin-left: 29px; + + > img { + width: 24px; + height: 24px; + } + } + + > span { + line-height: 56px; + margin-left: 10px; + } + } + + .btn { + text-align: center; + flex: 0 0 113px; + height: 56px; + background: linear-gradient(90deg, #1a5afd, #26c4ff); + font-size: 20px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 56px; + border-radius: 0 4px 4px 0; + } + } + + .div_search:hover { + cursor: pointer; + } + + .div_info { + box-sizing: border-box; + width: 100%; + margin-top: 21px; + height: calc(88vh - 87px); + color: #fff; + background: url('../../../img/modules/visual/warning-box.png') no-repeat + center; + background-size: 100% 100%; + // padding: 45px 21px 35px 24px; + + .info_loading { + margin-top: 50px; + } + .info_tip { + padding: 31px 0 0 19px; + display: flex; + > img { + height: 34px; + width: 46px; + } + + .tip_title { + line-height: 34px; + margin-left: 7px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + } + } + + .info_list { + margin-top: 9px; + + .item { + .item_line { + margin-top: 13px; + margin-left: 24px; + width: 517px; + height: 0px; + border: 1px dotted #1797ff31; + border-width: 0.5px; + } + .last_line { + border: 1px dotted #1797ff00; + } + .list_item { + display: flex; + padding: 18px 59px 0; + justify-content: space-between; + + .list_item_col { + flex: 0 0 240px; + display: flex; + + > img { + height: 76px; + width: 76px; + } + + .item_content { + margin-left: 10px; + height: 76px; + display: flex; + flex-direction: column; + justify-content: center; + + .item_label { + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + } + .item_count { + margin-top: 10px; + font-size: 28px; + font-family: PingFang SC; + font-weight: bold; + color: #00fffc; + } + } + } + } + + ::v-deep .el-popper { + padding: 0px; + } + // + } + } + } + + .div_info { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } + } +} + +.div_community_info { + box-sizing: border-box; + flex: 0 0 calc(100vw - 620px); + // width: calc(100vw - 560px); + + height: calc(88vh - 10px); + color: #fff; + background: url('../../../img/modules/visual/warning-box.png') no-repeat + center; + background-size: 100% 100%; + + .div_select { + margin-top: 28px; + margin-left: 24px; + display: flex; + .customer_select { + display: flex; + justify-content: flex-start; + + > span { + width: auto; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + line-height: 34px; + } + } + > img { + height: 34px; + width: 46px; + } + + .tip_title { + line-height: 34px; + margin-left: 12px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + } + } + + .div_room_bar { + box-sizing: border-box; + + margin-top: 9px; + height: calc(88vh - 120px); + } + + .div_room { + // height: calc(88vh - 40px); + // margin-top: 9px; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + margin: 0 21px 0 21px; + + .item:hover { + cursor: pointer; + } + .item_sel { + box-shadow: 0 0 10px inset #1a5afd; + } + .item { + background-color: #011168; + margin-top: 12px; + width: 244px; + height: 190px; + border: 1px solid #037ddc; + border-radius: 8px; + text-align: center; + margin-left: 11px; + position: relative; + + // &:first-child { + // margin-left: 0; + // } + + .housename { + margin-top: 70px; + font-size: 24px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + // line-height: 180px; + } + + .icon_party { + position: absolute; + top: 13px; + left: 18px; + } + + .icon_category { + position: absolute; + bottom: 14px; + left: 9px; + // margin-left: 7px; + + > img { + margin-left: 5px; + width: 21px; + height: 20px; + } + } + .div_user:hover { + cursor: pointer; + } + + .div_user { + position: absolute; + bottom: 10px; + right: 11px; + width: 88px; + height: 30px; + background: #073082; + border-radius: 15px; + + > img { + width: 10px; + height: 6px; + margin-left: 4px; + } + + > span { + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 30px; + } + } + } + } + + .div_room::after { + content: ''; + flex: 1; + } +} + +.user_list { + position: relative; + z-index: 10; + + background: #020340; + border: 1px solid #0a359b; + border-radius: 4px; + box-shadow: 0 0 10px inset #1a5afd; + + .user_item { + padding: 13px 8px 0 14px; + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + + .user_item_content { + display: flex; + // justify-content: space-between; + align-items: center; + + .name { + max-width: 80%; + text-align: left; + } + + > img { + margin-left: auto; + + margin-top: 4px; + width: 8px; + height: 12px; + } + } + + .item_line { + margin-top: 9px; + width: 70px; + height: 0px; + border: 1px dotted #1797ff31; + border-width: 0.5px; + } + .last_line { + border: 1px dotted #1797ff00; + } + } +} +.div_agency_tran { + transition: width 2s ease-out, opacity 1s ease-in, visibility 1s ease-in; + width: 0; + height: 470px; + z-index: 1000; + position: absolute; + top: 50px; + right: 600px; + box-sizing: border-box; + display: flex; + justify-content: center; + align-items: center; + + .div_agency_list { + width: 320px; + height: 470px; + color: #fff; + background: url('../../../img/modules/visual/box-2.png') no-repeat center; + background-size: 100% 100%; + padding: 45px 20px 35px 20px; + + .agency_main { + height: 100%; + position: relative; + } + + .agency_main { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } + + .no-data-img { + text-align: center; + margin-top: 50px; + margin-left: 15px; + } + .agency_list { + .agency_item { + // height: 60px; + padding: 15px 0; + font-size: 17px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + // line-height: 50px; + padding-left: 12px; + display: flex; + flex-direction: row; + align-items: center; + // padding-top: 15px; + + .agency_item_name { + // line-height: 20px; + } + } + + .agency_item_on { + background: #08216c; + border-radius: 2px; + } + + .agency_item:hover { + cursor: pointer; + background-color: #011168; + border-radius: 4px 0 0 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + border-radius: 2px; + } + } + } + + .arrow_tip { + margin-right: -2px; + > img { + width: 21px; + height: 176px; + } + } + .arrow_tip:hover { + cursor: pointer; + } +} + +.div_agency_tran-fade-in { + width: 341px; + opacity: 1; + visibility: 1; +} +.div_agency_tran-fade-out { + visibility: 0; + opacity: 1; + width: 0; + right: 575px; +} +// .div_agency_list-fade-in { +// width: 341px; +// opacity: 1; +// visibility: 1; +// } +// .div_agency_list-fade-out { +// visibility: 0; +// opacity: 0; +// width: 0; +// } diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index bb946c9c..72c37bd1 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -42,6 +42,7 @@ // background: url('../../../img/modules/visual/warning-box.png') no-repeat // center; // background-size: 100% 100%; + position: relative; } .div_data { @@ -112,6 +113,9 @@ background-size: 100% 100%; // padding: 45px 21px 35px 24px; + .info_loading { + margin-top: 50px; + } .info_tip { padding: 31px 0 0 19px; display: flex; @@ -190,6 +194,12 @@ } } } + + .div_info { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } } } @@ -383,56 +393,98 @@ } } -.div_agency_list { - z-index: 1000; +.m-sidebar { position: absolute; + right: 0; top: 50px; - right: 600px; - box-sizing: border-box; - width: 320px; + z-index: 1000; + width: 370px; height: 470px; + overflow: hidden; - color: #fff; - background: url('../../../img/modules/visual/box-2.png') no-repeat center; - background-size: 100% 100%; - padding: 45px 20px 35px 20px; - .no-data-img { - text-align: center; - margin-top: 50px; - margin-left: 15px; + .wrap { + display: flex; + justify-content: flex-start; + align-items: center; + background-color: rgba(rgb(173, 173, 173), 0); + transform: translateX(-5px); + transition: all ease 1s; + border-radius: 4px; } - .agency_list { - .agency_item { - // height: 60px; - padding: 15px 0; - font-size: 17px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - // line-height: 50px; - padding-left: 12px; - display: flex; - flex-direction: row; - align-items: center; - // padding-top: 15px; - .agency_item_name { - // line-height: 20px; + .wrap-hidden { + transform: translateX(339px); + } + + .div_agency_list { + width: 320px; + height: 470px; + color: #fff; + background: url('../../../img/modules/visual/box-2.png') no-repeat center; + background-size: 100% 100%; + padding: 45px 20px 35px 20px; + + .agency_main { + height: 100%; + position: relative; + } + + .agency_main { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; } } - .agency_item_on { - background: #08216c; - border-radius: 2px; + .no-data-img { + text-align: center; + margin-top: 50px; + margin-left: 15px; } + .agency_list { + .agency_item { + // height: 60px; + padding: 15px 0; + font-size: 17px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + // line-height: 50px; + padding-left: 12px; + display: flex; + flex-direction: row; + align-items: center; + // padding-top: 15px; - .agency_item:hover { - cursor: pointer; - background-color: #011168; - border-radius: 4px 0 0 4px; - border: none; - box-shadow: 0 0 10px inset #1a5afd; - border-radius: 2px; + .agency_item_name { + // line-height: 20px; + } + } + + .agency_item_on { + background: #08216c; + border-radius: 2px; + } + + .agency_item:hover { + cursor: pointer; + background-color: #011168; + border-radius: 4px 0 0 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + border-radius: 2px; + } } } + + .arrow_tip { + margin-right: -2px; + margin-left: 10px; + > img { + width: 22px; + height: 176px; + } + } + .arrow_tip:hover { + cursor: pointer; + } } diff --git a/src/assets/scss/modules/visual/communityManageForm.scss b/src/assets/scss/modules/visual/communityManageForm.scss new file mode 100644 index 00000000..21204911 --- /dev/null +++ b/src/assets/scss/modules/visual/communityManageForm.scss @@ -0,0 +1,32 @@ +.item_width_1 { + width: 500px; +} +.item_width_2 { + width: 400px; +} +.item_width_3 { + margin-left: 10px; + width: 200px; +} +.item_width_4 { + width: 200px; +} + +.div_map { + margin-top: 10px; +} + +.div_btn { + margin-top: 20px; + text-align: center; +} +.el-tabs { + margin: 0 20px; +} +.el-upload__tip { + color: rgb(155, 155, 155); + margin: 0; +} +.form { + margin-top: 30px; +} diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss index 5a6edb5f..01c04348 100644 --- a/src/assets/scss/modules/visual/people.scss +++ b/src/assets/scss/modules/visual/people.scss @@ -1,650 +1,657 @@ -@import "../../c/config"; -@import "../../c/function"; -@import "./c/common"; +@import '../../c/config'; +@import '../../c/function'; +@import './c/common'; .g-cpt { + display: flex; + flex-wrap: wrap; + justify-content: center; + margin-top: 5px; + + .g-l { + width: 850px; + margin-bottom: 20px; + } + + .g-r { + margin-left: 6px; + width: calc(100% - 850px - 6px); + min-width: 850px; + } +} + +.m-people { + position: relative; + + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; display: flex; - flex-wrap: wrap; - justify-content: center; - margin-top: 5px; + align-items: center; - .g-l { - width: 850px; - margin-bottom: 20px; + img { + display: block; + margin-right: 5px; } - - .g-r { - margin-left: 6px; - width: calc(100% - 850px - 6px); - min-width: 850px; + span { + display: block; } -} - -.m-people { + } + + .more { + // position: absolute; + margin-left: auto; + margin-top: -10px; + width: 90px; + height: 29px; + line-height: 29px; + background: linear-gradient(90deg, #1a5afd, #26c4ff); + border-radius: 15px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + text-align: center; + cursor: pointer; + } + + .ren { position: relative; + margin-top: 0; + padding-bottom: 15px; + + .ren-name { + position: absolute; + left: 0; + right: 0; + top: -10px; + width: 400px; + margin: 0 auto; + font-size: 24px; + line-height: 40px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + + > span { + @include toe; + display: block; + text-align: center; + } - .title { - padding: 10px; - font-size: 22px; - font-family: PingFang SC; - font-weight: 800; - color: #ffffff; - display: flex; - align-items: center; - - img { - display: block; - margin-right: 5px; - } - span { - display: block; - } + > img { + display: block; + margin: 3px auto; + } } - .more { - // position: absolute; - margin-left: auto; - margin-top: -10px; - width: 90px; - height: 29px; - line-height: 29px; - background: linear-gradient(90deg, #1a5afd, #26c4ff); - border-radius: 15px; - font-size: 14px; + .pic-ren { + margin: 0 auto; + display: block; + pointer-events: none; + } + .ren-prop { + position: absolute; + width: 100px; + height: 120px; + + &.z-1 { + left: 170px; + top: 10px; + } + &.z-6 { + right: 170px; + top: 10px; + } + &.z-2 { + left: 55px; + top: 110px; + } + &.z-5 { + right: 55px; + top: 110px; + } + &.z-3 { + left: 115px; + top: 245px; + } + &.z-4 { + right: 115px; + top: 245px; + } + + > img { + margin: 0 auto; + } + > span { + display: block; + font-size: 16px; + line-height: 30px; font-family: PingFang SC; font-weight: 500; color: #ffffff; text-align: center; - cursor: pointer; - } - - .ren { - position: relative; - margin-top: 0; - padding-bottom: 15px; - - .ren-name { - position: absolute; - left: 0; - right: 0; - top: -10px; - width: 400px; - margin: 0 auto; - font-size: 24px; - line-height: 40px; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - - > span { - @include toe; - display: block; - text-align: center; - } + } - > img { - display: block; - margin: 3px auto; - } + &:hover { + .ren-cnt { + display: block; } + } - .pic-ren { - margin: 0 auto; - display: block; - pointer-events: none; + .ren-cnt { + position: absolute; + z-index: 10; + display: none; + box-sizing: border-box; + top: 60px; + left: 90px; + padding: 10px; + width: 162px; + min-height: 60px; + background: rgba(#b7c7e0, 0.24); + line-height: 20px; + + h5 { + margin: 0; + font-size: 16px; + font-family: PingFang SC; + font-weight: 500; + color: #fefefe; } - .ren-prop { - position: absolute; - width: 100px; - height: 120px; - - &.z-1 { - left: 170px; - top: 10px; - } - &.z-6 { - right: 170px; - top: 10px; - } - &.z-2 { - left: 55px; - top: 110px; - } - &.z-5 { - right: 55px; - top: 110px; - } - &.z-3 { - left: 115px; - top: 245px; - } - &.z-4 { - right: 115px; - top: 245px; - } - - > img { - margin: 0 auto; - } - > span { - display: block; - font-size: 16px; - line-height: 30px; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - text-align: center; - } - &:hover { - .ren-cnt { - display: block; - } - } - - .ren-cnt { - position: absolute; - z-index: 10; - display: none; - box-sizing: border-box; - top: 60px; - left: 90px; - padding: 10px; - width: 162px; - min-height: 60px; - background: rgba(#b7c7e0, 0.24); - line-height: 20px; - - h5 { - margin: 0; - font-size: 16px; - font-family: PingFang SC; - font-weight: 500; - color: #fefefe; - } - - p { - margin: 0; - margin-top: 4px; - font-size: 14px; - font-family: PingFang SC; - font-weight: 400; - color: #fefefe; - } - } + p { + margin: 0; + margin-top: 4px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #fefefe; } + } } + } } .m-pop { - @include shield; - background-color: rgba(#000, 0.9); - overflow-y: auto; - - .wrap { - position: relative; - margin: 120px auto; - width: 1000px; + @include shield; + background-color: rgba(#000, 0.9); + overflow-y: auto; - .title { - padding: 10px; - font-size: 22px; - font-family: PingFang SC; - font-weight: 800; - color: #ffffff; - display: flex; - align-items: center; + .wrap { + position: relative; + margin: 120px auto; + width: 1000px; - img { - display: block; - margin-right: 5px; - } - span { - display: block; - } - } + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } - .btn-close { - position: absolute; - top: -15px; - right: -15px; - cursor: pointer; - } + .btn-close { + position: absolute; + top: -15px; + right: -15px; + cursor: pointer; + } - .list { - display: flex; - flex-wrap: wrap; - padding: 10px 30px; - - .item { - position: relative; - box-sizing: border-box; - padding: 0 15px; - width: 33%; - color: #fff; - font-size: 18px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - line-height: 24px; - margin: 20px 0; - - &::before { - position: absolute; - left: 0; - top: 9px; - content: ""; - display: block; - width: 7px; - height: 7px; - background: #0c81fe; - border-radius: 3px; - } - } - } + .list { + display: flex; + flex-wrap: wrap; + padding: 10px 30px; - .line { - margin: 20px auto; - width: 900px; - height: 1px; - border: 1px dashed #1257c9; + .item { + position: relative; + box-sizing: border-box; + padding: 0 15px; + width: 33%; + color: #fff; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 24px; + margin: 20px 0; + + &::before { + position: absolute; + left: 0; + top: 9px; + content: ''; + display: block; + width: 7px; + height: 7px; + background: #0c81fe; + border-radius: 3px; } + } + } - .tabs { - margin-top: 30px; - display: flex; - align-items: center; - padding-left: 20px; + .line { + margin: 20px auto; + width: 900px; + height: 1px; + border: 1px dashed #1257c9; + } - .tab-btn { - width: 30px; - text-align: center; - cursor: pointer; - } + .tabs { + margin-top: 30px; + display: flex; + align-items: center; + padding-left: 20px; - .tab { - margin: 0 5px; - min-width: 76px; - padding: 0 5px; - height: 30px; - background: rgba(255, 255, 255, 0); - border: 1px solid #1257c9; - box-shadow: 0 0 10px 0 inset #1257c9; - border-radius: 2px; - text-align: center; - font-size: 14px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - line-height: 30px; - cursor: pointer; - transition: all ease 0.5s; - &.z-on { - background: linear-gradient(90deg, #1a5afd, #009cff); - box-shadow: none; - } - } + .tab-btn { + width: 30px; + text-align: center; + cursor: pointer; + } + + .tab { + margin: 0 5px; + min-width: 76px; + padding: 0 5px; + height: 30px; + background: rgba(255, 255, 255, 0); + border: 1px solid #1257c9; + box-shadow: 0 0 10px 0 inset #1257c9; + border-radius: 2px; + text-align: center; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 30px; + cursor: pointer; + transition: all ease 0.5s; + &.z-on { + background: linear-gradient(90deg, #1a5afd, #009cff); + box-shadow: none; } + } } + } } .m-relation { + position: relative; + margin-top: 10px; + + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } + + .info { position: relative; - margin-top: 10px; + width: 410px; + height: 312px; + margin: 0 auto; + .huzhu { + position: relative; - .title { - padding: 10px; - font-size: 22px; + .huzhu-bg { + display: block; + } + + .huzhu-ico { + position: absolute; + display: block; + top: 90px; + left: 0; + right: 0; + margin: 0 auto; + } + .huzhu-name { + position: absolute; + display: block; + top: 170px; + width: 100%; + font-size: 24px; font-family: PingFang SC; - font-weight: 800; + font-weight: 500; color: #ffffff; - display: flex; - align-items: center; - - img { - display: block; - margin-right: 5px; - } - span { - display: block; - } + line-height: 30px; + text-align: center; + } + > p { + position: absolute; + top: 200px; + font-size: 16px; + width: 100%; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + text-align: center; + } } - .info { - position: relative; - width: 410px; - height: 312px; - margin: 0 auto; - .huzhu { - position: relative; + .rel { + position: absolute; + width: 128px; + height: 38px; - .huzhu-bg { - display: block; - } + .rel-line { + position: absolute; + z-index: 1; + } + .rel-bg { + height: 70px; + width: 128px; + } + + .rel-text { + @include toe; + position: absolute; + z-index: 2; + top: 0; + left: 0; + width: 100%; + padding: 7px 10px; + line-height: 24px; + text-align: center; + color: #fff; + font-size: 18px; + font-family: PingFang SC; + font-weight: 500; + cursor: pointer; - .huzhu-ico { - position: absolute; - display: block; - top: 90px; - left: 0; - right: 0; - margin: 0 auto; - } - .huzhu-name { - position: absolute; - display: block; - top: 170px; - width: 100%; - font-size: 24px; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - line-height: 30px; - text-align: center; - } - > p { - position: absolute; - top: 200px; - font-size: 16px; - width: 100%; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - text-align: center; - } + .rel-name { + font-size: 14px; } - - .rel { - position: absolute; - width: 128px; - height: 38px; - - .rel-line { - position: absolute; - z-index: 1; - } - - .rel-text { - @include toe; - position: absolute; - z-index: 2; - top: 0; - left: 0; - width: 100%; - line-height: 38px; - text-align: center; - color: #fff; - font-size: 18px; - font-family: PingFang SC; - font-weight: 500; - cursor: pointer; - - .rel-name { - font-size: 14px; - } - } - - &.z-zuo-2 { - top: 138px; - left: -33px - 128px; - .rel-line { - left: 127px; - top: -28px; - } - } - - &.z-you-2 { - top: 138px; - right: -33px - 128px; - .rel-line { - right: 127px; - top: -28px; - } - } - - &.z-zuo-1 { - top: 43px; - left: -33px - 128px; - .rel-line { - left: 131px; - } - } - &.z-you-1 { - top: 43px; - right: -33px - 128px; - .rel-line { - right: 131px; - } - } - - &.z-zuo-3 { - bottom: 41px; - left: -33px - 128px; - .rel-line { - left: 131px; - bottom: -2px; - } - } - &.z-you-3 { - bottom: 41px; - right: -33px - 128px; - .rel-line { - right: 131px; - bottom: -2px; - } - } + } + + &.z-zuo-2 { + top: 124px; + left: -33px - 128px; + .rel-line { + left: 127px; + top: -8px; + } + } + + &.z-you-2 { + top: 124px; + right: -33px - 128px; + .rel-line { + right: 127px; + top: -8px; } + } + + &.z-zuo-1 { + top: 25px; + left: -33px - 128px; + .rel-line { + top: 17px; + left: 131px; + } + } + &.z-you-1 { + top: 25px; + right: -33px - 128px; + .rel-line { + top: 17px; + right: 131px; + } + } + + &.z-zuo-3 { + bottom: 45px; + left: -33px - 128px; + .rel-line { + left: 131px; + bottom: -15px; + } + } + &.z-you-3 { + bottom: 45px; + right: -33px - 128px; + .rel-line { + right: 131px; + bottom: -15px; + } + } } + } } .m-tb { + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } + .tb { + height: 300px; + overflow-y: auto; + @include scrollBar; + } +} + +.m-row { + display: flex; + justify-content: space-between; + margin-top: 10px; + + .m-list { + width: calc(50% - 3px); + .title { - padding: 10px; + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + + a { + display: block; + color: rgba(#fff, 0.5); font-size: 22px; font-family: PingFang SC; font-weight: 800; - color: #ffffff; - display: flex; - align-items: center; + margin-right: 10px; + cursor: pointer; + + &.z-on { + color: #fff; + cursor: default; - img { - display: block; - margin-right: 5px; + &:hover { + color: #fff; + text-decoration: none; + } } - span { - display: block; + + &:hover { + color: rgba(#fff, 0.5); + text-decoration: underline; } + } } - .tb { - height: 300px; - overflow-y: auto; - @include scrollBar; - } -} -.m-row { - display: flex; - justify-content: space-between; - margin-top: 10px; - - .m-list { - width: calc(50% - 3px); - - .title { - padding: 10px; - font-size: 22px; - font-family: PingFang SC; - font-weight: 800; - color: #ffffff; + .list-wrap { + height: 480px; + overflow-y: auto; + @include scrollBar; + + .list { + .item { + position: relative; + background-color: #104ba4; + padding: 10px 20px; + margin-bottom: 4px; + cursor: pointer; + transition: all ease 0.1s; + + .item-row { display: flex; + justify-content: space-between; align-items: center; - img { - display: block; - margin-right: 5px; + .item-l { + width: 25%; } - span { - display: block; + .item-r { + width: 75%; } - a { + &:hover { + &::before { + content: ''; + position: absolute; display: block; - color: rgba(#fff, 0.5); - font-size: 22px; - font-family: PingFang SC; - font-weight: 800; - margin-right: 10px; - cursor: pointer; - - &.z-on { - color: #fff; - cursor: default; - - &:hover { - color: #fff; - text-decoration: none; - } - } - - &:hover { - color: rgba(#fff, 0.5); - text-decoration: underline; - } - } - } + left: 0; + top: 0; + bottom: 0; + width: 6px; + background: linear-gradient(270deg, #0336ff, #01b4ff); + border-radius: 2px; + } - .list-wrap { - height: 480px; - overflow-y: auto; - @include scrollBar; - - .list { - .item { - position: relative; - background-color: #104ba4; - padding: 10px 20px; - margin-bottom: 4px; - cursor: pointer; - transition: all ease 0.1s; - - .item-row { - display: flex; - justify-content: space-between; - align-items: center; - - .item-l { - width: 25%; - } - .item-r { - width: 75%; - } - - &:hover { - &::before { - content: ""; - position: absolute; - display: block; - left: 0; - top: 0; - bottom: 0; - width: 6px; - background: linear-gradient(270deg, #0336ff, #01b4ff); - border-radius: 2px; - } - - &::after { - content: ""; - position: absolute; - display: block; - left: 15px; - top: 0; - bottom: 0; - margin: auto 0; - width: 0; - height: 0; - border-width: 10px; - border-style: solid; - border-color: transparent transparent transparent #20edff; - } - } - } - - .item-point { - text-align: center; - padding-left: 10%; - height: 16px; - font-size: 22px; - font-family: PingFang SC; - font-weight: bold; - color: #ffffff; - line-height: 12px; - } - - .item-title { - padding: 10px 0; - font-size: 18px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - line-height: 24px; - } - - .item-date { - padding: 10px 0; - border-top: 1px dashed #8398d9; - font-size: 14px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - opacity: 0.67; - } - &:hover { - box-shadow: 0 0 30px 5px inset #22f; - background-color: darken(#104ba4, 12); - } - } - } + &::after { + content: ''; + position: absolute; + display: block; + left: 15px; + top: 0; + bottom: 0; + margin: auto 0; + width: 0; + height: 0; + border-width: 10px; + border-style: solid; + border-color: transparent transparent transparent #20edff; + } + } + } + + .item-point { + text-align: center; + padding-left: 10%; + height: 16px; + font-size: 22px; + font-family: PingFang SC; + font-weight: bold; + color: #ffffff; + line-height: 12px; + } + + .item-title { + padding: 10px 0; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 24px; + } + + .item-date { + padding: 10px 0; + border-top: 1px dashed #8398d9; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + opacity: 0.67; + } + &:hover { + box-shadow: 0 0 30px 5px inset #22f; + background-color: darken(#104ba4, 12); + } } + } } + } } .m-pagination { - box-sizing: border-box; - margin-top: 20px; - width: 100%; - height: 40px; - display: flex; - justify-content: flex-end; - - /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { - background: #0266d1; - color: #000d3f; - } - - /deep/ .el-pagination .el-pager li { - background: #002e74; - } - - /deep/ .el-pagination .btn-prev { - background: #002e74; - } - - /deep/ .el-pagination .btn-next { - background: #002e74; - } + box-sizing: border-box; + margin-top: 20px; + width: 100%; + height: 40px; + display: flex; + justify-content: flex-end; + + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { + background: #0266d1; + color: #000d3f; + } + + /deep/ .el-pagination .el-pager li { + background: #002e74; + } + + /deep/ .el-pagination .btn-prev { + background: #002e74; + } + + /deep/ .el-pagination .btn-next { + background: #002e74; + } } .m-hint { - position: relative; - height: 300px; - - // 暂无数据 - img { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - margin: auto; - } + position: relative; + height: 300px; + + // 暂无数据 + img { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + } } diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss index 3a9d5913..ddf1da35 100644 --- a/src/assets/scss/modules/visual/personCategory.scss +++ b/src/assets/scss/modules/visual/personCategory.scss @@ -76,10 +76,42 @@ width: 100%; display: flex; position: relative; - flex-direction: column; - align-items: space-between; + justify-content: space-between; + align-items: flex-start; + margin-top: 10px; // border: 1px solid red; + .item_left { + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + } + + .item_right { + width: 160px; + display: flex; + flex-direction: column; + align-items: space-between; + + font-size: 16px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + + .item_right_row { + display: flex; + justify-content: space-between; + + .item_right_title { + } + } + + .row2 { + margin-top: 10px; + } + } + .num-item { position: relative; width: 100%; @@ -90,19 +122,6 @@ justify-content: space-between; padding: 0 10px 0 9px; - // &::after { - // display: block; - // content: ""; - // width: 8px; - // height: 8px; - // background: #f0f3f7; - // border-radius: 50%; - // position: absolute; - // left: 12px; - // top: 50%; - // transform: translate(0, -50%); - // } - div:nth-child(1) { font-size: 16px; font-family: PingFang SC; @@ -111,17 +130,15 @@ } div:nth-child(2) { + display: flex; + align-items: center; + justify-content: space-between; // width: 70%; display: flex; font-size: 20px; font-family: PingFang SC; font-weight: 500; color: #ffffff; - - .right-icon { - width: 10px; - height: 14px; - } } } diff --git a/src/assets/scss/modules/warning.scss b/src/assets/scss/modules/warning.scss new file mode 100644 index 00000000..2c6b9fa2 --- /dev/null +++ b/src/assets/scss/modules/warning.scss @@ -0,0 +1,147 @@ +.warning-box { + box-sizing: border-box; + // width: 1881px; + width: 100%; + // height: 100%; + min-height: 100%; + margin: 0 auto; + color: #999; + // background: url("../../../img/modules/visual/warning-box.png") no-repeat center; + background-size: 100% 100%; + padding: 25px 21px 35px 24px; + + &-top { + display: flex; + // justify-content: space-around; + justify-content: flex-start; + flex-wrap: wrap; + min-height: 190px; + + .top-item { + box-sizing: border-box; + width: 280px; + height: 190px; + padding: 10px 22px 14px 21px; + border-radius: 8px; + margin-right: 15px; + margin-bottom: 15px; + background-color: #fff; + + &-img { + display: flex; + align-items: center; + + img { + width: 78px; + height: 78px; + margin-right: 16px; + margin-bottom: 10px; + } + + .top-item-left { + display: flex; + flex-direction: column; + + span { + display: inline-block; + } + + span:nth-child(1) { + font-size: 18px; + font-weight: 400; + color: #333333; + } + + span:nth-child(2) { + font-size: 28px; + font-weight: bold; + color: #2194fe; + margin-top: 10px; + } + } + } + + &-num { + width: 100%; + display: flex; + position: relative; + flex-direction: column; + align-items: space-between; + // border: 1px solid red; + + .num-item { + position: relative; + width: 100%; + height: 35px; + display: flex; + border-radius: 4px; + align-items: center; + justify-content: space-between; + padding: 0 10px 0 29px; + cursor: pointer; + + &::after { + display: block; + content: ""; + width: 8px; + height: 8px; + background: #2194fe; + border-radius: 50%; + position: absolute; + left: 12px; + top: 50%; + transform: translate(0, -50%); + } + + div:nth-child(1) { + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #333333; + } + + div:nth-child(2) { + // width: 70%; + display: flex; + font-size: 20px; + font-family: PingFang SC; + font-weight: 500; + color: #333; + + .right-icon { + width: 10px; + height: 14px; + } + } + } + + .num-item-active { + background-color: #f0f3f7; + } + + .num-item:nth-child(2) { + margin-top: 10px; + } + } + } + } + + &-bottom { + box-sizing: border-box; + width: 100%; + height: calc(100% - 300px); + padding: 35px 40px; + min-height: 300px; + margin-top: 30px; + background-color: #fff; + + .pagination { + box-sizing: border-box; + margin-top: 20px; + width: 100%; + height: 40px; + display: flex; + justify-content: flex-end; + } + } +} diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js new file mode 100644 index 00000000..8c38025d --- /dev/null +++ b/src/js/dai/request2.js @@ -0,0 +1,90 @@ +/*--------------------------------------------------------------- + | 请求接口封装 | + ---------------------------------------------------------------*/ +import axios from "axios"; +import curry from "dai-js/tools/curry"; +import { Message } from "element-ui"; + +const request = curry( + (method, url, data = {}, headers = {}, progress = () => {}) => { + return new Promise((reslove) => { + let returnIniData = { + httpCode: "", + data: {}, + msg: "", + code: "", + }; + + // 添加服务器端URL + function processUrl(url) { + if (url.indexOf("http://") > -1 || url.indexOf("https://") > -1) { + return url; + } + return process.env.VUE_APP_API_SERVER + url; + } + + url = processUrl(url); + + const succFn = (res) => { + // log(`[request成功] ${url}`, data, res); + let retData = { + ...returnIniData, + ...res.data, + httpCode: res.statusCode, + }; + // if(typeof Vue.$afterRequestHook == 'function'){ + // retData = Vue.$afterRequestHook(retData); + // } + if (res.data.code > 8000 && res.data.code < 10000) { + Message.error(res.data.msg); + } + + reslove(retData); + }; + + const failFn = (err) => { + // log(`[request失败] ${url}`, data, err); + + reslove( + Object.assign({}, returnIniData, { + httpCode: "9999", //访问出现意外 + msg: "网络错误", + }) + ); + }; + + if (method.toUpperCase() == "POST") { + axios + .post(url, data, { + headers, + responseType: "json", + // progress, + // credentials: false, + }) + .then(succFn) + .catch(failFn); + } else { + axios + .get(url, { + params: data, + headers, + responseType: "json", + // credentials: true, + }) + .then(succFn) + .catch(failFn); + } + }); + } +); + +export const requestGet = request("get"); + +export const requestPost = request("post"); + +export default { + install(Vue) { + Vue.prototype.$requestGet = requestGet; + Vue.prototype.$requestPost = requestPost; + }, +}; diff --git a/src/main.js b/src/main.js index 6d65da32..05367aa0 100644 --- a/src/main.js +++ b/src/main.js @@ -8,6 +8,8 @@ import router from "@/router"; import "@/icons"; import "@/element-ui/theme/index.css"; import "@/assets/scss/aui.scss"; +//按钮 + import http from "@/utils/request"; import renRadioGroup from "@/components/ren-radio-group"; import renSelect from "@/components/ren-select"; diff --git a/src/router/index.js b/src/router/index.js index e278ad84..75966340 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -282,44 +282,44 @@ router.beforeEach((to, from, next) => { url: "visual/heart/index", children: [], }, - // { - // icon: "icon-setting", - // id: "44rq22222q2222", - // name: "AI安防", - // // url: "visual/basicinfo/basicInfoMain", - // children: [ - // { - // url: "/visual/ai/index", - // name: "AI安防", - // id: "5feawfwa111111efwa57", - // }, - // { - // url: "/visual/ai/renliu", - // name: "人流数据", - // id: "5fwaefwae222112fawef58", - // }, - // { - // url: "/visual/ai/cheliu", - // name: "车流数据", - // id: "erawerwecsxefwaw", - // }, - // { - // url: "/visual/ai/shebei", - // name: "设备数据", - // id: "zfzffewaf", - // }, - // { - // url: "/visual/ai/gongdan", - // name: "工单数据", - // id: "fewafwafewaefddd", - // }, - // { - // url: "/visual/ai/yujing", - // name: "预警事件", - // id: "545345fdsfs", - // }, - // ], - // }, + { + icon: "icon-setting", + id: "44rq22222q2222", + name: "AI安防", + // url: "visual/basicinfo/basicInfoMain", + children: [ + { + url: "/visual/ai/index", + name: "AI安防", + id: "5feawfwa111111efwa57", + }, + { + url: "/visual/ai/renliu", + name: "人流数据", + id: "5fwaefwae222112fawef58", + }, + { + url: "/visual/ai/cheliu", + name: "车流数据", + id: "erawerwecsxefwaw", + }, + { + url: "/visual/ai/shebei", + name: "设备数据", + id: "zfzffewaf", + }, + { + url: "/visual/ai/gongdan", + name: "工单数据", + id: "fewafwafewaefddd", + }, + { + url: "/visual/ai/yujing", + name: "预警事件", + id: "545345fdsfs", + }, + ], + }, ]; fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); @@ -375,7 +375,7 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) { for (var i = 0; i < menuList.length; i++) { if (menuList[i].children && menuList[i].children.length >= 1) { temp = temp.concat(menuList[i].children); - continue; + // continue; } // 组装路由 var route = { diff --git a/src/views/components/CTable.vue b/src/views/components/CTable.vue index 2de9e79f..86449a94 100644 --- a/src/views/components/CTable.vue +++ b/src/views/components/CTable.vue @@ -4,7 +4,6 @@ ref="table" class="tableLimit" :height="table.height" - :header-cell-style="{color:'#000'}" :data="tableData" :style="{width: '100%'}" border @@ -18,7 +17,7 @@ @row-click="handleRowClick">
- +
@@ -87,7 +86,7 @@ fixed="right" :min-width="operationWidth" header-align="center" - align="buttonAlign" + :align="buttonAlign" class="operate"> @@ -211,7 +226,7 @@ export default { //操作列对齐模式 buttonAlign: { type: String, - default: "" + default: "center" } }, @@ -421,4 +436,10 @@ export default { .el-table .cell { white-space: pre-line; /*保留换行符*/ } +.pagination-diy { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; +} diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index ed807fd9..d7afc877 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -38,7 +38,7 @@
查询 --> - 查询 + 查询
diff --git a/src/views/components/resiTransfer.vue b/src/views/components/resiTransfer.vue index 94178f4f..4daef451 100644 --- a/src/views/components/resiTransfer.vue +++ b/src/views/components/resiTransfer.vue @@ -1,6 +1,6 @@ diff --git a/src/views/components/scoreRecord.vue b/src/views/components/scoreRecord.vue index 62c02c52..fb618e21 100644 --- a/src/views/components/scoreRecord.vue +++ b/src/views/components/scoreRecord.vue @@ -54,12 +54,13 @@ header-align="center" align="center" label="需求人" - width="100"> + width="120"> @@ -74,14 +75,14 @@ header-align="center" align="center" label="评价" - width="80"> + width="120"> + width="100"> diff --git a/src/views/modules/base/category/addCategory.vue b/src/views/modules/base/category/addCategory.vue index b1667e89..d83e5d3e 100644 --- a/src/views/modules/base/category/addCategory.vue +++ b/src/views/modules/base/category/addCategory.vue @@ -35,9 +35,10 @@
- 取消 - 确定
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue index cdea08eb..1f2c2041 100644 --- a/src/views/modules/base/community/buildForm.vue +++ b/src/views/modules/base/community/buildForm.vue @@ -1,6 +1,6 @@ @@ -172,7 +169,7 @@ style="margin-left:15px" type="red" size="small" - @click="deleteBatch">批量删除 + @click="deleteBatch">删除
@@ -184,6 +181,7 @@ :title="formTitle" top="5vh" width="900px" + class="dialog-h" @closed="diaClose"> diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue index 60ce06be..f9aec152 100644 --- a/src/views/modules/base/community/communityForm.vue +++ b/src/views/modules/base/community/communityForm.vue @@ -1,6 +1,6 @@ @@ -191,9 +193,9 @@ @change="handleSelectAll">全选 批量删除 + @click="deleteBatch">删除 @@ -204,6 +206,7 @@ :title="formTitle" width="850px" top="5vh" + class="dialog-h" @closed="diaClose"> - + diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index 2263b645..dfdda844 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -1,6 +1,6 @@