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

src/views/ConstructionApplication3D/billboard/billboardDesign.vue

@@ -98,6 +98,7 @@ import lodash from "lodash-es";
 export default {
   data() {
     return {
+      thislayers: [],
       projects: window.billboardInfoList,
       currentPage4: 1,
       total: 20,
@@ -113,6 +114,11 @@ export default {
     debugger;
     let that = this;
     var promisse11w = scene.open(window.billboardModelLT.url);
+    Cesium.when(promisse11w, function (layers) {
+      layers.forEach((element) => {
+        that.thislayers.push(element);
+      });
+    });
   },
   methods: {
     handleCurrentChange() {},
@@ -127,7 +133,7 @@ export default {
           data: {}, //props
         },
         offset: ["650", "300"], //left top  左上角(left=430px/2;top=（800px+header高）/2)
-        area: ["300px", "300px"], //宽 高
+        area: ["350px", "450px"], //宽 高
         title: "新增项目",
         maxmin: false,
         shade: false, //是否显示遮罩
@@ -439,6 +445,10 @@ export default {
   },
   beforeDestroy() {
     this.removeAllentities();
+    debugger;
+    this.thislayers.forEach((element) => {
+      scene.layers.remove(element.name);
+    });
   },
 };
 </script>

src/views/cockpit/gdbh.vue

@@ -84,7 +84,7 @@
               <li>
                 <div class="icon"></div>
 
-                <span class="zbph_label">损失粮食产能</span>
+                <span class="zbph_label">新增粮食产能</span>
                 <br>
 
                 <span class="zbph_value_unit">

src/views/siteselection/components/yxyzPop.vue

@@ -53,7 +53,7 @@
                   v-model="scope.row.condition"
                   placeholder="请选择"
                   class="input-style"
-                  v-if="scope.row.condition == 'identity'"
+                  v-if="scope.row.condition == 'identity' || scope.row.condition == 'n_identity'"
                 >
                   <el-option
                     v-for="item in conditionList1"
@@ -67,7 +67,7 @@
                   v-model="scope.row.condition"
                   placeholder="请选择"
                   class="input-style"
-                  v-if="scope.row.condition == 'contain'"
+                  v-if="scope.row.condition == 'contain' || scope.row.condition == 'n_contain'"
                 >
                   <el-option
                     v-for="item in conditionList2"

static/Config/config.js

@@ -1374,20 +1374,6 @@ window.NightLightUrl = {
   csfgx: "static/data/fg.json",
 };
 
-window.billboardInfoList = [
-  {
-    id: 1,
-    name: "广告项目1",
-    time: "2024-01-02 12:00:00",
-  },
-  {
-    id: 2,
-    name: "广告项目2",
-    time: "2024-01-02 12:00:00",
-  },
-];
-
-
 /**
  * 灯光文件地址
  */