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 @@
>
进入衢州版本
-
{{$t('message.companyDiagram.goProjectBackEnd')}}
- {{$t('message.companyDiagram.goDevCenter')}}
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 @@
-
+
@@ -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 @@
-
+
@@ -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 @@
-
+
![]()
-
+
-
+
{{ $t('message.towerCrane.info1') }}
@@ -31,7 +31,7 @@
-
+
{{item.devName}}{{ $t('message.towerCrane.and') }} {{item.collideDevName}} {{ $t('message.towerCrane.antiCollisionTwo') }}
@@ -68,7 +68,7 @@
-
+
{{ $t('message.towerCrane.info2') }}
@@ -77,7 +77,7 @@
-
+
{{activeTower.devName}}与{{item.name}}防碰撞
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 @@
-
{{ $t('message.towerCrane.normal') }}
+
{{ $t('message.towerCrane.normal') }}
{{ $t('message.towerCrane.callThePolice') }}
-
{{ $t('message.towerCrane.earlyWarning') }}
+
{{ $t('message.towerCrane.earlyWarning') }}
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>