Merge branch 'master' of http://121.42.8.157:13000/zengminguo/D-MAP

src/api/issue.js

@@ -1,7 +1,7 @@
 import { api } from "./API.js";
 
 export const fetchIssueList = (data) => {
-  return api(`/bmt-test/v1.0.0/bmt/get/ticket`, {
+  return api(`/task/ticket/dmap`, {
     method: "POST",
     data
   });

src/components/SearchBar/index.vue

@@ -65,12 +65,13 @@ export default {
     },
     modeChange() {
       if (window.location.href.indexOf("ordinaryPage") !== -1) {
-        this.$router.push({
-          path: '/home',
-          query:{
-            m: '8b934420_ZJUb_b6f9'
-          }
-        })
+        window.location.href = "/home?m=8b934420_ZJUb_b6f9";
+        //this.$router.push({
+        //  path: '/home',
+        //  query:{
+        //    m: '8b934420_ZJUb_b6f9'
+        //  }
+        //})
       } else {
         this.$store.dispatch('common/setSquareStatus', false)
         this.$router.push({

src/views/ordinaryPage/index.vue

@@ -847,7 +847,7 @@ export default {
     }, 1500);
 
     this.$store.dispatch("issueList/fetchIssueList", {
-      bench_id: "219",
+      bench_id: null,
       page_num: 1,
       page_size: 10,
       processor: 0,
@@ -901,8 +901,7 @@ export default {
           let benchId = JSON.parse(JSON.stringify(objRBL[i]));
           setTimeout(() => {
             console.log("connect bench", benchId);
-            wsArray[i]
-              .connectBench({ bench_id: String(benchId) })
+            wsArray[i]?.connectBench({ bench_id: String(benchId) })
               .then((res) => {
                 console.log("connect bench success", benchId);
                 self.getBenchImage(benchId, 1, wsArray[i], () => {});
@@ -1393,8 +1392,7 @@ export default {
       wsArrayLength++;
       setTimeout(() => {
         console.log("connect bench", benchId);
-        wsArray[i]
-          .connectBench({ bench_id: String(benchId) })
+        wsArray[i]?.connectBench({ bench_id: String(benchId) })
           .then((res) => {
             console.log("connect bench success", benchId);
             self.getBenchImage(benchId, 1, wsArray[i], () => {});

vue.config.js

@@ -24,6 +24,11 @@ module.exports = defineConfig({
         changeOrigin: true, //需要代理跨域
         rewrite: (path) => path.replace(/^\/bmt-test/, ''), //路径重写，把'/api'替换为''
       },
+      '/task': {
+        target: 'http://106.14.237.165', //需要代理的域名，目标域名
+        changeOrigin: true, //需要代理跨域
+        rewrite: (path) => path.replace(/^\/task/, ''), //路径重写，把'/api'替换为''
+      },
       '/tts-test': {
         target: 'http://139.196.158.57:8080', //需要代理的域名，目标域名
         changeOrigin: true, //需要代理跨域