From 7b6a1d772e462b74772f8633d5f81b4c3f276303 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 2 Jan 2024 18:52:03 +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

---
 public/js/config.js                           |   2 +-
 src/assets/js/http.js                         |   3 +-
 src/router/largeScreen/forth.js               |   3 +-
 .../fourEngin/command/leftThree/Process.vue   | 112 ++++++++++++------
 .../projectAdmin/fourEngin/robot/index.vue    |   9 +-
 5 files changed, 84 insertions(+), 45 deletions(-)

diff --git a/public/js/config.js b/public/js/config.js
index 802d4761..c3bbabdb 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -14,7 +14,7 @@ var COMPANY = '' //通用
 // COMPANY = 'zjsj'//中建四局
 // COMPANY = 'zjwj'//中建五局
 // COMPANY = 'sccr'//四川成润
-// COMPANY = 'pssh'//坪山沙湖项目
+COMPANY = 'pssh'//坪山沙湖项目
 // COMPANY = 'jlw'//金林湾
 // COMPANY = 'shzj'//上海张江
 // COMPANY = 'shjg'//上海优益（上海建工）
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 51e2a95b..6adee500 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -79,11 +79,12 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
   // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
   // axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
+  axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖（最新）地址
   // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
   // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
-  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
   // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
diff --git a/src/router/largeScreen/forth.js b/src/router/largeScreen/forth.js
index 17585984..b95ab0fb 100644
--- a/src/router/largeScreen/forth.js
+++ b/src/router/largeScreen/forth.js
@@ -57,7 +57,8 @@ export default {
       //坪山沙湖项目
       {
         path: 'robot',
-        name: '机器人管理',
+        // name: '机器人管理',
+        name: '云端建造',
         component: () => import('@/views/projectAdmin/fourEngin/robot')
       },
     ]
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
index 9fe05852..9a817ea4 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
@@ -1,12 +1,30 @@
 <!-- 步骤条 -->
 <template>
   <div class="list progress" id="scrollBox">
-    <div :ops="ops" class="list-item progress-item" v-for="(item, index) in list" :key="index" v-if="COMPANY=='zjsj'">
+    <div
+      :ops="ops"
+      class="list-item progress-item"
+      v-for="(item, index) in list"
+      :key="index"
+      v-if="COMPANY == 'zjsj'"
+    >
       <div style="display:flex;">
         <div style="text-align:center;width: 100px;">
-          <img src="@/assets/images/zjsj/doing.png" alt="" v-if="item.id == state"/>
-          <img src="@/assets/images/zjsj/noBegin.png" alt="" v-if="item.id > state"/>
-          <img src="@/assets/images/zjsj/ed.png" alt="" v-if="item.id < state"/>
+          <img
+            src="@/assets/images/zjsj/doing.png"
+            alt=""
+            v-if="item.id == state"
+          />
+          <img
+            src="@/assets/images/zjsj/noBegin.png"
+            alt=""
+            v-if="item.id > state"
+          />
+          <img
+            src="@/assets/images/zjsj/ed.png"
+            alt=""
+            v-if="item.id < state"
+          />
           <div class="info">
             <span class="label">{{ item.name }}</span>
             <p>{{ item.Time }}</p>
@@ -22,12 +40,30 @@
       </div>
       <!-- <div :class="['progress-item-dot', { active: projectData.constructionStage-1 >= index }]"></div> -->
     </div>
-    <div :ops="ops" class="list-item progress-item" v-for="(item, index) in listPssh" :key="index" v-if="COMPANY=='pssh'">
+    <div
+      :ops="ops"
+      class="list-item progress-item"
+      v-for="(item, index) in listPssh"
+      :key="index"
+      v-if="COMPANY == 'pssh'"
+    >
       <div style="display:flex;">
         <div style="text-align:center;width: 100px;">
