diff --git a/config/index.js b/config/index.js index f911ec8..3e108d8 100644 --- a/config/index.js +++ b/config/index.js @@ -33,7 +33,9 @@ module.exports = { // }, '/api': { // target: 'http://10.6.0.26:81', - target: 'http://175.27.191.156:11000/api/', + // target: 'http://175.27.191.156:11000/api/', + target: 'http://175.27.191.156:8181/', + changeOrigin: true, pathRewrite: { '^/api': '' diff --git a/package-lock.json b/package-lock.json index 137d1f9..2aea3a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6548,6 +6548,11 @@ "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz", "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==" }, + "js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" + }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-3.0.2.tgz", diff --git a/package.json b/package.json index 17ca47e..8ff0d84 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "flv.js": "^1.6.2", "html2canvas": "^1.4.1", "js-cookie": "^3.0.1", + "js-md5": "^0.7.3", "jspdf": "^2.5.1", "moment": "^2.29.4", "mqtt": "^3.0.0", diff --git a/src/assets/cscs.png b/src/assets/cscs.png new file mode 100644 index 0000000..f3db0cc Binary files /dev/null and b/src/assets/cscs.png differ diff --git a/src/assets/cscs1.png b/src/assets/cscs1.png new file mode 100644 index 0000000..74cd3d5 Binary files /dev/null and b/src/assets/cscs1.png differ diff --git a/src/assets/cscs2.png b/src/assets/cscs2.png new file mode 100644 index 0000000..6b0409d Binary files /dev/null and b/src/assets/cscs2.png differ diff --git a/src/assets/loginImg/kuang1.png b/src/assets/loginImg/kuang1.png new file mode 100644 index 0000000..03d5a54 Binary files /dev/null and b/src/assets/loginImg/kuang1.png differ diff --git a/src/assets/loginImg/loginBg1.png b/src/assets/loginImg/loginBg1.png new file mode 100644 index 0000000..f7d3833 Binary files /dev/null and b/src/assets/loginImg/loginBg1.png differ diff --git a/src/assets/loginImg/loginBtn1.png b/src/assets/loginImg/loginBtn1.png new file mode 100644 index 0000000..86506c3 Binary files /dev/null and b/src/assets/loginImg/loginBtn1.png differ diff --git a/src/assets/pic/title1 (2).png b/src/assets/pic/title1 (2).png new file mode 100644 index 0000000..28dadaf Binary files /dev/null and b/src/assets/pic/title1 (2).png differ diff --git a/src/assets/pic/title1.png b/src/assets/pic/title1.png index 8034d82..9de446f 100644 Binary files a/src/assets/pic/title1.png and b/src/assets/pic/title1.png differ diff --git a/src/assets/pic/top.png b/src/assets/pic/top.png new file mode 100644 index 0000000..ee0e796 Binary files /dev/null and b/src/assets/pic/top.png differ diff --git a/src/components/common/BarChart.vue b/src/components/common/BarChart.vue index 8c17836..4d7c99e 100644 --- a/src/components/common/BarChart.vue +++ b/src/components/common/BarChart.vue @@ -189,6 +189,10 @@ export default { padding: this.yAxisPadding || [0, 40, -2, 6], fontSize: 12, }, + // max:200, + // min:0, + // splitNumber:200, + minInterval:1, axisLine: { show: true, lineStyle: { @@ -211,6 +215,7 @@ export default { axisTick: { show: false }, + }, series: [ { diff --git a/src/components/common/carousel.vue b/src/components/common/carousel.vue index 607d93b..b89d0d0 100644 --- a/src/components/common/carousel.vue +++ b/src/components/common/carousel.vue @@ -5,7 +5,7 @@
- +
@@ -21,6 +21,14 @@ import { Swiper, SwiperSlide } from "vue-awesome-swiper"; import "swiper/css/swiper.css"; export default { + props: { + // 父组件传递过来的图表数据 + peopleList:{ + type:Array, + required: true + } + + }, components: { Swiper, SwiperSlide, @@ -29,42 +37,43 @@ export default { const _self =this return { swiperList: [ - { - "apparatusLogo": require("@/assets/pic/23.png"), - "apparatusName": "激光云高仪1", - "apparatusImg": require("@/assets/pic/23.png"), - }, - { - "apparatusLogo": require("@/assets/pic/23.png"), - "apparatusName": "激光云高仪2", - "apparatusImg": require("@/assets/pic/23.png"), - }, - { - "apparatusLogo": require("@/assets/pic/23.png"), - "apparatusName": "激光云高仪3", - "apparatusImg": require("@/assets/pic/23.png"), - }, - { - "apparatusLogo": require("@/assets/pic/23.png"), - "apparatusName": "激光云高仪4", - "apparatusImg": require("@/assets/pic/23.png"), - }, - { - "apparatusLogo": require("@/assets/pic/23.png"), - "apparatusName": "激光云高仪5", - "apparatusImg": require("@/assets/pic/23.png"), - }, - { - "apparatusLogo": require("@/assets/pic/23.png"), - "apparatusName": "激光云高仪6", - "apparatusImg": require("@/assets/pic/23.png"), - }, - { - "apparatusLogo": require("@/assets/pic/23.png"), - "apparatusName": "激光云高仪7", - "apparatusImg": require("@/assets/pic/23.png"), - }, + // { + // "apparatusLogo": require("@/assets/pic/23.png"), + // "apparatusName": "激光云高仪1", + // "apparatusImg": require("@/assets/pic/23.png"), + // }, + // { + // "apparatusLogo": require("@/assets/pic/23.png"), + // "apparatusName": "激光云高仪2", + // "apparatusImg": require("@/assets/pic/23.png"), + // }, + // { + // "apparatusLogo": require("@/assets/pic/23.png"), + // "apparatusName": "激光云高仪3", + // "apparatusImg": require("@/assets/pic/23.png"), + // }, + // { + // "apparatusLogo": require("@/assets/pic/23.png"), + // "apparatusName": "激光云高仪4", + // "apparatusImg": require("@/assets/pic/23.png"), + // }, + // { + // "apparatusLogo": require("@/assets/pic/23.png"), + // "apparatusName": "激光云高仪5", + // "apparatusImg": require("@/assets/pic/23.png"), + // }, + // { + // "apparatusLogo": require("@/assets/pic/23.png"), + // "apparatusName": "激光云高仪6", + // "apparatusImg": require("@/assets/pic/23.png"), + // }, + // { + // "apparatusLogo": require("@/assets/pic/23.png"), + // "apparatusName": "激光云高仪7", + // "apparatusImg": require("@/assets/pic/23.png"), + // }, ], + peopleList:[], //轮播图配置项 swiperOption: { initialSlide: 0, @@ -125,6 +134,27 @@ export default { // Some Swiper option/callback... }, }; + }, + watch: { + // 监听父组件中的数据变化,重新触发Echarts + peopleList: { + deep: true, + handler (val) { + this.$nextTick(() => { + console.log("val",val) + // this.peopleList = val + // console.log("peopleList",this.peopleList) + if(val.length!=0){ + this.swiperList = val + console.log("swiperList",this.swiperList) + } + + }) + } + } + }, + mounted() { + }, methods: { slideChange() { diff --git a/src/components/common/lineBarChart.vue b/src/components/common/lineBarChart.vue index 7688d09..12449d4 100644 --- a/src/components/common/lineBarChart.vue +++ b/src/components/common/lineBarChart.vue @@ -101,12 +101,20 @@ export default { return { tooltip: { trigger: "axis", - axisPointer: { - type: "shadow", - label: { - show: false, + backgroundColor:'#1A5856', + // axisPointer: { + // type: "shadow", + // label: { + // show: false, + // }, + // }, + axisPointer: { + lineStyle: { + color: "rgba(227, 242, 252, 0.39)", + width: 30, + type: "solid", }, - }, + }, }, legend: [ diff --git a/src/components/common/mdScreenPie.vue b/src/components/common/mdScreenPie.vue index ae29ba0..5577355 100644 --- a/src/components/common/mdScreenPie.vue +++ b/src/components/common/mdScreenPie.vue @@ -102,7 +102,7 @@ export default { width: 120, height: 120, }, - left: "161", // + left: "153", // top: "97", //配置图片居中 }, ], @@ -111,7 +111,7 @@ export default { { type: "pie", radius: this.picIsShow ? ["53%", "65%"] : ["60%", "60%"], - center: ["50%", "157"], + center: ["48%", "157"], color: this.colorList, hoverAnimation: true, /// /设置饼图默认的展开样式 label: { @@ -140,7 +140,7 @@ export default { labelLine: { normal: { length: 5, - length2: 10, + length2: 7, show: false, }, }, diff --git a/src/components/common/pieChart.vue b/src/components/common/pieChart.vue index 1625321..8c0e63d 100644 --- a/src/components/common/pieChart.vue +++ b/src/components/common/pieChart.vue @@ -71,17 +71,19 @@ export default { }, methods: { initCharts(dataList) { + console.log("dataList",dataList) let myChart = this.$echarts.init(this.$refs.chart) var val1data2 = [] val1data2 = Object.keys(dataList).map((item,index)=>{ - return {name:dataList[item].post,value:dataList[item].percent} + return {name:dataList[item].post,value:dataList[item].number} + }) var arr = ['middleLost', 0.6, val1data2, '今日完成进度'] // 绘制图表 myChart.setOption({ tooltip:{ trigger:'item', - formatter: '{b}:{c}%', + formatter: '{b}:{c}人', }, graphic: { elements: [{ @@ -105,7 +107,7 @@ export default { hoverAnimation: true, /// /设置饼图默认的展开样式 label: { show: true, - formatter: '{b|{b}}:{c|{c}}%', + formatter: '{b|{b}}:{c|{c}}人', padding:[0,0,0,0], itemStyle: { // 此配置 normal: { diff --git a/src/components/common/pieDateChart.vue b/src/components/common/pieDateChart.vue index cce5635..e729ea5 100644 --- a/src/components/common/pieDateChart.vue +++ b/src/components/common/pieDateChart.vue @@ -1,7 +1,7 @@ @@ -140,9 +166,12 @@ import mqtt from "mqtt"; // mqtt协议 import Swiper from "@/components/common/carousel"; import Resize from "../utils/Resize.vue"; import axios from "axios"; +import Video from "./video"; import {getWeatherData} from "@/api/api"; +import Clickoutside from 'element-ui/src/utils/clickoutside' export default { name: "report", + directives: { Clickoutside }, components: { mdScreenPie, BarChart, @@ -155,12 +184,14 @@ export default { VideoSurveillanceComponents, VideoViewingComponents, Resize, + Video }, data() { return { weatherImg: require("@/assets/pic/sun.png"), videoName: "", //子传父的视频名称 videoId: "", //子传父的视频Id + thumbnail:'', //显示首页 indexShow: true, //人员管理 @@ -173,6 +204,7 @@ export default { progressShow: false, //安全管理 managementShow: false, + openTrue:true, //左上角 titLeftshow: false, japIndex: "人员管理", @@ -184,6 +216,7 @@ export default { weatherItem: {}, tienum: "", showType: true, + dialogShow: false, boxList: [ { c1: "开工", @@ -389,13 +422,14 @@ export default { ], vdaH: 0, type: false, - menuType: null, + menuType: 0, numberList: [5, 5], boxNone: true, topicSends:[], environmentData:[], closeIndexShow:true, - exitFullShow:false + exitFullShow:false, + src:'../static/flv/videoIndex.html' }; }, created() { @@ -409,21 +443,26 @@ export default { window.openBig = this.openBig; window.closeBig = this.closeBig; window.createMqtt = this.createMqtt; + window.gantDialog = this.gantDialog; }, methods: { + //查看甘特图 + gantDialog() { + this.dialogShow = true + }, createMqtt() { this.topicSends = ["/SC/pub/uwb", "/SC/pub/env"]; window.PubScribe(this.topicSends, this.realInfo); }, /** 实时数据分类 */ realInfo(topic, message) { - let time = new Date(); + // let time = new Date(); // console.log("topic",topic) switch (topic) { // 接收托片 case "/SC/pub/uwb": try { - // console.log("message", message) + console.log("message", message) const utf8decoder = new TextDecoder() const u8arr = new Uint8Array(message) const temp = utf8decoder.decode(u8arr) // 将二进制数据转为字符串 @@ -435,7 +474,7 @@ export default { break; case "/SC/pub/env": try { - // console.log("环境message", message) + console.log("环境message", message) const utf8decoder = new TextDecoder() const u8arr = new Uint8Array(message) const temp = utf8decoder.decode(u8arr) // 将二进制数据转为字符串 @@ -615,6 +654,7 @@ export default { this.titLeftshow = true; this.videoName = msg.videoName; this.videoId = msg.videoId; + this.thumbnail = msg.thumbnail; } }, tableRowClassName({ row, rowIndex }) { @@ -628,13 +668,29 @@ export default { openBig() { this.exitFullShow = true this.closeIndexShow = false + this.childBoxClick(this.menuType) document.getElementById("unityModule").contentWindow.fullScreen(); + this.openTrue =false }, //关闭放大 closeBig() { this.exitFullShow = false this.closeIndexShow = true + this.openTrue =true + this.childBoxClick(this.menuType) document.getElementById("unityModule").contentWindow.exitFullScreen(); + + }, + handleClickOutside(){ + console.log("cscscs") + // this.exitFullShow = false + // this.closeIndexShow = true + // if(this.menuType!=2){ + // console.log("this.menuType",this.menuType) + // this.childBoxClick(this.menuType) + // } + this.titLeftshow = true; + this.type = true; }, // 菜单点击 childBoxClick(val) { @@ -703,6 +759,22 @@ export default { // 俩秒之后让模块消失 this.$refs.switchBtn.style.display = "block"; }, 800); + }else if (val === 0) { + //人员管理 + // this.$router.push('/personnel') + this.japIndex = "首页"; + this.indexShow = true; + this.personnelShow = false; + this.videoSurveillanceShow = false; + this.videoViewingShow = false; + this.managementShow = false; + this.progressShow = false; + this.titLeftshow = false; + this.type = true; + setTimeout(() => { + // 俩秒之后让模块消失 + this.$refs.switchBtn.style.display = "block"; + }, 800); } }, switchDiv() { @@ -885,7 +957,45 @@ export default { animation-play-state: paused; } } +.gttBox { + // width: 863px; + // height: 60%; + width: 562px; + height: 34%; + position: absolute; + z-index: 999; + top: 582px; + // left: 50%; + right: -14%; + background: url("~@/assets/pic/ggt.png") no-repeat; + background-size: 100% 100%; + transform: translate(-50%, -50%); + @media only screen and (max-height: 1000px) { + // top: 522px; + top: 27%; + } + + .closeIcon { + width: 16px; + background: url("~@/assets/pic/close.png") no-repeat; + background-size: 100% 100%; + height: 16px; + color: #90F2EB; + float: right; + font-size: 50px; + cursor: pointer; + margin-right: 23px; + margin-top: 24px; + } +} +.tabGtBox { + position: absolute; + top: 50px; + width: 90%; + height: 80%; + padding: 0 40px; +} .smallBox { width: 105px; height: 28px; @@ -1298,7 +1408,7 @@ export default { span:nth-child(2) { display: inline-block; position: absolute; - right: 85px; + right: 92px; width: 18px; height: 18px; // background: url("~@/assets/pic/sun.png") no-repeat; @@ -1324,7 +1434,7 @@ export default { .header .title { width: 100%; height: 168px; - background: url("~@/assets/pic/title1.png") no-repeat; + background: url("~@/assets/pic/title1 (2).png") no-repeat; background-size: 100% 100%; position: absolute; } diff --git a/src/views/login.vue b/src/views/login.vue index af11d1e..7e61a02 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -10,15 +10,17 @@
{{ dateNew }} {{ getWeek }} {{ time }} - -   天气         + + {{ weatherItem.weather }}  {{ weatherItem.temperature @@ -30,13 +32,13 @@ @@ -66,13 +68,15 @@ import mdScreenPie from "@/components/common/mdScreenPie"; import Swiper from "@/components/common/carousel"; import Resize from '../utils/Resize.vue' import {getToken,getWeatherData} from "@/api/api"; +import md5 from 'js-md5'; export default { name: "report", components: { mdScreenPie, BarChart, Swiper, - Resize + Resize, + md5 }, data() { return { @@ -86,16 +90,17 @@ export default { temperature: "12", weather: "晴", weatherItem: {}, - param: { - username: 'dlgc_pic', - password: 'e19d5cd5af0378da05f63f891c7467af', - tenantId:'748495' - }, - // param: { - // username: '', - // password: '', - // tenantId:'' - // }, + // param: { + // username: 'dlgc_pic', + // // password: 'e19d5cd5af0378da05f63f891c7467af', + // password: 'abcd1234', + // tenantId:'748495' + // }, + param: { + username: '', + password: '', + tenantId:'748495' + }, checked: false, rules: { tenantId: [{ required: true, message: '账号Id不能为空', trigger: 'blur' }], @@ -139,10 +144,12 @@ export default { scope:'all', tenantId:this.param.tenantId, username:this.param.username, - password:this.param.password, + password:md5(this.param.password), + // password:this.param.password, type:"account" } getToken(data).then((res)=>{ + console.log("error_description",res) if (res.status == 200) { this.$message.success('登录成功'); // localStorage.setItem('ms_username', this.param.username); @@ -156,7 +163,12 @@ export default { JSON.stringify(res.data.user_name) ); }else{ - this.$message.error('请输入正确的登录信息!!!'); + console.log("error_description") + // this.$message.error('请输入正确的登录信息!!!'); + this.$message({ + message: res.data.error_description, + type: 'warning' + }); } }) @@ -335,7 +347,7 @@ getWeather () { .bgPicture { width: 100%; - background: url('../assets/loginImg/loginBg.png') no-repeat; + background: url('../assets/loginImg/loginBg1.png') no-repeat; background-size: 100% 100%; } @@ -381,7 +393,7 @@ getWeather () { span:nth-child(2) { display: inline-block; position: absolute; - right: 80px; + right: 92px; width: 17.5px; height: 18px; // background: url("~@/assets/pic/sun.png") no-repeat; @@ -394,7 +406,7 @@ getWeather () { .title { width: 100%; height: 168px; - background: url("~@/assets/pic/title1.png") no-repeat; + background: url("~@/assets/pic/title1 (2).png") no-repeat; background-size: 100% 100%; } @@ -622,6 +634,7 @@ getWeather () { /deep/ .el-table .success-row { background: transparent; } + diff --git a/src/views/video.vue b/src/views/video.vue index 0d0112c..b6d29e3 100644 --- a/src/views/video.vue +++ b/src/views/video.vue @@ -15,36 +15,36 @@ + + + + + +
+ + +
+ + + + diff --git a/static/unity/Build/YtzeWeb.data.unityweb b/static/unity/Build/YtzeWeb.data.unityweb index 0354f63..e1a5e2d 100644 Binary files a/static/unity/Build/YtzeWeb.data.unityweb and b/static/unity/Build/YtzeWeb.data.unityweb differ diff --git a/static/unity/Build/YtzeWeb.framework.js.unityweb b/static/unity/Build/YtzeWeb.framework.js.unityweb index 9b5913a..4b023d6 100644 Binary files a/static/unity/Build/YtzeWeb.framework.js.unityweb and b/static/unity/Build/YtzeWeb.framework.js.unityweb differ diff --git a/static/unity/Build/YtzeWeb.wasm.unityweb b/static/unity/Build/YtzeWeb.wasm.unityweb index e7e823c..0f17d4a 100644 Binary files a/static/unity/Build/YtzeWeb.wasm.unityweb and b/static/unity/Build/YtzeWeb.wasm.unityweb differ diff --git a/static/unity/StreamingAssets/Config/GeneralConstructionPlan.txt b/static/unity/StreamingAssets/Config/GeneralConstructionPlan.txt index dc5cc25..c492901 100644 --- a/static/unity/StreamingAssets/Config/GeneralConstructionPlan.txt +++ b/static/unity/StreamingAssets/Config/GeneralConstructionPlan.txt @@ -4,16 +4,60 @@ "total_days":"174", "time_nodes":[ { -"node":"2023/2/1", -"info":"开工" +"node":"2023/2/01", +"info":"土建_0" }, { -"node":"2023/3/1", -"info":"护栏拆除" +"node":"2023/2/8", +"info":"土建_1" }, { -"node":"2023/3/25", -"info":"放置预制砼" +"node":"2023/2/16", +"info":"土建_2" +}, +{ +"node":"2023/2/24", +"info":"土建_3" +}, +{ +"node":"2023/3/01", +"info":"土建_4" +}, +{ +"node":"2023/3/9", +"info":"土建_5" +}, +{ +"node":"2023/3/17", +"info":"土建_6" +}, +{ +"node":"2023/3/24", +"info":"土建_7" +}, +{ +"node":"2023/4/01", +"info":"土建_8" +}, +{ +"node":"2023/4/09", +"info":"土建_9" +}, +{ +"node":"2023/4/17", +"info":"土建_10" +}, +{ +"node":"2023/4/24", +"info":"土建_11" +}, +{ +"node":"2023/5/01", +"info":"电缆敷设_0" +}, +{ +"node":"2023/5/08", +"info":"电缆敷设_1" }, { "node":"2023/7/25", diff --git a/static/unity/StreamingAssets/Config/MyComponentData.txt b/static/unity/StreamingAssets/Config/MyComponentData.txt new file mode 100644 index 0000000..ca57247 --- /dev/null +++ b/static/unity/StreamingAssets/Config/MyComponentData.txt @@ -0,0 +1,646 @@ +[ + { + "id": "1644225456757981186", + "workContent": "土建_0", + "completeStatus": "完成", + "detail": [ + { + "componentId": "17e62d0b164e42a396b2aaee817170ba", + "componentType": "拆除护栏", + "componentName": "拆除护栏_0", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-02-01", + "plannedEndDate": "2023-02-07", + "actualCompletionTime": "2023-02-01", + "workStatus": "完成", + "workStatusCode": "ACCOMPLISH", + "positionInfo": "L_0_100", + "isLastProcess": 0 + }, + { + "componentId": "0fe56a5e85674b4fb276b228a1e5f405", + "componentType": "预制硂", + "componentName": "预制硂_0", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-02-01", + "plannedEndDate": "2023-02-07", + "actualCompletionTime": "2023-02-02", + "workStatus": "完成", + "workStatusCode": "ACCOMPLISH", + "positionInfo": "L_0_100", + "isLastProcess": 0 + }, + { + "componentId": "636c42fe8f0d4998bd6b511d3513a198", + "componentType": "电缆架桥", + "componentName": "电缆架桥_0", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-02-01", + "plannedEndDate": "2023-02-07", + "actualCompletionTime": "2023-02-06", + "workStatus": "完成", + "workStatusCode": "ACCOMPLISH", + "positionInfo": "L_0_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225456825090049", + "workContent": "土建_1", + "completeStatus": "完成", + "detail": [ + { + "componentId": "6ed83243d6524f7b9be6f46163066963", + "componentType": "拆除护栏", + "componentName": "拆除护栏_1", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-02-08", + "plannedEndDate": "2023-02-15", + "actualCompletionTime": "2023-02-09", + "workStatus": "完成", + "workStatusCode": "ACCOMPLISH", + "positionInfo": "L_1_100", + "isLastProcess": 0 + }, + { + "componentId": "1751611703ee4d3da598309cd6c612ca", + "componentType": "预制硂", + "componentName": "预制硂_1", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-02-08", + "plannedEndDate": "2023-02-15", + "actualCompletionTime": "2023-02-10", + "workStatus": "完成", + "workStatusCode": "ACCOMPLISH", + "positionInfo": "L_1_100", + "isLastProcess": 0 + }, + { + "componentId": "579c9a90503f4ac3a88328190b7825c9", + "componentType": "电缆架桥", + "componentName": "电缆架桥_1", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-02-08", + "plannedEndDate": "2023-02-15", + "actualCompletionTime": "2023-02-15", + "workStatus": "完成", + "workStatusCode": "ACCOMPLISH", + "positionInfo": "L_1_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225456888004609", + "workContent": "土建_2", + "completeStatus": "延期完成", + "detail": [ + { + "componentId": "5b311eac10494e60a0c8e17669a9b535", + "componentType": "拆除护栏", + "componentName": "拆除护栏_2", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-02-16", + "plannedEndDate": "2023-02-23", + "actualCompletionTime": "2023-02-16", + "workStatus": "完成", + "workStatusCode": "ACCOMPLISH", + "positionInfo": "L_2_100", + "isLastProcess": 0 + }, + { + "componentId": "2a32b299250a44d9b5c989fea0a2e4db", + "componentType": "预制硂", + "componentName": "预制硂_2", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-02-16", + "plannedEndDate": "2023-02-23", + "actualCompletionTime": "2023-02-20", + "workStatus": "完成", + "workStatusCode": "ACCOMPLISH", + "positionInfo": "L_2_100", + "isLastProcess": 0 + }, + { + "componentId": "0a75583dff6d494393c5af0558a5fd44", + "componentType": "电缆架桥", + "componentName": "电缆架桥_2", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-02-16", + "plannedEndDate": "2023-02-23", + "actualCompletionTime": "2023-02-25", + "workStatus": "延期完成", + "workStatusCode": "COMPLETE_DELAY", + "positionInfo": "L_2_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225456959307778", + "workContent": "土建_3", + "completeStatus": "进行中", + "detail": [ + { + "componentId": "e16cbdd80bc34d299c9cc9b59332af3a", + "componentType": "拆除护栏", + "componentName": "拆除护栏_3", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-02-24", + "plannedEndDate": "2023-02-28", + "actualCompletionTime": "2023-02-18", + "workStatus": "提前完成", + "workStatusCode": "COMPLETE_AHEAD", + "positionInfo": "L_3_100", + "isLastProcess": 0 + }, + { + "componentId": "24d16c360f324c0bbac89503fcf4435b", + "componentType": "预制硂", + "componentName": "预制硂_3", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-02-24", + "plannedEndDate": "2023-02-28", + "actualCompletionTime": "2023-02-25", + "workStatus": "完成", + "workStatusCode": "ACCOMPLISH", + "positionInfo": "L_3_100", + "isLastProcess": 0 + }, + { + "componentId": "5d7c56a5b6cf462e9a117ba7970016ed", + "componentType": "电缆架桥", + "componentName": "电缆架桥_3", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-02-24", + "plannedEndDate": "2023-02-28", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_3_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457034805250", + "workContent": "土建_4", + "completeStatus": "进行中", + "detail": [ + { + "componentId": "a97c2d358d69457c90f67efc2aa0d12f", + "componentType": "拆除护栏", + "componentName": "拆除护栏_4", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-03-01", + "plannedEndDate": "2023-03-08", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_4_100", + "isLastProcess": 0 + }, + { + "componentId": "41cefeccf0ca47ec8e4a552c910ab2ef", + "componentType": "预制硂", + "componentName": "预制硂_4", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-03-01", + "plannedEndDate": "2023-03-08", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_4_100", + "isLastProcess": 0 + }, + { + "componentId": "c617a3b8fa6443d0aeb2490c576db72a", + "componentType": "电缆架桥", + "componentName": "电缆架桥_4", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-03-01", + "plannedEndDate": "2023-03-08", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_4_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457127079937", + "workContent": "土建_5", + "completeStatus": "进行中", + "detail": [ + { + "componentId": "3bb814d6495c493784d21fbc13266b2f", + "componentType": "拆除护栏", + "componentName": "拆除护栏_5", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-03-09", + "plannedEndDate": "2023-03-16", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_5_100", + "isLastProcess": 0 + }, + { + "componentId": "2b553b260f3c4158bdaee4f66eaf2d96", + "componentType": "预制硂", + "componentName": "预制硂_5", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-03-09", + "plannedEndDate": "2023-03-16", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_5_100", + "isLastProcess": 0 + }, + { + "componentId": "d1626986b656443a83b9030b275c6dac", + "componentType": "电缆架桥", + "componentName": "电缆架桥_5", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-03-09", + "plannedEndDate": "2023-03-16", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_5_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457210966017", + "workContent": "土建_6", + "completeStatus": "进行中", + "detail": [ + { + "componentId": "88c143c5ba3043cba6ae433f27f4d57f", + "componentType": "拆除护栏", + "componentName": "拆除护栏_6", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-03-17", + "plannedEndDate": "2023-03-23", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_6_100", + "isLastProcess": 0 + }, + { + "componentId": "b58d3002322c43ed83151c5cdd15996c", + "componentType": "预制硂", + "componentName": "预制硂_6", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-03-17", + "plannedEndDate": "2023-03-23", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_6_100", + "isLastProcess": 0 + }, + { + "componentId": "4a551c80472d4b0daa4016c7573013e5", + "componentType": "电缆架桥", + "componentName": "电缆架桥_6", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-03-17", + "plannedEndDate": "2023-03-23", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_6_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457286463489", + "workContent": "土建_7", + "completeStatus": "进行中", + "detail": [ + { + "componentId": "6b984e092d2448c5a9993ca487793921", + "componentType": "拆除护栏", + "componentName": "拆除护栏_7", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-03-24", + "plannedEndDate": "2023-03-30", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_7_100", + "isLastProcess": 0 + }, + { + "componentId": "c076599492c840bb872b6b814b0fd004", + "componentType": "预制硂", + "componentName": "预制硂_7", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-03-24", + "plannedEndDate": "2023-03-30", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_7_100", + "isLastProcess": 0 + }, + { + "componentId": "9dcdc45b218b4d8098d98914c6630391", + "componentType": "电缆架桥", + "componentName": "电缆架桥_7", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-03-24", + "plannedEndDate": "2023-03-30", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_7_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457357766658", + "workContent": "土建_8", + "completeStatus": "进行中", + "detail": [ + { + "componentId": "95d59d46c154417187cb4434079c1c7f", + "componentType": "拆除护栏", + "componentName": "拆除护栏_8", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-04-01", + "plannedEndDate": "2023-04-08", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_8_100", + "isLastProcess": 0 + }, + { + "componentId": "7609a56e5bd84cbfafe0b6026523a806", + "componentType": "预制硂", + "componentName": "预制硂_8", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-04-01", + "plannedEndDate": "2023-04-08", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_8_100", + "isLastProcess": 0 + }, + { + "componentId": "22da43d9fc8044bbb4cab9d35f109292", + "componentType": "电缆架桥", + "componentName": "电缆架桥_8", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-04-01", + "plannedEndDate": "2023-04-08", + "actualCompletionTime": "", + "workStatus": "进行中", + "workStatusCode": "PROGRESS", + "positionInfo": "L_8_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457420681218", + "workContent": "土建_9", + "completeStatus": "未开始", + "detail": [ + { + "componentId": "c0fcbc96eabf4018a64593af07f8e421", + "componentType": "拆除护栏", + "componentName": "拆除护栏_9", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-04-09", + "plannedEndDate": "2023-04-16", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_9_100", + "isLastProcess": 0 + }, + { + "componentId": "396dced933bf4a41a76256f1677b72f1", + "componentType": "预制硂", + "componentName": "预制硂_9", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-04-09", + "plannedEndDate": "2023-04-16", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_9_100", + "isLastProcess": 0 + }, + { + "componentId": "ca90c040fdbd4a9dad7a196d762f56cc", + "componentType": "电缆架桥", + "componentName": "电缆架桥_9", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-04-09", + "plannedEndDate": "2023-04-16", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_9_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457487790081", + "workContent": "土建_10", + "completeStatus": "未开始", + "detail": [ + { + "componentId": "485dfbf53a4b4ad19cc51d7ed7cb5687", + "componentType": "拆除护栏", + "componentName": "拆除护栏_10", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-04-17", + "plannedEndDate": "2023-04-23", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_10_100", + "isLastProcess": 0 + }, + { + "componentId": "ff51914e5e9243d59144747a723b2410", + "componentType": "预制硂", + "componentName": "预制硂_10", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-04-17", + "plannedEndDate": "2023-04-23", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_10_100", + "isLastProcess": 0 + }, + { + "componentId": "2be6428dbc7442b9a7f032a369f15314", + "componentType": "电缆架桥", + "componentName": "电缆架桥_10", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-04-17", + "plannedEndDate": "2023-04-23", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_10_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457571676161", + "workContent": "土建_11", + "completeStatus": "未开始", + "detail": [ + { + "componentId": "5135fa666dad422d9cc14c7838f22919", + "componentType": "拆除护栏", + "componentName": "拆除护栏_11", + "componentTypeCode": "cchl", + "plannedStartDate": "2023-04-24", + "plannedEndDate": "2023-04-30", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_11_100", + "isLastProcess": 0 + }, + { + "componentId": "0362257709504d769875e93cf500dd07", + "componentType": "预制硂", + "componentName": "预制硂_11", + "componentTypeCode": "yzt", + "plannedStartDate": "2023-04-24", + "plannedEndDate": "2023-04-30", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_11_100", + "isLastProcess": 0 + }, + { + "componentId": "499567d5dd9d4bedaff32e77c44c0737", + "componentType": "电缆架桥", + "componentName": "电缆架桥_11", + "componentTypeCode": "dljq", + "plannedStartDate": "2023-04-24", + "plannedEndDate": "2023-04-30", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_11_100", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457642979329", + "workContent": "电缆敷设_0", + "completeStatus": "未开始", + "detail": [ + { + "componentId": "724dbab057f14b378ccf4433701bdd88", + "componentType": "电缆敷设", + "componentName": "电缆敷设_0", + "componentTypeCode": "dlfs", + "plannedStartDate": "2023-05-01", + "plannedEndDate": "2023-05-07", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_0_900", + "isLastProcess": 0 + }, + { + "componentId": "1b5ea1049ee545e68dcee28f484ae4c8", + "componentType": "电缆盖板", + "componentName": "电缆盖板_0", + "componentTypeCode": "dlgb", + "plannedStartDate": "2023-05-01", + "plannedEndDate": "2023-05-07", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_0_900", + "isLastProcess": 0 + }, + { + "componentId": "6b51c8f5b5834b0887074f54ddd6767f", + "componentType": "恢复护栏", + "componentName": "恢复护栏_0", + "componentTypeCode": "hfhl", + "plannedStartDate": "2023-05-01", + "plannedEndDate": "2023-05-07", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_0_900", + "isLastProcess": 1 + } + ] + }, + { + "id": "1644225457705893889", + "workContent": "电缆敷设_1", + "completeStatus": "未开始", + "detail": [ + { + "componentId": "bee0f074d11d476d907f55dc9ce93e68", + "componentType": "电缆敷设", + "componentName": "电缆敷设_1", + "componentTypeCode": "dlfs", + "plannedStartDate": "2023-05-08", + "plannedEndDate": "2023-05-15", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_1_900", + "isLastProcess": 0 + }, + { + "componentId": "73b87f88ce494fdfbc9ef86298a9ebb9", + "componentType": "电缆盖板", + "componentName": "电缆盖板_1", + "componentTypeCode": "dlgb", + "plannedStartDate": "2023-05-08", + "plannedEndDate": "2023-05-15", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_1_900", + "isLastProcess": 0 + }, + { + "componentId": "e167458070dd420f99e73442ccbf3741", + "componentType": "恢复护栏", + "componentName": "恢复护栏_1", + "componentTypeCode": "hfhl", + "plannedStartDate": "2023-05-08", + "plannedEndDate": "2023-05-15", + "actualCompletionTime": "", + "workStatus": "未开始", + "workStatusCode": "NOT_START", + "positionInfo": "L_1_900", + "isLastProcess": 1 + } + ] + } +] \ No newline at end of file diff --git a/static/unity/TemplateData/block.png b/static/unity/TemplateData/block.png new file mode 100644 index 0000000..945e79f Binary files /dev/null and b/static/unity/TemplateData/block.png differ diff --git a/static/unity/TemplateData/style.css b/static/unity/TemplateData/style.css index 4d402f4..e95d692 100644 --- a/static/unity/TemplateData/style.css +++ b/static/unity/TemplateData/style.css @@ -5,12 +5,21 @@ body { padding: 0; margin: 0 } #unity-canvas { background: #231F20 } .unity-mobile #unity-canvas { width: 100%; height: 100% } #unity-loading-bar { position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); display: none } -#unity-logo { width: 154px; height: 130px; background: url('unity-logo-dark.png') no-repeat center } +/* #unity-logo { width: 154px; height: 130px; background: url('unity-logo-dark.png') no-repeat center } */ +#unity-logo { width: 154px; height: 130px; } #unity-progress-bar-empty { width: 141px; height: 18px; margin-top: 10px; margin-left: 6.5px; background: url('progress-bar-empty-dark.png') no-repeat center } #unity-progress-bar-full { width: 0%; height: 18px; margin-top: 10px; background: url('progress-bar-full-dark.png') no-repeat center } #unity-footer { position: relative } .unity-mobile #unity-footer { display: none } -#unity-webgl-logo { float:left; width: 204px; height: 38px; background: url('webgl-logo.png') no-repeat center } +/* #unity-webgl-logo { float:left; width: 204px; height: 38px; background: url('webgl-logo.png') no-repeat center } */ +#unity-webgl-logo { float:left; width: 204px; height: 38px;} #unity-build-title { float: right; margin-right: 10px; line-height: 38px; font-family: arial; font-size: 18px } #unity-fullscreen-button { float: right; width: 38px; height: 38px; background: url('fullscreen-button.png') no-repeat center } #unity-warning { position: absolute; left: 50%; top: 5%; transform: translate(-50%); background: white; padding: 10px; display: none } +#black{ + position: absolute; + left: 26%; + top: 35%; + width: 50%; + height: 20%; background: url('block.png') no-repeat center +} diff --git a/static/unity/TemplateData/webgl-logo1.png b/static/unity/TemplateData/webgl-logo1.png new file mode 100644 index 0000000..338b1ae Binary files /dev/null and b/static/unity/TemplateData/webgl-logo1.png differ diff --git a/static/unity/index.html b/static/unity/index.html index 9c87710..9d89c8e 100644 --- a/static/unity/index.html +++ b/static/unity/index.html @@ -22,6 +22,9 @@
MqttTest
-->
+
+ +
diff --git a/vue.config.js b/vue.config.js index 3981bdc..31fcb4e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -50,7 +50,8 @@ module.exports = { host: myHost, proxy: { '/api': { //代理的名字 - target: 'http://175.27.191.156:11000/api/', + // target: 'http://175.27.191.156:11000/api/', + target: 'http://175.27.191.156:8181/', // target: 'http://172.16.1.178:5001/', // target: 'http://ht.api.umayle.com:2022', ws: true,