From 733f364dd0a9eb0b568003e07daafcfe47bfda2d Mon Sep 17 00:00:00 2001 From: yjl <1490736767@qq.com> Date: Thu, 10 Nov 2022 18:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=EF=BC=88=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=82=B9=E4=BD=8D=E9=85=8D=E7=BD=AE=E3=80=81=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E9=A1=B5=E9=9D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/personnelPositioning.js | 12 + src/assets/js/http.js | 4 +- src/router/index.js | 13 + src/views/projectAdmin/zjsj/command/index.vue | 2 +- .../ConfigChildrenIndex/configuration.vue | 266 +++++++++++ .../ConfigChildrenIndex/positoningIndex.vue | 441 ++++++++++++++++++ .../personnelPosition/laborPersonCommon.less | 198 ++++++++ .../personnelPositioning.vue | 15 + .../personnelPosition/pointConfiguration.vue | 90 ++++ 9 files changed, 1038 insertions(+), 3 deletions(-) create mode 100644 src/assets/js/api/personnelPositioning.js create mode 100644 src/views/projectFront/personnelPosition/ConfigChildrenIndex/configuration.vue create mode 100644 src/views/projectFront/personnelPosition/ConfigChildrenIndex/positoningIndex.vue create mode 100644 src/views/projectFront/personnelPosition/laborPersonCommon.less create mode 100644 src/views/projectFront/personnelPosition/personnelPositioning.vue create mode 100644 src/views/projectFront/personnelPosition/pointConfiguration.vue diff --git a/src/assets/js/api/personnelPositioning.js b/src/assets/js/api/personnelPositioning.js new file mode 100644 index 00000000..15a0a06c --- /dev/null +++ b/src/assets/js/api/personnelPositioning.js @@ -0,0 +1,12 @@ +/** + * api接口统一管理 + */ + import {post,get} from '../http' + + + export const addPersonnelLocationnApi = data => post('xmgl/personnelLocationBaseStation/addPersonnelLocationBaseStation', data);//新增人员定位-基站 + export const deletePersonnelLocationDeleteByIdApi = data => get('xmgl/personnelLocationBaseStation/deleteById', data);//根据id删除人员定位-基站 + export const getPersonnelLocationBaseStationGetByIdApi = data => get('xmgl/personnelLocationBaseStation/getById', data);//根据id查询人员定位-基站 + export const editPersonnelLocationBaseStationUpdateApi = data => post('personnelLocationBaseStation/updatePersonnelLocationBaseStation', data);//修改人员定位-基站 + export const getPersonnelLocationBaseStationListApi = data => get('xmgl/personnelLocationBaseStation/list', data);//所有人员定位-基站 + export const getPersonnelLocationBaseStationApi = data => get('xmgl/personnelLocationBaseStation/selectPage', data);//分页查询人员定位-基站 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 672b7333..c06e5588 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,11 +40,11 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - // axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 - axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 + // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 diff --git a/src/router/index.js b/src/router/index.js index 69f98476..7779ae16 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -432,6 +432,19 @@ const routes2 = [ name: '人员定位_地图管理', component: () => import('@/views/projectFront/personnelPosition/mapManage.vue') }, + //------ + //人员定位--点位配置 + { + path: '/project/personnelPosition/pointConfiguration', + name: '人员定位_点位配置', + component: () => import('@/views/projectFront/personnelPosition/pointConfiguration.vue') + }, + //人员定位--人员定位 + { + path: '/project/personnelPosition/personnelPositioning', + name: '人员定位_人员定位', + component: () => import('@/views/projectFront/personnelPosition/personnelPositioning.vue') + }, { path: '/project/safeManage/addSafeRecord', name: '安全管理_新增安全检查', diff --git a/src/views/projectAdmin/zjsj/command/index.vue b/src/views/projectAdmin/zjsj/command/index.vue index 3f49b3f8..39d0da8d 100644 --- a/src/views/projectAdmin/zjsj/command/index.vue +++ b/src/views/projectAdmin/zjsj/command/index.vue @@ -39,7 +39,7 @@ + diff --git a/src/views/projectFront/personnelPosition/ConfigChildrenIndex/positoningIndex.vue b/src/views/projectFront/personnelPosition/ConfigChildrenIndex/positoningIndex.vue new file mode 100644 index 00000000..7a969db5 --- /dev/null +++ b/src/views/projectFront/personnelPosition/ConfigChildrenIndex/positoningIndex.vue @@ -0,0 +1,441 @@ + + + + diff --git a/src/views/projectFront/personnelPosition/laborPersonCommon.less b/src/views/projectFront/personnelPosition/laborPersonCommon.less new file mode 100644 index 00000000..6ad8e452 --- /dev/null +++ b/src/views/projectFront/personnelPosition/laborPersonCommon.less @@ -0,0 +1,198 @@ +.flex{ + display: flex; + align-items: center; + justify-content: space-between; +} +.flex2{ + display: flex; + align-items: center; +} +.flex3{ + display: flex; + justify-content: space-between; +} +.flex4{ + display: flex; +} +.right2{ + margin-left: 11px; + width: calc(100% - 380px); + height: 100%; + box-sizing: border-box; + .title{ + padding: 0 22px; + height: 41px; + line-height: 41px; + // background: #fff; + border-bottom: 1px solid #e6e6e6; + .team_number{ + opacity: 0.7; + font-size: 14px; + text-align: left; + font-family: PingFangSC-Regular; + .number{ + color: @--color-primary; + opacity: 1; + } + } + } + .team_list{ + padding: 20px 22px; + // background: #fff; + margin-bottom: 8px; + position: relative; + height: 79px; + .team_addBtn{ + display: grid; + padding: 10px 0; + width: 79px; + height: 79px; + border-radius: 3px; + /deep/ i{ + font-size: 30px; + } + /deep/ span{ + opacity: 0.7; + display: block; + width: 100%; + margin: 0; + } + + } + .team_addBtn:hover{ + /deep/ span{ + color: #fff; + } + } + .list_wrap{ + flex-grow: 22; + flex-wrap: wrap; + overflow: hidden; + cursor: pointer; + .list{ + width: 88px; + height: 79px; + margin-left: 12px; + box-sizing: border-box; + padding: 14px 0; + margin-bottom: 12px; + font-size: 14px; + text-align: center; + border-radius: 3px; + background-color: #dce0ec; + div{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + padding: 0 5px; + } + } + .checkedTeam{ + background-color: #3390FF!important; + } + } + } + .laborComponent_table_wrap{ + box-sizing: border-box; + // background: #fff; + height: calc(100% - 170px); + position: relative; + padding-bottom: 60px; + .search_wrap{ + padding: 25px 13px 13px 23px; + border-bottom: 2px solid #E5ECFE; + } + .values{ + opacity: 0.9; + } + } + .table_wrap_bottom{ + padding: 0 13px; + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 46px; + .table_wrap_btn{ + margin-left: 20px; + } + } + /deep/ .el-form-item{ + margin-bottom:0; + } + + .show_teamList{ + width: calc( 100% - 128px); + flex-grow: 22; + flex-wrap: wrap; + cursor: pointer; + float: left; + z-index: 1000; + position: absolute; + left: 110px; + top:7px; + background: #fff; + border: 1px solid #E5ECFE; + border-radius: 5px; + padding-top: 12px; + padding-right: 12px; + } + .height_79{ + height: 79px; + } +} + +.hint{ + opacity: 0.5; +color: rgba(42, 46, 63, 1); +font-size: 12px; +text-align: left; +font-family: PingFangSC-Regular; +} + +.bigImageDialog{ + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0,0,0,0.5); + text-align: center; + z-index: 1000000; + overflow-y: auto; + // padding-bottom: 50px; + height: 100%; + .bigImageContent{ + height: 100%; + margin:0 auto; text-align:center + } + img{ + // margin-top: 10%; + position: relative; + top: 10%; + max-height: 80%; + max-width: 80%; + } +} + +.margin_top35{ + margin-top: -35px; +} + +/deep/ .identity_card .el-upload-list__item-name { + width: 100px; + } + +.upload_btn_wrap{ + position: relative; + width: 100%; + .High_btn{ + position:absolute; + right: 70px; + top: 2px; + height: 28px; + } +} +.personItemBottom{ + margin-top: 10px; +} \ No newline at end of file diff --git a/src/views/projectFront/personnelPosition/personnelPositioning.vue b/src/views/projectFront/personnelPosition/personnelPositioning.vue new file mode 100644 index 00000000..cfc1e13e --- /dev/null +++ b/src/views/projectFront/personnelPosition/personnelPositioning.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectFront/personnelPosition/pointConfiguration.vue b/src/views/projectFront/personnelPosition/pointConfiguration.vue new file mode 100644 index 00000000..44ea2e49 --- /dev/null +++ b/src/views/projectFront/personnelPosition/pointConfiguration.vue @@ -0,0 +1,90 @@ + + +