Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Viewer/smViewer.vue

@@ -305,20 +305,20 @@ export default {
     // }, 1000);
 
     //加载体育场模型
-    var promisse11w = scene.open(
-      "http://192.168.1.30:8091/iserver/services/3D-Baopo-2/rest/realspace",
-      "BPCache"
-    );
-    Cesium.when(promisse11w, function () {
-      scene.layers.find("夜晚").visible = false;
-
-      //查找水面图层
-      var waterLayer = scene.layers.find("水系");
-      var style = new Cesium.Style3D();
-      style.bottomAltitude = 2;
-      //设置水面图层的底部高程，确保水面与模型贴合
-      waterLayer.style3D = style;
-    });
+    // var promisse11w = scene.open(
+    //   "http://192.168.1.30:8091/iserver/services/3D-Baopo-2/rest/realspace",
+    //   "BPCache"
+    // );
+    // Cesium.when(promisse11w, function () {
+    //   scene.layers.find("夜晚").visible = false;
+
+    //   //查找水面图层
+    //   var waterLayer = scene.layers.find("水系");
+    //   var style = new Cesium.Style3D();
+    //   style.bottomAltitude = 2;
+    //   //设置水面图层的底部高程，确保水面与模型贴合
+    //   waterLayer.style3D = style;
+    // });
 
 
   },

src/views/ConstructionApplication3D/billboard/addBiillboardModel.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 100%; padding: 10px">
+  <div style="height: 100%; padding: 10px; color: white">
     <el-row>
       <span>模型名称：</span
       ><el-input
@@ -242,6 +242,8 @@ export default {
         rotateX: 90,
         rotateY: 0,
         rotateZ: 0,
+        ReviewStatus: "",
+        ReviewComments: "",
       },
       options: window.billboardReviewList,
       /**

src/views/ConstructionApplication3D/billboard/billboardCheckList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 400px; padding: 5px; font-size: 10px">
+  <div style="width: 400px; padding: 5px; font-size: 10px; color: white">
     <el-row>
       <el-col :span="12">
         <el-col :span="12">广告位：</el-col>

src/views/ConstructionApplication3D/billboard/billboardChekInfo.vue

@@ -161,7 +161,7 @@ export default {
                           units: "kilometers",
                         }) * 1000
                       ).toFixed(4);
-                      let jl = Number(distance) + that.info.zL / 2;
+                      let jl = Number(distance - 0.6) + that.info.zL / 2;
                       if (jl > 0.5) {
                         ruleResult = "false";
                       } else {
@@ -194,9 +194,10 @@ export default {
                         (c) => c.label == "FLOORH"
                       );
                       //广告上沿高度
-                      let ggsygd = that.info.z + that.info.yL / 2;
+                      let ggsygd1 =
+                        Number(that.info.z) + Number(that.info.yL) / 2;
                       if (FLOORH && FLOORH.value) {
-                        if (Number(FLOORH.value) > ggsygd) {
+                        if (Number(FLOORH.value) > ggsygd1) {
                           if (Number(FLOORH.value) <= 4.5) {
                             if (that.info.yL <= 1.5) {
                               ruleResult = "true";
@@ -232,7 +233,7 @@ export default {
                         }) * 1000
                       ).toFixed(4);
 
-                      var jl1 = Number(distance1) + that.info.zL / 2;
+                      var jl1 = Number(distance1 - 0.8) + that.info.zL / 2;
                       if (jl1 > 0.3) {
                         ruleResult = "false";
                       } else {
@@ -246,7 +247,7 @@ export default {
                 }
                 ReviewItem.ruleResult = ruleResult;
               } else {
-                ReviewItem.ruleResult = "";
+                ReviewItem.ruleResult = "1";
               }
 
               that.tableData.push(ReviewItem);
@@ -259,13 +260,28 @@ export default {
      * 审核状态提交
      */
     setReview(isPass) {
+      let that = this;
       let item = window.billboardModelList.find((c) => c.id == this.info.id);
       item.ReviewComments = this.ReviewComments;
       if (isPass) {
+        let sd = that.tableData.find(
+          (c) => c.ruleResult == "false" || c.ruleResult == "1"
+        );
+        if (sd) {
+          this.$message({
+            message: "存在不符合项，请整改后重新审查",
+            type: "warning",
+          });
+          return;
+        }
         item.ReviewStatus = "已通过";
       } else {
         item.ReviewStatus = "未通过";
       }
+      this.$message({
+        message: "审查完成",
+        type: "success",
+      });
       this.lyoption.cancel();
       this.$layer.close(this.layerid);
     },