-          <img src="@/assets/images/zjsj/doing.png" alt="" v-if="item.id == state"/>
-          <img src="@/assets/images/zjsj/noBegin.png" alt="" v-if="item.id > state"/>
-          <img src="@/assets/images/zjsj/ed.png" alt="" v-if="item.id < state"/>
+          <img
+            src="@/assets/images/zjsj/doing.png"
+            alt=""
+            v-if="item.id == state"
+          />
+          <img
+            src="@/assets/images/zjsj/noBegin.png"
+            alt=""
+            v-if="item.id > state"
+          />
+          <img
+            src="@/assets/images/zjsj/ed.png"
+            alt=""
+            v-if="item.id < state"
+          />
           <div class="info">
             <span class="label">{{ item.name }}</span>
             <p>{{ item.Time }}</p>
@@ -47,62 +83,62 @@
 </template>
 
 <script>
-import { getProjectDetail } from '@/assets/js/api/baseInfo.js'
-import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
+import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
+import { listProjectInfo } from "@/assets/js/api/zhongjianFourth";
 
 export default {
   props: {
     list: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     listPssh: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
-    
   },
   data() {
     return {
-      projectSn: '',
+      projectSn: "",
       projectData: {
-        constructionStage: 10
+        constructionStage: 10,
       },
       ops: {
         vuescroll: {
-          wheelDirectionReverse: true
-        }
+          wheelDirectionReverse: true,
+        },
       },
-      state:'',
+      state: "",
       COMPANY: COMPANY,
-    }
+    };
   },
   created() {
-    this.projectSn = this.$store.state.projectSn
-    this.getDataDateils()
-    console.log('this.listPssh',this.listPssh);
+    this.projectSn = this.$store.state.projectSn;
+    this.getDataDateils();
+    console.log("this.listPssh", this.listPssh);
   },
   mounted() {},
   methods: {
     getDataDateils() {
-      let data = { projectSn: this.projectSn }
-      getProjectDetail(data).then(res => {
+      let data = { projectSn: this.projectSn };
+      getProjectDetail(data).then((res) => {
         if (res.code == 200) {
-          console.log('查询进度', res)
-          this.projectData = res.result
+          console.log("查询进度", res);
+          this.projectData = res.result;
         }
-      })
-      listProjectInfo({ projectSn: this.projectSn }).then(res => {
+      });
+      listProjectInfo({ projectSn: this.projectSn }).then((res) => {
         // this.state = res.result.constructionStage
-        this.state = 3
+        this.state = 3;
+        if (this.COMPANY == "zjsj") {
+          this.state = 4;
+        }
 
-      console.log('999999999999999',this.state,res);
-
-      })
-    }
-    
-  }
-}
+        console.log("999999999999999", this.state, res);
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -129,7 +165,7 @@ export default {
       border-radius: 50%;
 
       &::after {
-        content: '';
+        content: "";
         position: absolute;
         top: 4px;
         transform: translateX(-99%);
@@ -146,7 +182,7 @@ export default {
       }
 
       &::before {
-        content: '';
+        content: "";
         position: relative;
         z-index: 9;
         display: block;
diff --git a/src/views/projectAdmin/fourEngin/robot/index.vue b/src/views/projectAdmin/fourEngin/robot/index.vue
index a3c23bc8..47d94777 100644
--- a/src/views/projectAdmin/fourEngin/robot/index.vue
+++ b/src/views/projectAdmin/fourEngin/robot/index.vue
@@ -23,11 +23,12 @@ export default {
   },
   methods: {
     getUrl() {
-      getrobotUrlApi({ projectSn: this.$store.state.projectSn }).then(res => {
-        this.url=res.result.url
-        console.log('机器人  ：this.url', this.url);
+      this.url = "http://zljsh.smart-build.cn/3d/"
+      // getrobotUrlApi({ projectSn: this.$store.state.projectSn }).then(res => {
+      //   this.url=res.result.url
+      //   console.log('机器人  ：this.url', this.url);
 
-      })
+      // })
     }
   }
 }