Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev
姜玉琦
commit
f001a76a55
|
|
@ -1,77 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh-cn">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>泾河路网</title>
|
||||
<!-- 第一步：先引入相关css及js文件 -->
|
||||
<link rel="stylesheet" href="/cesium/Widgets/widgets.css">
|
||||
<script src="/cesium/jquery-3.0.0.min.js"></script>
|
||||
<script src="/cesium/Cesium.js"></script>
|
||||
<script src="/cesium/BIMGISEngine.js"></script>
|
||||
<style>
|
||||
/* 第三步：容器样式，根据自身业务调整，这里只做参考 */
|
||||
html,
|
||||
body,
|
||||
#cesiumContainer {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<!-- 第二步：创建容器 -->
|
||||
<div id="cesiumContainer"></div>
|
||||
|
||||
<!-- 视图列表 -->
|
||||
<div class="panel">
|
||||
<div class="panel-heading">模型视图列表</div>
|
||||
<ul class="list-group layui-form">
|
||||
<input type="radio" lay-filter="view" name="view" value="house_rvt3dview4708954" title="3D视图" />
|
||||
<input type="radio" lay-filter="view" name="view" value="house_rvt" title="三维视图" checked />
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- 加载logo及遮罩层 -->
|
||||
<div id="box"></div>
|
||||
<div class="loading-shadow" id="LoadingShadow">
|
||||
<div class="loading-box mobile-loading-box">
|
||||
加载中....
|
||||
</div>
|
||||
</div>
|
||||
<!-- 第四步: 初始化Api -->
|
||||
<script src="/cesium/initApi.js"></script>
|
||||
<script>
|
||||
$(function () {
|
||||
// 第五步:加载模型
|
||||
window.initMap();
|
||||
window.mapApi.Model.add(
|
||||
"http://szgc.jhncidg.com:808/mapmodel/Tools/output/model/202308292207450987/root.glt",
|
||||
//"/cesium/output/model/202308292207450987/root.glt",
|
||||
'3a0d53cc-ad56-688c-e38d-f907088c2882',
|
||||
null,
|
||||
function (data) {
|
||||
if (Cesium.defined(data)) {
|
||||
if (Cesium.defined(data.obj) && data.obj instanceof Cesium.Cesium3DTileset) {
|
||||
//console.log(data);
|
||||
}
|
||||
}
|
||||
},
|
||||
function (data) {
|
||||
$("#box,#LoadingShadow").hide()
|
||||
});
|
||||
})
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh-cn">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>泾河路网</title>
|
||||
<!-- 第一步：先引入相关css及js文件 -->
|
||||
<link rel="stylesheet" href="/cesium/Widgets/widgets.css">
|
||||
<script src="/cesium/jquery-3.0.0.min.js"></script>
|
||||
<script src="/cesium/Cesium.js"></script>
|
||||
<script src="/cesium/BIMGISEngine.js"></script>
|
||||
<style>
|
||||
/* 第三步：容器样式，根据自身业务调整，这里只做参考 */
|
||||
html,
|
||||
body,
|
||||
#cesiumContainer {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<!-- 第二步：创建容器 -->
|
||||
<div id="cesiumContainer"></div>
|
||||
|
||||
<!-- 视图列表 -->
|
||||
<div class="panel">
|
||||
<div class="panel-heading">模型视图列表</div>
|
||||
<ul class="list-group layui-form">
|
||||
<input type="radio" lay-filter="view" name="view" value="house_rvt3dview4708954" title="3D视图" />
|
||||
<input type="radio" lay-filter="view" name="view" value="house_rvt" title="三维视图" checked />
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- 加载logo及遮罩层 -->
|
||||
<div id="box"></div>
|
||||
<div class="loading-shadow" id="LoadingShadow">
|
||||
<div class="loading-box mobile-loading-box">
|
||||
加载中....
|
||||
</div>
|
||||
</div>
|
||||
<!-- 第四步: 初始化Api -->
|
||||
<script src="initApi.js"></script>
|
||||
<script>
|
||||
$(function () {
|
||||
// 第五步:加载模型
|
||||
window.initMap();
|
||||
var api=window.mapApi
|
||||
window.mapApi.Model.add(
|
||||
//"http://szgc.jhncidg.com:808/mapmodel/tools/output/model/202308292209049711/root.glt",
|
||||
//'3a0d53cd-8774-6b32-a056-d69e2e12260e',
|
||||
"http://106.12.253.67:10045/Tools/output/model/202211250957169703/root.glt",
|
||||
"3a07beae-5c1c-17d4-f0c2-63cf4e4416b9",
|
||||
(data) => {
|
||||
if (Cesium.defined(data)) {
|
||||
if (Cesium.defined(data.obj) && data.obj instanceof Cesium.Cesium3DTileset) {}
|
||||
}
|
||||
},
|
||||
function (data) {
|
||||
$("#box,#LoadingShadow").hide()
|
||||
});
|
||||
api.Public.Event("LEFT_CLICK", function (click) {
|
||||
api.Feature.GetFeatureByEvent(click.position, function (json) {
|
||||
debugger
|
||||
if (json != undefined) {
|
||||
featureId = json.id.replace( '3a0d53cd-8774-6b32-a056-d69e2e12260e' + '^', '');
|
||||
mdldetailshow(featureId, 'type')
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
|
||||
|
||||
|
||||
function mdldetailshow(id, propertyTypeName) {
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: 'http://szgc.jhncidg.com:808/mapmodel/api/app/model/property-data-by-externalid',
|
||||
headers: {
|
||||
"Token": mapDefault.secretkey,
|
||||
'Content-Type': 'application/octet-stream'
|
||||
},
|
||||
data: {
|
||||
LightweightName: '202308292209049711',
|
||||
ExternalId: id
|
||||
},
|
||||
success: function (res) {
|
||||
debugger
|
||||
}});
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<el-row>
|
||||
<el-col :span="6" style="position: relative;">
|
||||
<module-one-2-1 label="集团项目总览" :key="elKey">
|
||||
<img src="images/icon2001.png" style="position: absolute;cursor: pointer;right: 0px;top: 8px;"
|
||||
<img src="images/icon2001.png" v-if="1==2" style="position: absolute;cursor: pointer;right: 0px;top: 8px;"
|
||||
@click="doShowDlg1">
|
||||
<div class="survey_title">
|
||||
<div class="survey_title_btn">
|
||||
|
|
@ -230,7 +230,6 @@ import '../components/staff-survey-chart'
|
|||
import indexDlg1 from './index/indexDlg1'
|
||||
import indexDlg2 from './index/indexDlg2'
|
||||
import indexDlg3 from './index/indexDlg3'
|
||||
import indexMap from './index/map.vue'
|
||||
import MonitAndWarning from './components/MonitAndWarning.vue'
|
||||
import journalismDlg from './dlg/journalismDlg.vue'
|
||||
import debounce from 'lodash.debounce'
|
||||
|
|
@ -243,7 +242,6 @@ export default {
|
|||
indexDlg1,
|
||||
indexDlg2,
|
||||
indexDlg3,
|
||||
indexMap,
|
||||
MonitAndWarning,
|
||||
journalismDlg,
|
||||
AttendanceDetailDialog,mapIndex,JobWorkerDialog
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
<template>
|
||||
<div id="index-map" style="width: 100%;height:100%;">
|
||||
<iframe src="maps/home.html" style="width: 100%;height:100%;border:none;" frameborder="0"></iframe>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'JhbigscreenMap',
|
||||
|
||||
data() {
|
||||
return {
|
||||
|
||||
};
|
||||
},
|
||||
|
||||
mounted() {
|
||||
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped></style>
|
||||
|
|
@ -26,13 +26,13 @@
|
|||
</module-one-2-1>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<module-one-1-1 :label="lablel3" :border="1" style="position: relative;">
|
||||
<module-one-1-1 :label="label3" :border="1" style="position: relative;">
|
||||
<img src="images/icon2001.png"
|
||||
style="position: absolute;cursor: pointer;right: 20px;top: 32px;z-index: 9;"
|
||||
@click="doStateDlg">
|
||||
<chart-bar :height="280" :optData="chart1Data" :fn="changeChart1" :key="elChart2"></chart-bar>
|
||||
</module-one-1-1>
|
||||
<module-one-1-1 label="项目审批排名" :border="1" class="chart2" style="position: relative;">
|
||||
<module-one-1-1 :label="label4" :border="1" class="chart2" style="position: relative;">
|
||||
<div class="scroll" style="margin-top: 30px;max-height: 240px;overflow-y: auto;">
|
||||
<table class="tb-list1">
|
||||
<tr>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<th>申请数量</th>
|
||||
<th>申请占比</th>
|
||||
</tr>
|
||||
<tr v-for="(it, idx) in list1" :key="idx">
|
||||
<tr v-for="(it, idx) in list2" :key="idx">
|
||||
<td>{{ it.no }}</td>
|
||||
<td>{{ it.name }}</td>
|
||||
<td>{{ it.value }}</td>
|
||||
|
|
@ -99,7 +99,8 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
label1: '项目标准化管理',
|
||||
lablel3: '审批进度',
|
||||
label3: '审批进度',
|
||||
label4:'项目审批排名',
|
||||
label6: '审批总数',
|
||||
label7: '已完成审批',
|
||||
label8: '待审批',
|
||||
|
|
@ -304,14 +305,14 @@ export default {
|
|||
chartData.push([this.addBr(o.title), o.total, o.uncomp, o.comp])
|
||||
})
|
||||
this.chart1Data = chartData;
|
||||
this.lablel3 = `审批进度 (${sum})`;
|
||||
this.label3 = `审批进度 (${sum})`;
|
||||
this.elChart2++;
|
||||
},
|
||||
showList2(res) {
|
||||
let tmps = (res.data || []).map((it, idx) => {
|
||||
return {
|
||||
no: idx + 1,
|
||||
id: it.businessKey,
|
||||
id: it.businessKey*1,
|
||||
name: it.businessKeyName,
|
||||
value: it.duration * 1,
|
||||
percent: 0
|
||||
|
|
@ -326,6 +327,7 @@ export default {
|
|||
d.percent = (d.value * 100.0 / sum).toFixed(2);
|
||||
});
|
||||
}
|
||||
this.label4=`项目审批排名 (${sum})`
|
||||
let objs = [];
|
||||
let prjIds = this.prjs.map(d => d.id).filter(d => d > 0);
|
||||
tmps.forEach(d => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue