Merge branch 'master' of https://git.lgzn.space/chengdandan/qiuwang
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 621 B After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div class="hotelApply wl-gantt">
|
||||
<el-table
|
||||
height="520"
|
||||
height="600"
|
||||
:data="tableData"
|
||||
class="tableListValue"
|
||||
:row-class-name="tableRowClassName"
|
||||
|
|
@ -12,26 +12,29 @@
|
|||
:cell-style="cellStyle"
|
||||
>
|
||||
<el-table-column
|
||||
prop="room"
|
||||
prop="name"
|
||||
label="任务名称"
|
||||
align="center"
|
||||
width="140px"
|
||||
fixed
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="beginTime"
|
||||
prop="startDate"
|
||||
label="开始时间"
|
||||
align="center"
|
||||
width="120px"
|
||||
fixed
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
prop="endDate"
|
||||
label="结束时间"
|
||||
align="center"
|
||||
width="120px"
|
||||
fixed
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
</el-table-column>
|
||||
|
|
@ -75,94 +78,75 @@ import quarterOfYear from "dayjs/plugin/quarterOfYear";
|
|||
dayjs.extend(quarterOfYear); //获取季度依赖
|
||||
dayjs.extend(isBetween);
|
||||
export default {
|
||||
props: {
|
||||
tableData: {
|
||||
type: Array,
|
||||
default: () => {
|
||||
return []
|
||||
}
|
||||
}
|
||||
},
|
||||
name: "",
|
||||
data() {
|
||||
return {
|
||||
tableData: [
|
||||
{
|
||||
id: 1,
|
||||
room: "公寓101",
|
||||
bedName: "1号床",
|
||||
beginTime: "2021-08-03",
|
||||
endTime: "2021-08-04",
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
room: "公寓101",
|
||||
bedName: "2号床",
|
||||
beginTime: "2021-08-04",
|
||||
endTime: "2021-08-5",
|
||||
liveList: []
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
room: "公寓102",
|
||||
bedName: "1号床",
|
||||
beginTime: "2021-08-05",
|
||||
endTime: "2021-08-7",
|
||||
liveList: []
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
room: "公寓102",
|
||||
bedName: "2号床",
|
||||
beginTime: "2021-08-01",
|
||||
endTime: "2021-08-3",
|
||||
liveList: []
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
room: "公寓103",
|
||||
bedName: "1号床",
|
||||
beginTime: "2021-08-06",
|
||||
endTime: "2021-08-8",
|
||||
liveList: []
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
room: "公寓103",
|
||||
bedName: "2号床",
|
||||
beginTime: "2021-08-7",
|
||||
endTime: "2021-08-9",
|
||||
liveList: []
|
||||
},
|
||||
// {
|
||||
// id: 7,
|
||||
// room: "公寓103",
|
||||
// bedName: "2号床",
|
||||
// beginTime: "2021-08-7",
|
||||
// endTime: "2021-08-9",
|
||||
// id: 1,
|
||||
// name: "公寓101",
|
||||
// bedName: "1号床",
|
||||
// startDate: "2021-08-03",
|
||||
// endDate: "2021-08-04",
|
||||
// liveList: []
|
||||
// },
|
||||
// {
|
||||
// id: 8,
|
||||
// room: "公寓103",
|
||||
// id: 2,
|
||||
// name: "公寓101",
|
||||
// bedName: "2号床",
|
||||
// beginTime: "2021-08-7",
|
||||
// endTime: "2021-08-9",
|
||||
// startDate: "2021-08-04",
|
||||
// endDate: "2021-08-5",
|
||||
// liveList: []
|
||||
// }, {
|
||||
// id:9,
|
||||
// room: "公寓103",
|
||||
// bedName: "2号床",
|
||||
// beginTime: "2021-08-7",
|
||||
// endTime: "2021-08-9",
|
||||
// },
|
||||
// {
|
||||
// id: 3,
|
||||
// name: "公寓102",
|
||||
// bedName: "1号床",
|
||||
// startDate: "2021-08-05",
|
||||
// endDate: "2021-08-7",
|
||||
// liveList: []
|
||||
// }, {
|
||||
// id: 17,
|
||||
// room: "公寓103",
|
||||
// },
|
||||
// {
|
||||
// id: 4,
|
||||
// name: "公寓102",
|
||||
// bedName: "2号床",
|
||||
// beginTime: "2021-08-7",
|
||||
// endTime: "2021-08-9",
|
||||
// startDate: "2021-08-01",
|
||||
// endDate: "2021-08-3",
|
||||
// liveList: []
|
||||
// },
|
||||
// {
|
||||
// id: 5,
|
||||
// name: "公寓103",
|
||||
// bedName: "1号床",
|
||||
// startDate: "2021-08-06",
|
||||
// endDate: "2021-08-8",
|
||||
// liveList: []
|
||||
// },
|
||||
// {
|
||||
// id: 6,
|
||||
// name: "公寓103",
|
||||
// bedName: "2号床",
|
||||
// startDate: "2021-08-7",
|
||||
// endDate: "2021-08-9",
|
||||
// liveList: []
|
||||
// },
|
||||
],
|
||||
showDrawer: false, //抽屉
|
||||
drawerForm: {},
|
||||
// 甘特图
|
||||
self_start_date: "2021-08-01", // 项目开始时间
|
||||
self_end_date: "2021-08-30", // 项目结束时间
|
||||
self_start_date_day: "", //项目开始时间的日期
|
||||
// self_start_date: "2021-08-01", // 项目开始时间
|
||||
// self_end_date: "2021-08-30", // 项目结束时间
|
||||
self_start_date: "2023-01-01", // 项目开始时间
|
||||
self_end_date: "2023-12-30", // 项目结束时间
|
||||
self_start_date_day: "2023-01-01", //项目开始时间的日期
|
||||
self_start_date_month: "", //项目开始时间的月份
|
||||
self_start_date_year: "", //项目开始时间的年份
|
||||
self_date_type: "monthAndDay" // 自身日期类型
|
||||
|
|
@ -203,8 +187,8 @@ export default {
|
|||
name: "name", // 任务名称字段
|
||||
id: "id", // id字段
|
||||
pid: "pid", // pid字段
|
||||
startDate: "beginTime", // 开始时间字段
|
||||
endDate: "endTime", // 结束时间字段
|
||||
startDate: "startDate", // 开始时间字段
|
||||
endDate: "endDate", // 结束时间字段
|
||||
realStartDate: "recordBeginTime", // 实际开始时间字段
|
||||
realEndDate: "recordEndTime", // 实际结束时间字段
|
||||
identityId: "identityId",
|
||||
|
|
@ -400,16 +384,17 @@ export default {
|
|||
}
|
||||
return months;
|
||||
}
|
||||
for (let i = start_num; i < end_num; i++) {
|
||||
// 无需要 日 的模式
|
||||
months.push({
|
||||
name: `${i}月`,
|
||||
date: i,
|
||||
full_date: `${year}-${i}`,
|
||||
id: uuidv4()
|
||||
});
|
||||
}
|
||||
return months;
|
||||
// for (let i = start_num; i < end_num; i++) {
|
||||
// // 无需要 日 的模式
|
||||
// months.push({
|
||||
// name: `${i}月`,
|
||||
// date: i,
|
||||
// full_date: `${year}-${i}`,
|
||||
// id: uuidv4()
|
||||
|
||||
// });
|
||||
// }
|
||||
// return months;
|
||||
},
|
||||
/**
|
||||
* 生成日期函数
|
||||
|
|
@ -421,48 +406,55 @@ export default {
|
|||
generationDays(year, month, isLeap = false, week = false) {
|
||||
let big_month = [1, 3, 5, 7, 8, 10, 12].includes(month);
|
||||
let small_month = [4, 6, 9, 11].includes(month);
|
||||
let dates_num = big_month ? 32 : small_month ? 31 : isLeap ? 30 : 29;
|
||||
// let dates_num = big_month ? 32 : small_month ? 31 : isLeap ? 30 : 29;
|
||||
// let days = [];
|
||||
// if (week) {
|
||||
// let _day = 1; // 从周日开始
|
||||
// let _start_day_inweek = this.timeInWeek(`${year}-${month}-1`);
|
||||
// if (_start_day_inweek !== 0) {
|
||||
// _day = 8 - _start_day_inweek;
|
||||
// }
|
||||
// for (let i = _day; i < dates_num; i += 7) {
|
||||
// days.push({
|
||||
// date: i,
|
||||
// name: `${month}月${i}日`,
|
||||
// id: uuidv4(),
|
||||
// full_date: `${year}-${month}-${i}`
|
||||
// });
|
||||
// }
|
||||
// } else {
|
||||
// //第一个月
|
||||
// if (
|
||||
// year == this.self_start_date_year &&
|
||||
// month == this.self_start_date_month
|
||||
// ) {
|
||||
// for (let i = this.self_start_date_day; i < dates_num; i++) {
|
||||
// days.push({
|
||||
// date: i,
|
||||
// name: `${month}月${i}日`,
|
||||
// id: uuidv4(),
|
||||
// full_date: `${year}-${month}-${i}`
|
||||
// });
|
||||
// }
|
||||
// //非第一个月
|
||||
// } else {
|
||||
// for (let i = 1; i < dates_num; i++) {
|
||||
// days.push({
|
||||
// date: i,
|
||||
// name: `${month}月${i}日`,
|
||||
// id: uuidv4(),
|
||||
// full_date: `${year}-${month}-${i}`
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
let days = [];
|
||||
if (week) {
|
||||
let _day = 1; // 从周日开始
|
||||
let _start_day_inweek = this.timeInWeek(`${year}-${month}-1`);
|
||||
if (_start_day_inweek !== 0) {
|
||||
_day = 8 - _start_day_inweek;
|
||||
}
|
||||
for (let i = _day; i < dates_num; i += 7) {
|
||||
days.push({
|
||||
date: i,
|
||||
name: `${i}日`,
|
||||
date: month,
|
||||
name: `${month}月`,
|
||||
id: uuidv4(),
|
||||
full_date: `${year}-${month}-${i}`
|
||||
full_date: `${year}-${month}`
|
||||
});
|
||||
}
|
||||
} else {
|
||||
//第一个月
|
||||
if (
|
||||
year == this.self_start_date_year &&
|
||||
month == this.self_start_date_month
|
||||
) {
|
||||
for (let i = this.self_start_date_day; i < dates_num; i++) {
|
||||
days.push({
|
||||
date: i,
|
||||
name: `${i}日`,
|
||||
id: uuidv4(),
|
||||
full_date: `${year}-${month}-${i}`
|
||||
});
|
||||
}
|
||||
//非第一个月
|
||||
} else {
|
||||
for (let i = 1; i < dates_num; i++) {
|
||||
days.push({
|
||||
date: i,
|
||||
name: `${i}日`,
|
||||
id: uuidv4(),
|
||||
full_date: `${year}-${month}-${i}`
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
return days;
|
||||
},
|
||||
/**
|
||||
|
|
@ -780,7 +772,7 @@ $gantt_item_half: 4px;
|
|||
}
|
||||
.tableListValue{
|
||||
width: 19vw;
|
||||
margin-left: 0.8vh;
|
||||
// margin-left: 0.8vh;
|
||||
//滚动条的宽高
|
||||
::-webkit-scrollbar {
|
||||
width: 1.1vh;
|
||||
|
|
@ -797,7 +789,9 @@ $gantt_item_half: 4px;
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
.el-table__body tr.hover-row.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell, .el-table__body tr.hover-row>td.el-table__cell {
|
||||
background-color: #2f807d!important;
|
||||
}
|
||||
.el-table {
|
||||
&.el-table--scrollable-y ::-webkit-scrollbar {
|
||||
display: none !important; //隐藏滚动条
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
</div>
|
||||
<div class="titRight">
|
||||
<span>{{dateNew}} {{getWeek}} {{time}}</span>
|
||||
<span></span>
|
||||
<span><img :src='weatherImg' alt="" style="width:100%;height:100%"></span>
|
||||
<span> 天气 </span>
|
||||
<span>{{weatherItem.weather}} {{weatherItem.temperature}}℃</span>
|
||||
</div>
|
||||
|
|
@ -111,6 +111,7 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
weatherImg:require("@/assets/pic/sun.png"),
|
||||
videoName:'', //子传父的视频名称
|
||||
videoId:'',//子传父的视频Id
|
||||
//显示首页
|
||||
|
|
@ -423,8 +424,14 @@ export default {
|
|||
methods: ''
|
||||
}).then(res => {
|
||||
this.weatherItem = res.data.lives[0];
|
||||
this.weatherImg = changeWeatherImg(res.data.lives[0].weather)
|
||||
});
|
||||
} ,
|
||||
},
|
||||
changeWeatherImg(weather){
|
||||
if(weather=='雾'){
|
||||
return require("@/assets/weather/sun.png")
|
||||
}
|
||||
},
|
||||
changeMessage(val) {
|
||||
this.tienum = val
|
||||
},
|
||||
|
|
|
|||
|
|
@ -164,8 +164,8 @@
|
|||
<span>计划进度</span>
|
||||
</div>
|
||||
<div class="tabGtBox">
|
||||
<!-- <tabGtt></tabGtt> -->
|
||||
<div class="ggtHeader">
|
||||
<TabGtt :tableData="tableData" ></TabGtt>
|
||||
<!-- <div class="ggtHeader">
|
||||
<div style="margin-left: 18px;">
|
||||
任务名称
|
||||
</div>
|
||||
|
|
@ -257,7 +257,7 @@
|
|||
<span>2011-11-22</span>
|
||||
<span style="left: 790px;width:18;"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -277,7 +277,7 @@ import lineBar from "@/components/common/lineBarChart";
|
|||
import pieChartUnImg from "@/components/common/pieChartUnImg";
|
||||
import pieDateChart from "@/components/common/pieDateChart";
|
||||
import Resize from '../utils/Resize.vue'
|
||||
import tabGtt from '@/components/common/tableGantt'
|
||||
import TabGtt from '@/components/common/tableGantt'
|
||||
import {getProjectInfo,getProjectDuration,getProjectInvestment,getPlanProgress,getActualProgress,getCompleteMonthStatus} from "@/api/api";
|
||||
|
||||
export default {
|
||||
|
|
@ -287,7 +287,7 @@ export default {
|
|||
lineBar,
|
||||
pieDateChart,
|
||||
Resize,
|
||||
tabGtt
|
||||
TabGtt
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -626,7 +626,8 @@ export default {
|
|||
.tabGtBox {
|
||||
position: absolute;
|
||||
top: 50px;
|
||||
|
||||
width: 96%;
|
||||
left: 20px;
|
||||
.ggtHeader {
|
||||
width: 820px;
|
||||
height: 60px;
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 76 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
body { padding: 0; margin: 0 }
|
||||
#unity-container { position: absolute;width: 1920px;height: 1080px; }
|
||||
#unity-container { position: absolute }
|
||||
#unity-container.unity-desktop { left: 50%; top: 50%; transform: translate(-50%, -50%) }
|
||||
#unity-container.unity-mobile { width: 100%; height: 100% }
|
||||
#unity-canvas { background: #231F20 }
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<link rel="stylesheet" href="TemplateData/style.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="unity-container" class="unity-desktop">
|
||||
<div id="unity-container" style="height: 100%;" class="unity-desktop">
|
||||
<canvas id="unity-canvas" ></canvas>
|
||||
<div id="unity-loading-bar">
|
||||
<div id="unity-logo"></div>
|
||||
|
|
@ -18,9 +18,9 @@
|
|||
</div>
|
||||
<div id="unity-warning"> </div>
|
||||
<div id="unity-footer">
|
||||
<div id="unity-webgl-logo"></div>
|
||||
<!-- <div id="unity-webgl-logo"></div>
|
||||
<div id="unity-fullscreen-button"></div>
|
||||
<div id="unity-build-title">MqttTest</div>
|
||||
<div id="unity-build-title">MqttTest</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
|
|
@ -109,14 +109,26 @@
|
|||
createUnityInstance(canvas, config, (progress) => {
|
||||
progressBarFull.style.width = 100 * progress + "%";
|
||||
}).then((unityInstance) => {
|
||||
unity = unityInstance
|
||||
loadingBar.style.display = "none";
|
||||
fullscreenButton.onclick = () => {
|
||||
unityInstance.SetFullscreen(1);
|
||||
};
|
||||
// fullscreenButton.onclick = () => {
|
||||
// unityInstance.SetFullscreen(1);
|
||||
// };
|
||||
}).catch((message) => {
|
||||
alert(message);
|
||||
});
|
||||
};
|
||||
|
||||
function fullScreen(){
|
||||
if(unity!=null){
|
||||
unity.SendMessage("GameManager",'FullScreen');
|
||||
}
|
||||
}
|
||||
function exitFullScreen(){
|
||||
if(unity!=null){
|
||||
unity.SendMessage("GameManager",'ExitFullScreen');
|
||||
}
|
||||
}
|
||||
document.body.appendChild(script);
|
||||
</script>
|
||||
</body>
|
||||
|
|
|
|||