admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev

Browse Source
This commit is contained in:
骆乐 2022-09-09 16:14:48 +08:00
commit 67fb79b8f4
7 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pages/index/index.js
View File

@ -114,7 +114,7 @@ if (COMPANY == 'xingxuan') {
} }
function 沙悟净(data, sn) { function handler(data, sn) {
console.log(data, 'dllmhjc'); console.log(data, 'dllmhjc');
window._paq.push(['trackEvent', '点击', '登录', '登录账号']) window._paq.push(['trackEvent', '点击', '登录', '登录账号'])
axios.defaults.headers.common['Authorization'] = 'Bearer' + ' ' + data.token axios.defaults.headers.common['Authorization'] = 'Bearer' + ' ' + data.token
@ -234,19 +234,19 @@ router.beforeEach((to, form, next) => {
const direction = to.query.direction const direction = to.query.direction
if (direction) { if (direction) {
const info = JSON.parse(decode(direction)) const info = JSON.parse(decode(direction))
const 孙悟空 = { account: info.acount, password: info.pwd } const account = { account: info.acount, password: info.pwd }
const 猪八戒 = res => { const tentative = res => {
沙悟净(res.result, info.projectSn) handler(res.result, info.projectSn)
return next({ path: to.path }) return next({ path: to.path })
} }
if (LOGINTYPE == 1) { if (LOGINTYPE == 1) {
loginApi(孙悟空).then(猪八戒) loginApi(account).then(tentative)
} else if (LOGINTYPE == 2) { } else if (LOGINTYPE == 2) {
companyLoginApi(孙悟空).then(猪八戒) companyLoginApi(account).then(tentative)
} else if (LOGINTYPE == 3) { } else if (LOGINTYPE == 3) {
projectLoginApi(孙悟空).then(猪八戒) projectLoginApi(account).then(tentative)
} }
} else { } else {

1
src/views/projectAdmin/zjsj/command/center.vue
View File

@ -102,6 +102,7 @@ export default {
font-weight: bold; font-weight: bold;
.label { .label {
margin-right: 10px; margin-right: 10px;
white-space: nowrap;
color: #002636; color: #002636;
} }

9
src/views/projectAdmin/zjsj/command/leftFour.vue
View File

@ -342,24 +342,23 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
white-space: nowrap; white-space: nowrap;
// transform: translateY(-15px);
.item { .item {
display: inline-block; display: inline-block;
width: calc(100% / 2); width: calc(100% / 2);
height: 100%; height: 120%;
color: transparent; color: transparent;
&:nth-child(1) { &:nth-child(1) {
transform: translate(-24%, 0%); transform: translate(-24%, -6%);
} }
&:nth-child(2) { &:nth-child(2) {
transform: translate(-48%, 0%); transform: translate(-48%, -6%);
} }
&:nth-child(3) { &:nth-child(3) {
transform: translate(-75%, 0%); transform: translate(-75%, -6%);
} }
} }
} }

2
src/views/projectAdmin/zjsj/command/rightFour.vue
View File

@ -99,7 +99,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
border-left: 4px solid #66d3d8; border-left: 4px solid #66d3d8;
margin-bottom: 5px; margin-bottom: 5px;
padding: 6px 0; padding: 10px 0;
width: 100%; width: 100%;
background-image: linear-gradient(to right, #3b7589, #212c3e); background-image: linear-gradient(to right, #3b7589, #212c3e);
font-size: 12px; font-size: 12px;

2
src/views/projectAdmin/zjsj/command/rightThree.vue
View File

@ -15,7 +15,7 @@
<div class="right list"> <div class="right list">
<el-row class="list-item" type="flex" justify="space-between" align="middle" v-for="(item, key) in rightList" :key="key"> <el-row class="list-item" type="flex" justify="space-between" align="middle" v-for="(item, key) in rightList" :key="key">
<el-col :span="6"> <el-col :span="6">
<img style="width: 16px; height: auto" :src="item.image" /> <img style="width: 18px;" :src="item.image" />
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="label">{{ item.label }}</div> <div class="label">{{ item.label }}</div>

11
src/views/projectAdmin/zjsj/command/rightTwo.vue
View File

@ -205,7 +205,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
border-left: 4px solid #66d3d8; border-left: 4px solid #66d3d8;
margin-bottom: 5px; margin-bottom: 5px;
padding: 5px 0; padding: 7px 0;
width: 100%; width: 100%;
background-image: linear-gradient(to right, #3b7589, #212c3e); background-image: linear-gradient(to right, #3b7589, #212c3e);
font-size: 12px; font-size: 12px;
@ -215,7 +215,7 @@ export default {
white-space: nowrap; white-space: nowrap;
&:hover { &:hover {
padding: 10px 0; padding: 15px 0;
&::before { &::before {
content: ''; content: '';
position: absolute; position: absolute;
@ -229,10 +229,9 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
transition: all .3s; transition: all .3s;
} }
} .value {
color: #c2805f;
&:hover .value { }
color: #c2805f;
} }
&:last-child { &:last-child {

65
src/views/projectAdmin/zjsj/index.vue
View File

@ -1,42 +1,40 @@
<template> <template>
<vue-scroll> <div class="zjsj-large-screen">
<div class="zjsj-large-screen"> <div class="header">
<div class="header"> <div class="info">
<div class="info"> <div class="between">
<div class="between"> <div class="project">中建科创大厦项目</div>
<div class="project">中建科创大厦项目</div> <div class="time-week">
<div class="time-week"> <div class="time">15:32:39</div>
<div class="time">15:32:39</div> <div class="week">星期二</div>
<div class="week">星期二</div>
</div>
<div class="weather-date">
<div class="weather">多云 32℃</div>
<div class="date">2022-09-09</div>
</div>
</div> </div>
<div class="title">中建四局数字建造平台</div> <div class="weather-date">
<div class="between"> <div class="weather">多云 32℃</div>
<div class="company"></div> <div class="date">2022-09-09</div>
<div class="exit" @click="$router.push('/projectIndex')"></div>
</div> </div>
</div> </div>
<div class="tabs"> <div class="title">中建四局数字建造平台</div>
<div <div class="between">
class="tab" <div class="company"></div>
:class="{ checked: $route.path === menu.modulePath }" <div class="exit" @click="$router.push('/projectIndex')"></div>
v-for="(menu, index) in menus"
:key="index"
@click="handleMenu(menu.modulePath)"
>
{{ menu.moduleName }}
</div>
</div> </div>
</div> </div>
<div class="content"> <div class="tabs">
<router-view></router-view> <div
class="tab"
:class="{ checked: $route.path === menu.modulePath }"
v-for="(menu, index) in menus"
:key="index"
@click="handleMenu(menu.modulePath)"
>
{{ menu.moduleName }}
</div>
</div> </div>
</div> </div>
</vue-scroll> <div class="content">
<router-view></router-view>
</div>
</div>
</template> </template>
<script> <script>
@ -59,10 +57,9 @@ export default {
@import url("./style.less"); @import url("./style.less");
.zjsj-large-screen { .zjsj-large-screen {
width: 100%; width: 100%;
// height: 100%; height: 100%;
color: #fff; color: #fff;
background-color: #182337; background-color: #182337;
overflow-y: scroll;
.header { .header {
width: 100%; width: 100%;
height: 110px; height: 110px;
@ -160,7 +157,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding: 12px 20px; padding: 12px 20px;
width: 100%; width: 100%;
height: calc(1080px - 110px); height: calc(100% - 110px);
} }
} }