update

src/views/groupPage/districtPageModules/customTools/viewManagement.vue

@@ -57,7 +57,6 @@ export default class viewManagement extends Vue {
     this.viewer = (window as any).viewer
   }
   //漫游数据
-  timeout = null //定时器
   isRoaming: boolean = false //漫游面板
   viewName = ''
   tipVisible = false
@@ -256,7 +255,7 @@ export default class viewManagement extends Vue {
             up: new Cesium.Cartesian3(camera.up.x, camera.up.y, camera.up.z)
           },
           complete: () => {
-            that.timeout = setTimeout(() => {
+            setTimeout(() => {
               if (i < playList.length - 1) {
                 i += 1
                 fly(JSON.parse(playList[i].camera))
@@ -292,7 +291,7 @@ export default class viewManagement extends Vue {
     this.isRoaming = false
     this.currentViewIndex = null
     ;(this.$parent as any).isRoaming = false
-    if (this.timeout) clearTimeout(this.timeout)
+    this.viewer.camera.cancelFlight() //取消飞行
   }
 }
 </script>

src/views/groupPage/districtPageModules/pipeUnitInfo/index.vue

@@ -17,9 +17,9 @@
           <el-tab-pane label="设计" name="design"><Design ref="designPanel" /></el-tab-pane>
           <el-tab-pane label="扫码" name="sminfo"><SmInfo ref="scanPanel" /></el-tab-pane>
           <el-tab-pane label="质量" name="quality"><Quality ref="qualityPanel" /></el-tab-pane>
+          <el-tab-pane label="安全" name="security"></el-tab-pane>
           <el-tab-pane label="合同材料" name="contract"><Contract ref="contractPanel" /></el-tab-pane>
           <el-tab-pane label="图纸档案" name="document"><Dcouments ref="dcoumentPanel" /></el-tab-pane>
-          <el-tab-pane label="安全" name="security"></el-tab-pane>
         </el-tabs>
       </div>
     </div>

src/views/groupPage/index.vue

@@ -56,7 +56,11 @@ export default {
       getUserList({ username: username }).then((res) => {
         try {
           // console.log(res.result.records[0].roleName)
-          let roleArr = res.result.records[0].roleName.split(',')
+          // let roleArr = res.result.records[0].roleName.split(',')
+          let roleArr = []
+          res.result.records.map((item) => {
+            roleArr = [...roleArr, ...item.roleName.split(',')]
+          })
           if (!roleArr.includes(this.roc.description) && !roleArr.includes(this.robc.description)) {
             this.$store.state.bigScreen.isShowGroupPage = false
             this.$store.dispatch('bigScreen/setProjectTreeData', [