Browse Source

安徽人大即时通讯端口修改、来访新增isMeeting判断修改

jun.zhang 1 year ago
parent
commit
5396856a52

+ 2 - 2
.env.development

@@ -4,8 +4,8 @@ ENV = 'development'
 # base api
 #VUE_APP_BASE_API = '/dev-api'
 #VUE_APP_BASE_API = 'http://192.9.200.52:88'
-#VUE_APP_BASE_API = 'http://115.238.142.158:2588'
-VUE_APP_BASE_API = 'http://172.16.66.48:88'
+VUE_APP_BASE_API = 'http://115.238.142.158:4888'
+#VUE_APP_BASE_API = 'http://172.16.66.48:88'
 
 VUE_APP_ZHFX_API = 'http://115.238.142.158:2580'
 #VUE_APP_ZHFX_API = 'http://192.9.200.52:2468'

+ 1 - 1
src/layout/components/HeaderBar/index.vue

@@ -186,7 +186,7 @@ export default {
     },
     goToChat() {
       window.open(
-        "http://192.9.200.52:88/im/home",
+        "http://192.9.200.52:8991/im/home",
         "安徽人大即时通讯",
         "width=1000,height=600,location=no,status=no"
       );

+ 10 - 6
src/views/business/checkin/edit/index.vue

@@ -834,7 +834,7 @@ import * as ActivityApi from "@/api/activity.js";
 import * as MatterApi from "@/api/matter.js";
 import * as MsgApi from "@/api/msg.js";
 import * as EndCaseApi from "@/api/endcase.js";
-import LeaderPage from "../components/LeaderPage"; 
+import LeaderPage from "../components/LeaderPage";
 import RepresentPage from "../components/RepresentPage";
 import AppealPersonForm from "@/components/AppealPersonForm";
 import AppealMatterForm from "@/components/AppealMatterForm";
@@ -1679,9 +1679,9 @@ export default {
         delete form.createAccount;
         delete form.xfName;
         delete form.taskid;
-        // delete form.isMeeting;
-        // delete form.meetingID;
-        // delete form.meetingSession;
+        delete form.isMeeting;
+        delete form.meetingID;
+        delete form.meetingSession;
         form.handleModel = "";
         form.handleModelID = "";
         form.finalDisposal = "";
@@ -1775,7 +1775,6 @@ export default {
                 businessID: -1,
               },
             ];
-
             if (tmp.tellLogRepresent) {
               params.push({
                 type: 1,
@@ -1794,10 +1793,15 @@ export default {
               tmp.tellLog = res.data[0];
               if (res.data.length > 1) tmp.tellLogRepresent = res.data[1];
             });
-
             if (tmp.id) {
+              delete tmp.isMeeting;
+              delete tmp.meetingID;
+              delete tmp.meetingSession;
               form.matter.push(tmp);
             } else {
+              delete tmp.isMeeting;
+              delete tmp.meetingID;
+              delete tmp.meetingSession;
               form.addMatter.push(tmp);
             }
           } else {

+ 8 - 7
src/views/business/meet/checkin/edit/index.vue

@@ -1249,11 +1249,11 @@ export default {
     //     }
     //   }
     // }
-     "activityForm.registerPlaceID": {
+    "activityForm.registerPlaceID": {
       handler(newVal, oldVal) {
-       this.activityForm.registerPlaceID = Number(newVal)
-      }
-    }
+        this.activityForm.registerPlaceID = Number(newVal);
+      },
+    },
   },
   methods: {
     importToBaseInfo() {
@@ -1705,9 +1705,10 @@ export default {
       delete form.createAccount;
       delete form.xfName;
       delete form.taskid;
-      delete form.isMeeting;
-      delete form.meetingID;
-      delete form.meetingSession;
+      // delete form.isMeeting;
+      // delete form.meetingID;
+      // delete form.meetingSession;
+      form.isMeeting = 0;
       form.handleModel = "";
       form.handleModelID = "";
       form.finalDisposal = "";

+ 1 - 1
src/views/home/index.vue

@@ -741,7 +741,7 @@ export default {
     },
     goToChat() {
       window.open(
-        "http://192.9.200.52:88/im/home",
+        "http://192.9.200.52:8991/im/home",
         "安徽人大即时通讯",
         "width=1000,height=600,location=no"
       );