首页看板样式调整

src/views/sbxxgl/sbxx/index.vue

@@ -197,6 +197,7 @@
             tree.loadAllNode() */
       },
       selectedTree: function(e) {
+        console.log(e)
         this.$refs.basePage.treeInfo = e
         this.$refs.basePage.queryParams.pid = e.id
         this.$refs.basePage.refresh()

src/views/yhlywsytst/yhlywsytst/index.vue

@@ -301,11 +301,8 @@
       </div>
     </div>
     <!-- 设备流向-->
-    <div  class="sylb">
+   <div  class="sblx">
       <div class="full  data-box1" style="position: relative;">
-        <i @click="sylbshow=false"
-          style="position: absolute;right: 1px;top: 2px;color: #68D8FE;cursor: pointer;z-index: 999;"
-          class="el-icon-error"></i>
         <i class="topL"></i>
         <i class="topR"></i>
         <i class="bottomL"></i>
@@ -315,10 +312,47 @@
           <span>设备流向</span>
           <b class="data-title-right">]</b>
         </div>
-        <div class="full" style="padding: 10px;;padding-top: 15px;height: calc(100% - 14px);">
 
+        <div class="full flex " style="height: calc(100% - 14px);padding-top: 12px;">
+          <el-row :gutter="20" class="search-row-1" style="width: 100%;">
+            <el-col :span="12" class="search-col" >
+              <div class="search-item">
+                 <span class="search-span">绘制流动:</span>
+               <el-select :popper-append-to-body='false' style="width: 100%;background-color: rgba(0, 0, 0, 0.0);"
+                 @change="flowPieDataChange" v-model="flowPieData" clearable placeholder="">
+                 <el-option v-for="(item, index) in allPieData" :key="index" :value="item.name">
+                   {{ item.name }}
+                 </el-option>
+               </el-select>
+              </div>
+            </el-col>
+            <el-col :span="12" class="search-col flex-center">
+              <div class="flex1 text-center">
+                <el-switch style="color: #fff ;font-size: 12px;" v-model="flowDirection" active-text="正向" inactive-text="反向">
+                </el-switch>
+              </div>
+            </el-col>
+          </el-row>
+        </div>
+ <!--       <div class="full" style="padding: 10px;;padding-top: 15px;height: calc(100% - 14px);">
+
+          <div class="toolButton2">
+            <div class="flex1 text-center">
+              <el-select :popper-append-to-body='false' style="width: 100px;background-color: rgba(0, 0, 0, 0.0);"
+                @change="flowPieDataChange" v-model="flowPieData" clearable placeholder="绘制流动">
+                <el-option v-for="(item, index) in allPieData" :key="index" :value="item.name">
+                  {{ item.name }}
+                </el-option>
+              </el-select>
+            </div>
+            <div class="flex1 text-center">
+              <el-switch style="color: #fff ;font-size: 12px;" v-model="flowDirection" active-text="正向" inactive-text="反向">
+              </el-switch>
             </div>
           </div>
+
+        </div> -->
+      </div>
     </div>
     <!-- 右侧操作边框-->
     <!--  <div  class="rightOpt" ref="rightOpt">
@@ -786,27 +820,38 @@
             o.points.forEach((item) => {
               box.expandByPoint(new THREE.Vector3(...item));
             });
-            let point = box.max
-            let finallyPoint = this.getCameraPosition(5, point)
-            this.cameraTo(finallyPoint.x, finallyPoint.y, finallyPoint.z, point.x, point.y, point.z)
+            o.points.forEach((item) => {
+                box.expandByPoint(new THREE.Vector3(...item));
+            });
+            this.viewer.cameraControl.control.fitToBox(box, true, { cover: true });
           }
         });
       },
       /* 获取流向数据*/
       getData() {
-        fetch(`/data.json?${new Date().getTime()}`)
-          .then(response => {
-            if (!response.ok) {
-              throw new Error('网络响应错误');
-            } else {
-              return response.json()
-            }
-          }).then(data => {
+        this.$post('sbgl/usblxgx/zbInfo',{}).then(res=>{
+          if(res.success){
+            let data=res.data.records||[]
             this.allPieData = data.filter((item) => {
               return item.children.some((child) => child.data.length >= 2);
             });
-
+          }
         })
+
+
+        // fetch(`/data.json?${new Date().getTime()}`)
+        //   .then(response => {
+        //     if (!response.ok) {
+        //       throw new Error('网络响应错误');
+        //     } else {
+        //       return response.json()
+        //     }
+        //   }).then(data => {
+        //     this.allPieData = data.filter((item) => {
+        //       return item.children.some((child) => child.data.length >= 2);
+        //     });
+
+        //   })
       },
       /* 流向动画*/
       drawPipe(positions, radius, direction) {
@@ -1325,7 +1370,7 @@
   }
 
   .sylb {
-    top: 215px;
+    top: 325px;
     right: 15px;
     /* 使元素居中 */
     position: absolute;
@@ -1335,6 +1380,16 @@
     background-color: rgba(0, 0, 0, 0.6);
 
   }
+  .sblx{
+    top: 215px;
+    right: 15px;
+    /* 使元素居中 */
+    position: absolute;
+    height: 90px;
+    width: 28%;
+    z-index: 12;
+    background-color: rgba(0, 0, 0, 0.6);
+  }
 
 
   .topL {