Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into sl3

src/views/SandTable/SandTable.vue

@@ -612,6 +612,7 @@ export default {
           {
             name: "停机时间",
             field: "stopTime",
+            width: "120px",
           },
           {
             name: "停机时长",
@@ -629,6 +630,7 @@ export default {
           {
             name: "推荐时间",
             field: "recodedate",
+            width: "120px",
           },
           {
             name: "类型",

src/views/SandTable/component/ThreeModel1.vue

@@ -13,7 +13,7 @@
         v-show="info.show"
         :style="'left: ' + info.x + 'px; top: ' + info.y + 'px;'"
       >
-        <div class="fan-name pointer" @click.stop="info.clickName">
+        <div class="fan-name pointer" v-show="info.id != 'build'" @click.stop="info.clickName">
           {{ info.name }}
         </div>
         <div
@@ -449,6 +449,24 @@ export default {
             console.log("海子井");
           },
         },
+        { // 大楼
+           id: "build",
+           x: 0,
+           y: 0,
+           show: true,
+           ox: 290,
+           oy: 120,
+           fanW: 60,
+           fanH: 100,
+           fanX: -260,
+           fanY: -200,
+           position: null,
+           name: "大楼",
+           clickName: function () { console.log("大楼") },
+           clickFan: () => { 
+           this.showFanInfo(this.htmlLayer[10].position);
+          },
+         },
       ],
       fanInfoLayer: {
         id: "fan-info",
@@ -676,9 +694,15 @@ export default {
           gltf.scene.position.set(0, 0, -35); // 10, 0, -50    -6, 0.13, -50
           scene.add(gltf.scene);
           gltf.scene.rotateY(120);
+            this.htmlLayer[10].position = {
+                x: -6,
+                y: -4,
+                z: -35,
+            }
           scene.onAfterRender = () => {
             this.$emit("when");
             this.$refs.pageLoading.hide();
+            this.setEveryHTML();
           };
         },
         (xhr) => {},