diff --git a/yanzhu-bigscreen/public/css/login.css b/yanzhu-bigscreen/public/css/login.css index 4248e69d..b09ca250 100644 --- a/yanzhu-bigscreen/public/css/login.css +++ b/yanzhu-bigscreen/public/css/login.css @@ -31,13 +31,6 @@ body{ position: relative; overflow: auto; } -.login-bgd{ - position: relative; - height: 100%; - width:1400px; - background: url("../images/login_bgd.png") no-repeat 50%; - background-size: cover; -} .login-max{ height: 100%; position: relative; diff --git a/yanzhu-bigscreen/public/images/830.png b/yanzhu-bigscreen/public/images/830.png deleted file mode 100644 index ea1196bc..00000000 Binary files a/yanzhu-bigscreen/public/images/830.png and /dev/null differ diff --git a/yanzhu-bigscreen/public/images/gongdi.jpeg b/yanzhu-bigscreen/public/images/gongdi.jpeg deleted file mode 100644 index ac78f2dc..00000000 Binary files a/yanzhu-bigscreen/public/images/gongdi.jpeg and /dev/null differ diff --git a/yanzhu-bigscreen/public/images/login_bgd.png b/yanzhu-bigscreen/public/images/login_bgd.png deleted file mode 100644 index f19e233d..00000000 Binary files a/yanzhu-bigscreen/public/images/login_bgd.png and /dev/null differ diff --git a/yanzhu-bigscreen/public/images/login_bgd1.jpg b/yanzhu-bigscreen/public/images/login_bgd1.jpg deleted file mode 100644 index 1a4d2272..00000000 Binary files a/yanzhu-bigscreen/public/images/login_bgd1.jpg and /dev/null differ diff --git a/yanzhu-bigscreen/public/images/sjk.jpg b/yanzhu-bigscreen/public/images/sjk.jpg deleted file mode 100644 index 21fb9220..00000000 Binary files a/yanzhu-bigscreen/public/images/sjk.jpg and /dev/null differ diff --git a/yanzhu-bigscreen/src/views/bim/briefingTools.js b/yanzhu-bigscreen/src/views/bim/briefingTools.js index b2145fe8..b01ff7a5 100644 --- a/yanzhu-bigscreen/src/views/bim/briefingTools.js +++ b/yanzhu-bigscreen/src/views/bim/briefingTools.js @@ -69,37 +69,62 @@ function getProperty(that) { }); } +function getModelUnit(that, modelId) { + let find = that.models.find((d) => d.modelId == modelId); + return find ? find.unit || 1.0 : 1.0; +} + /** * 获取构件尺寸信息 */ function subFeatureSize(that) { + let api = bimBriefingApi; + let result = [ + { name: "构建尺寸", data: [] }, + { name: "构建表面积", data: [] }, + { name: "构建体积", data: [] }, + ]; + that.info = []; + api.Public.clearHandler(), api.Measurement.clearAllTrace(); + api.Feature.getByEvent(true, (n) => { + if (n && n["id"]) { + let featureId = n.id; + let modelId = featureId.split("^")[0]; + let unit = getModelUnit(that, modelId); + clearSelectFeature(that); + api.Feature.getGeometrySizeById(featureId, (res) => { + let size = res.size || {}; + let x = (size.x || 0) * unit * 1.0; + let y = (size.y || 0) * unit * 1.0; + let z = (size.z || 0) * unit * 1.0; + result[0].data = [ + { name: "长", value: x.toFixed(2) + "" }, + { name: "宽", value: y.toFixed(2) + "" }, + { name: "高", value: z.toFixed(2) + "" }, + ]; + result[1].data = [{ name: "面积", value: (x * y).toFixed(2) + "" }]; + result[2].data = [{ name: "体积", value: (x * y * z).toFixed(2) }]; + api.Feature.setColor(featureId, "rgba(255,0,255,1)", modelId); + that.selFeatureId = featureId; + that.info = result; + // api.Measurement.featureArea(featureId, (res) => { + // result[1].data = [{ name: "面积", value: ((+res || 0) * unit * unit * 1.0).toFixed(2) + "" }]; + // api.Measurement.featureVolume(featureId, (res) => { + // result[2].data = [{ name: "体积", value: ((+res || 0) * unit * unit * unit * 1.0).toFixed(2) }]; + // api.Feature.setColor(featureId, "rgba(255,0,255,1)", modelId); + // that.selFeatureId = featureId; + // that.info=result + // }); + // }); + }); + } + }); +} +//构件面积 +function measurementArea(that) { let api = bimBriefingApi; that.info = []; api.Public.clearHandler(), api.Measurement.clearAllTrace(); - api.Feature.getByEvent(true, (n) => { - console.log(n); - if (n && n["id"]) { - let featureId = n.id; - let modelId = featureId.split("^")[0]; - clearSelectFeature(that); - api.Feature.getGeometrySizeById(featureId, (res) => { - let size = res.size || {}; - that.info = [ - { name: "长", value: (size.x || 0).toFixed(2) + "" }, - { name: "宽", value: (size.y || 0).toFixed(2) + "" }, - { name: "高", value: (size.z || 0).toFixed(2) + "" }, - ]; - api.Feature.setColor(featureId, "rgba(255,0,255,1)", modelId); - that.selFeatureId = featureId; - }); - } - }); -} -//构件面积 -function measurementArea(that) { - let api = bimBriefingApi; - that.info = []; - api.Public.clearHandler(), api.Measurement.clearAllTrace(); api.Feature.getByEvent(true, (n) => { console.log(n); if (n && n["id"]) { @@ -107,9 +132,7 @@ function measurementArea(that) { let modelId = featureId.split("^")[0]; clearSelectFeature(that); api.Measurement.featureArea(featureId, (res) => { - that.info = [ - { name: "面积", value: (+res || 0).toFixed(2) + "" } - ]; + that.info = [{ name: "面积", value: (+res || 0).toFixed(2) + "" }]; api.Feature.setColor(featureId, "rgba(255,0,255,1)", modelId); that.selFeatureId = featureId; }); @@ -118,23 +141,15 @@ function measurementArea(that) { } //构件体积 -function measuringVolume(that){ - -} +function measuringVolume(that) {} //构件距离 -function distance(that){ - -} +function distance(that) {} //剖切 -function initClipping(that){ - -} +function initClipping(that) {} //构件隐藏 -function actorVisible(){ - -} +function actorVisible() {} export default { measurementArea, diff --git a/yanzhu-bigscreen/src/views/bimBriefing.vue b/yanzhu-bigscreen/src/views/bimBriefing.vue index 98ba4004..79282b8f 100644 --- a/yanzhu-bigscreen/src/views/bimBriefing.vue +++ b/yanzhu-bigscreen/src/views/bimBriefing.vue @@ -67,12 +67,22 @@ @@ -116,14 +126,14 @@
- +
-
+
@@ -131,7 +141,7 @@
-
+
@@ -226,9 +236,9 @@ export default { methods: { doSelectMenu(index) { this.selectMenu = index; - if(window.bimBriefingApi){ - let api = bimBriefingApi; - api.Feature.getByEvent(false); + if (window.bimBriefingApi) { + let api = bimBriefingApi; + api.Feature.getByEvent(false); } briefingTools.clearSelectFeature(this); switch (index) { @@ -238,7 +248,7 @@ export default { break; case 1: briefingTools.subFeatureSize(this); - this.title = "尺寸测量"; + this.title = "构建测量"; break; case 2: briefingTools.measurementArea(this); @@ -345,13 +355,13 @@ export default { }, initEngine() { this.elId++; - this.modelTrees=[]; - this.models=[]; - this.propertyAttr=[]; - this.propertyType=[]; - this.viewPoint=[]; + this.modelTrees = []; + this.models = []; + this.propertyAttr = []; + this.propertyType = []; + this.viewPoint = []; this.info=[]; - this.attributeInformation=""; + this.attributeInformation = ""; setTimeout(() => { this.loadEngine(); }, 10); @@ -446,6 +456,7 @@ export default { this.models .map((d) => { d.gis = JSON.parse(d.gisJson); + d.modelId = d.lightweightName; return d; }) .forEach((d) => { @@ -601,7 +612,7 @@ export default { position: absolute; top: calc(80vh - 50px); left: 50%; - margin-left: -200px; + margin-left: -150px; display: flex; background: #00000080; border-radius: 10px; diff --git a/yanzhu-bigscreen/src/views/bimManage.vue b/yanzhu-bigscreen/src/views/bimManage.vue index 9e66d135..dad73ef7 100644 --- a/yanzhu-bigscreen/src/views/bimManage.vue +++ b/yanzhu-bigscreen/src/views/bimManage.vue @@ -1019,6 +1019,7 @@ export default { position: absolute; top: calc(80vh - 50px); left: 50%; + margin-left:-170px; display: flex; background: #00000080; border-radius: 10px; diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java index 6d05d8b0..6cd7e264 100755 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java @@ -54,6 +54,9 @@ public class BimModelInfo extends BaseEntity @Excel(name = "模型文件类型") private String fileType; + @Excel(name = "单位") + private Double unit; + /** 文件大小 */ @Excel(name = "文件大小") private Long fileSize; @@ -65,6 +68,14 @@ public class BimModelInfo extends BaseEntity private String projectName; private String deptName; + public Double getUnit() { + return unit; + } + + public void setUnit(Double unit) { + this.unit = unit; + } + public String getComName() { return comName; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml index 7fc9cf3c..69027f15 100755 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select bmi.model_id, bmi.com_id, bmi.project_id, sp.dept_name projectName, - sd.dept_name com_name,pd.sub_dept_name dept_name, + sd.dept_name com_name,pd.sub_dept_name dept_name,bmi.unit, bmi.dept_id, bmi.model_name, bmi.lightweightName, bmi.gis_json, bmi.model_status, bmi.model_type, bmi.file_type, bmi.file_size, bmi.show_sand, bmi.status, bmi.remark, bmi.create_by, bmi.create_time, bmi.update_by, bmi.update_time,bmi.is_del from bim_model_info bmi @@ -78,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" model_type, file_type, file_size, + unit, show_sand, status, remark, @@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{modelType}, #{fileType}, #{fileSize}, + #{unit}, #{showSand}, #{status}, #{remark}, @@ -120,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" model_type = #{modelType}, file_type = #{fileType}, file_size = #{fileSize}, + unit = #{unit}, show_sand = #{showSand}, is_del = #{isDel}, status = #{status}, diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index 5c1a6546..92236f1d 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -319,6 +319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pro_project_info_subdepts_users WHERE use_status = 0 + and approve_status >= 100 and com_id = #{comId} and project_id = #{projectId} GROUP BY diff --git a/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue b/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue index 2070968c..92da18b4 100755 --- a/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue +++ b/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue @@ -1,349 +1,371 @@ diff --git a/yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue b/yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue index 57c67204..db1692c5 100644 --- a/yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue +++ b/yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue @@ -94,13 +94,11 @@ export default { devices: [], positionByModalId: "", selItem: null, - iconVideo: "", addLabels: [], viewPoint:null, }; }, created() { - this.iconVideo = icons["video"]; emitter.on("routeChanged", ({ to, from }) => { if (to.name === "SandTableSetting") { this.initEngine();