From 22a6e022396a568ffd08e25be2c0d348eeb1d2f2 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 29 Feb 2024 09:47:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.js                           |  4 +---
 src/views/home/login_v1.vue                        |  4 +---
 src/views/homeTwo/login_v1.vue                     |  4 ++--
 src/views/projectAdmin/projectList.vue             |  4 ++--
 .../projectFront/towerCrane/alarmAnalysis.vue      |  6 +++---
 .../projectFront/towerCrane/antiCollision.vue      |  6 +++---
 .../projectFront/towerCrane/distributeDetail.vue   | 14 +++++++-------
 .../projectFront/towerCrane/towerCraneDetails.vue  |  4 ++--
 .../workstation/compontents/formDialog.vue         |  4 ++--
 9 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/pages/index/index.js b/src/pages/index/index.js
index 5cc95d1a..597994fc 100644
--- a/src/pages/index/index.js
+++ b/src/pages/index/index.js
@@ -204,12 +204,10 @@ function handler(data, sn) {
           router.push(arr2[0].modulePath)
         }
       } else {
-        if (data.styleType == 1 || !data.styleType) {
+        if ((data.styleType != 2 && data.styleType != 3) || !data.styleType) {
           router.push('/projectIndex')
         } else if (data.styleType == 2) {
           router.push('/projectV2/taskList')
-        } else if (data.styleType == 7) {
-          router.push('/projectIndex')
         } else {
           router.push('/projectV3/taskList')
         }
diff --git a/src/views/home/login_v1.vue b/src/views/home/login_v1.vue
index cf8ab3a7..7ef130bd 100644
--- a/src/views/home/login_v1.vue
+++ b/src/views/home/login_v1.vue
@@ -840,12 +840,10 @@ export default {
             }
           } else {
             // styleType == 3 衢州版
-            if (data.styleType == 1 || !data.styleType) {
+            if ((data.styleType != 2 && data.styleType != 3) || !data.styleType) {
               this.$router.push('/projectIndex')
             } else if (data.styleType == 2) {
               this.$router.push('/projectV2/taskList')
-            } else if (data.styleType == 7) {
-              this.$router.push('/projectIndex')
             } else {
               this.$router.push('/projectV3/taskList')
             }
diff --git a/src/views/homeTwo/login_v1.vue b/src/views/homeTwo/login_v1.vue
index 48853a59..abef2699 100644
--- a/src/views/homeTwo/login_v1.vue
+++ b/src/views/homeTwo/login_v1.vue
@@ -454,7 +454,7 @@ export default {
           this.$router.push(companyModule[0].modulePath);
           break;
         case 5:
-          if (data.styleType == 1 || !data.styleType) {
+          if ((data.styleType != 2 && data.styleType != 3) || !data.styleType) {
             this.$router.push("/projectIndex");
           } else {
             this.$router.push("/projectV2/taskList");
@@ -462,7 +462,7 @@ export default {
           this.$store.commit("setProjectSn", data.sn);
           break;
         case 6:
-          if (data.styleType == 1 || !data.styleType) {
+          if ((data.styleType != 2 && data.styleType != 3) || !data.styleType) {
             this.$router.push("/projectIndex");
           } else {
             this.$router.push("/projectV2/taskList");
diff --git a/src/views/projectAdmin/projectList.vue b/src/views/projectAdmin/projectList.vue
index d047e02d..7119702c 100644
--- a/src/views/projectAdmin/projectList.vue
+++ b/src/views/projectAdmin/projectList.vue
@@ -129,12 +129,12 @@
                 >
                   进入衢州版本
                 </div>
-                <div v-if="$store.state.userInfo.styleType==1 && $store.state.userInfo.enterProjectBackType === 0"
+                <div v-if="($store.state.userInfo.styleType!=2 && $store.state.userInfo.styleType!=3) && $store.state.userInfo.enterProjectBackType === 0"
                   class="operationText"
                   style="margin-right: 30px"
                   @click="goProjectIndex(scope.row)"
                 >{{$t('message.companyDiagram.goProjectBackEnd')}}</div>
-                <div v-if="$store.state.userInfo.styleType===1 && $store.state.userInfo.seeEquipment === 0"
+                <div v-if="($store.state.userInfo.styleType!=2 && $store.state.userInfo.styleType!=3) && $store.state.userInfo.seeEquipment === 0"
                   class="operationText"
                   @click="goDevCenter(scope.row)"
                 >{{$t('message.companyDiagram.goDevCenter')}}</div>
diff --git a/src/views/projectFront/towerCrane/alarmAnalysis.vue b/src/views/projectFront/towerCrane/alarmAnalysis.vue
index eb28d3ac..2c6961ea 100644
--- a/src/views/projectFront/towerCrane/alarmAnalysis.vue
+++ b/src/views/projectFront/towerCrane/alarmAnalysis.vue
@@ -1,7 +1,7 @@
 <template>
 <!--    预警分析-->
     <vue-scroll style="height: 100%">
-        <div class="alarmAnalysis" :class="{'white_bg': styleType == 1}" v-if="!showMore">
+        <div class="alarmAnalysis" :class="{'white_bg': styleType != 2 && styleType != 3}" v-if="!showMore">
             <div class="alarmAnalysis_top flex">
                 <div class="towercrane_status">
                     <div class="alarmAnalysis_title">
@@ -451,7 +451,7 @@ export default {
                     fontSize: 4
                 })
 
-                if(this.styleType == 1){
+                if(this.styleType != 2 && this.styleType != 3){
                     item.t1.attr({
                         fill: "#2A2E3F"
                     })
@@ -460,7 +460,7 @@ export default {
                     fill: "rgba(255, 255, 255, 0.6)",
                     fontSize: 4
                 })
-                if(this.styleType == 1){
+                if(this.styleType != 2 && this.styleType != 3){
                     item.t2.attr({
                         fill: "#2A2E3F"
                     })
diff --git a/src/views/projectFront/towerCrane/antiCollision.vue b/src/views/projectFront/towerCrane/antiCollision.vue
index 3f714880..0b1d2ee1 100644
--- a/src/views/projectFront/towerCrane/antiCollision.vue
+++ b/src/views/projectFront/towerCrane/antiCollision.vue
@@ -1,7 +1,7 @@
 <template>
     <!--    预警分析-->
         <vue-scroll style="height: 100%">
-            <div class="alarmAnalysis" :class="{'white_bg': styleType == 1}" v-if="!showMore">
+            <div class="alarmAnalysis" :class="{'white_bg': styleType != 2 && styleType != 3}" v-if="!showMore">
                 <div class="alarmAnalysis_top flex">
                     <div class="towercrane_status">
                         <div class="alarmAnalysis_title">
@@ -451,7 +451,7 @@
                         fontSize: 4
                     })
     
-                    if(this.styleType == 1){
+                    if(this.styleType != 2 && this.styleType != 3){
                         item.t1.attr({
                             fill: "#2A2E3F"
                         })
@@ -460,7 +460,7 @@
                         fill: "rgba(255, 255, 255, 0.6)",
                         fontSize: 4
                     })
-                    if(this.styleType == 1){
+                    if(this.styleType != 2 && this.styleType != 3){
                         item.t2.attr({
                             fill: "#2A2E3F"
                         })
diff --git a/src/views/projectFront/towerCrane/distributeDetail.vue b/src/views/projectFront/towerCrane/distributeDetail.vue
index 479680d9..828e250b 100644
--- a/src/views/projectFront/towerCrane/distributeDetail.vue
+++ b/src/views/projectFront/towerCrane/distributeDetail.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="distributeDetail">
         <div class="distributeDetail_box">
-            <div class="distributeDetail_left"  :class="{distributeDetail_left2:styleType == 1 || isDockingToWoer}">
+            <div class="distributeDetail_left"  :class="{distributeDetail_left2:(styleType != 2 && styleType != 3) || isDockingToWoer}">
                 <div
                     v-if="towerData.length > 0"
                     class="svg_box"
-                    :class="{svg_box2:styleType == 1 || isDockingToWoer}"
+                    :class="{svg_box2:(styleType != 2 && styleType != 3) || isDockingToWoer}"
                     id="svg_box"
                     ref="svg_box"
                     >
@@ -18,9 +18,9 @@
                 </div>
             </div>
             <img style="display: none;width: auto;height: auto" ref="svgImg" :src="bgUrl">
-            <div class="distributeDetail_right" :class="{distributeDetail_right2:styleType == 1 || isDockingToWoer}">
+            <div class="distributeDetail_right" :class="{distributeDetail_right2:(styleType != 2 && styleType != 3) || isDockingToWoer}">
                 <!-- <h3 class="tower_title">{{activeTower.devName}}塔吊防碰撞信息</h3> -->
-                <div class="distributeDetail_tower" :class="{distributeDetail_tower2:styleType == 1 || isDockingToWoer}">
+                <div class="distributeDetail_tower" :class="{distributeDetail_tower2:(styleType != 2 && styleType != 3) || isDockingToWoer}">
                     <div class="distributeDetail_title">
                         <!-- 塔吊间防碰撞信息 -->
                         {{ $t('message.towerCrane.info1') }}
@@ -31,7 +31,7 @@
                     </div>
                     <el-carousel v-if="towerCollideData.length > 0" :autoplay="false" :arrow="towerCollideData.length > 1 ? 'hover': 'never'" indicator-position="none">
                         <el-carousel-item v-for="(item, index) in towerCollideData" :key="index">
-                            <div class="crash_detail" :class="{crash_detail2:styleType == 1 || isDockingToWoer}">
+                            <div class="crash_detail" :class="{crash_detail2:(styleType != 2 && styleType != 3) || isDockingToWoer}">
                                 <!-- 与    防碰撞 -->
                                 <div style="color:rgb(81,129,246,0.5);transform: translateY(-30px)" class="item_title">{{item.devName}}{{ $t('message.towerCrane.and') }} {{item.collideDevName}} {{ $t('message.towerCrane.antiCollisionTwo') }}</div>
                                 <!-- 塔间距 -->
@@ -68,7 +68,7 @@
                         <img  style="margin: 0 auto;display: block" src="./../../../assets/images/noData2.png" />
                     </div>
                 </div>
-                <div class="distributeDetail_building" :class="{distributeDetail_building2:styleType == 1 || isDockingToWoer}">
+                <div class="distributeDetail_building" :class="{distributeDetail_building2:(styleType != 2 && styleType != 3) || isDockingToWoer}">
                     <div class="distributeDetail_title">
                         <!-- 塔吊与建筑物防碰撞信息 -->
                         {{ $t('message.towerCrane.info2') }}
@@ -77,7 +77,7 @@
                     </div>
                     <el-carousel style="margin-top: 35px" v-if="tableData.length>0" :autoplay="false" :arrow="tableData.length > 1 ? 'hover': 'never'" indicator-position="none">
                         <el-carousel-item v-for="(item,index) in tableData" :key="index">
-                            <div class="distributeDetail_building_box" :class="{distributeDetail_building_box2:styleType == 1 || isDockingToWoer}">
+                            <div class="distributeDetail_building_box" :class="{distributeDetail_building_box2:(styleType != 2 && styleType != 3) || isDockingToWoer}">
                                 <div style="color:rgb(81,129,246,0.5);transform: translateY(-30px)" class="item_title">{{activeTower.devName}}与{{item.name}}防碰撞</div>
                                 <div class="tower_info">
                                     <!-- 大臂与楼距离 -->
diff --git a/src/views/projectFront/towerCrane/towerCraneDetails.vue b/src/views/projectFront/towerCrane/towerCraneDetails.vue
index e655232d..1e6a221d 100644
--- a/src/views/projectFront/towerCrane/towerCraneDetails.vue
+++ b/src/views/projectFront/towerCrane/towerCraneDetails.vue
@@ -345,11 +345,11 @@
                             <el-col :span="3">
                                 <div class="operationInfo_status">
                                     <!-- 正常 -->
-                                    <p><span class="operationInfo_status_normal" style="color: #252B3F" :class="{'operationInfo_status_normal2': styleType == 1}"></span>{{ $t('message.towerCrane.normal') }}</p>
+                                    <p><span class="operationInfo_status_normal" style="color: #252B3F" :class="{'operationInfo_status_normal2': (styleType != 2 && styleType != 3)}"></span>{{ $t('message.towerCrane.normal') }}</p>
                                     <!-- 报警 -->
                                     <p><span class="operationInfo_status_error" style="color: #252B3F"></span>{{ $t('message.towerCrane.callThePolice') }}</p>
                                     <!-- 预警 -->
-                                    <p><span class="operationInfo_status_danger" style="color: #252B3F" :class="{'operationInfo_status_danger2': styleType == 1}"></span>{{ $t('message.towerCrane.earlyWarning') }}</p>
+                                    <p><span class="operationInfo_status_danger" style="color: #252B3F" :class="{'operationInfo_status_danger2': (styleType != 2 && styleType != 3)}"></span>{{ $t('message.towerCrane.earlyWarning') }}</p>
                                 </div>
                             </el-col>
 <!--                            报警状态-->
diff --git a/src/views/projectLevel/workstation/compontents/formDialog.vue b/src/views/projectLevel/workstation/compontents/formDialog.vue
index 2ff73eef..6eea9f36 100644
--- a/src/views/projectLevel/workstation/compontents/formDialog.vue
+++ b/src/views/projectLevel/workstation/compontents/formDialog.vue
@@ -8,9 +8,9 @@
             appear>
     <div class="form-dialog animate__animated">
         <div class="dialog-wrap">
-            <div class="dialog-content-box" :class="{'dialog-content-box2':styleType == 1 || isDockingToWoer}">
+            <div class="dialog-content-box" :class="{'dialog-content-box2':(styleType != 2 && styleType != 3) || isDockingToWoer}">
                 <i class="el-icon-close close-btn" @click="closeDialog"></i>
-                <div class="dialog-title" :class="{'dialog-title2':styleType == 1 || isDockingToWoer}" v-if="title">{{title}}</div>
+                <div class="dialog-title" :class="{'dialog-title2':(styleType != 2 && styleType != 3) || isDockingToWoer}" v-if="title">{{title}}</div>
                 <div class="dialog-content">
                     <vue-scroll>
                         <slot name="content"></slot>