src/views/ConstructionApplication3D/billboard/billboardDesign.vue

@@ -28,7 +28,7 @@
               <span>{{ item.checkDate }}</span></el-row
             >
             <el-row style="display: flex">
-              <el-col class="containersd hover_style" style="cursor: pointer">
+              <el-col class="con-col hover_style" style="cursor: pointer">
                 <i
                   style="font-size: 2rem"
                   class="el-icon-s-operation"
@@ -36,7 +36,7 @@
                 ></i>
                 <a @click="billboarddetial(item)">详情</a>
               </el-col>
-              <el-col class="containersd hover_style" style="cursor: pointer">
+              <el-col class="con-col hover_style" style="cursor: pointer">
                 <i
                   style="font-size: 2rem"
                   class="el-icon-location-outline"
@@ -44,7 +44,7 @@
                 ></i>
                 <a @click="importModel(item)">导入模型</a>
               </el-col>
-              <el-col class="containersd hover_style" style="cursor: pointer">
+              <el-col class="con-col hover_style" style="cursor: pointer">
                 <i
                   style="font-size: 2rem"
                   class="el-icon-location-outline"
@@ -52,7 +52,7 @@
                 ></i>
                 <a @click="locationModel(item)">定位</a>
               </el-col>
-              <el-col class="containersd hover_style" style="cursor: pointer">
+              <el-col class="con-col hover_style" style="cursor: pointer">
                 <i
                   style="font-size: 2rem"
                   class="el-icon-location-outline"
@@ -60,7 +60,7 @@
                 ></i>
                 <a @click="checkModel(item)">审查</a>
               </el-col>
-              <el-col class="containersd hover_style" style="cursor: pointer">
+              <el-col class="con-col hover_style" style="cursor: pointer">
                 <i
                   style="font-size: 2rem"
                   class="el-icon-share"
@@ -133,7 +133,7 @@ export default {
           data: {}, //props
         },
         offset: ["650", "300"], //left top  左上角(left=430px/2;top=（800px+header高）/2)
-        area: ["300px", "300px"], //宽 高
+        area: ["400px", "450px"], //宽 高
         title: "新增项目",
         maxmin: false,
         shade: false, //是否显示遮罩
@@ -504,4 +504,11 @@ export default {
     height: 4rem;
   }
 }
+.con-col{
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: center;
+  align-items: center;
+  border-radius: 4px;
+}
 </style>

static/Config/config.js

@@ -1239,14 +1239,15 @@ window.billboardReviewList = [
                     id: "453bmbnsd4553",
                     code: "00102020102",
                     ReviewMethod: "自动审查",
-                    ReviewContent: "一层建筑层高≤4.5m并且广告高度≤1.5m",
-                  },
-                  {
-                    id: "453sd45xcv53",
-                    code: "00102020103",
-                    ReviewMethod: "自动审查",
-                    ReviewContent: "一层建筑层高＞4.5m并且广告高度小于等于2m",
+                    ReviewContent:
+                      "一层建筑层高≤4.5m并且广告高度≤1.5m或者一层建筑层高＞4.5m并且广告高度小于等于2m",
                   },
+                  // {
+                  //   id: "453sd45xcv53",
+                  //   code: "00102020103",
+                  //   ReviewMethod: "自动审查",
+                  //   ReviewContent: "一层建筑层高＞4.5m并且广告高度小于等于2m",
+                  // },
                   {
                     id: "453sd45xcv53",
                     code: "00102020104",