qinhouyu пре 1 година
родитељ
комит
d752f4c02e
3 измењених фајлова са 40 додато и 34 уклоњено
  1. 19 17
      src/views/eventdetailsdialog.vue
  2. 19 15
      src/views/firespread.vue
  3. 2 2
      vue.config.js

+ 19 - 17
src/views/eventdetailsdialog.vue

@@ -4303,23 +4303,25 @@ export default {
     Meeting() {
       //弹出发送会议短信弹窗
       let that = this;
-      that.$alert(
-        "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='http://172.18.1.37:15001/CLOUDMeeting_Win.exe'>点击此处</a>进行下载",
-        "该功能需要使用云会议客户端",
-        {
-          confirmButtonText: "确定",
-          dangerouslyUseHTMLString: true,
-          callback: (action) => {
-            let param = {
-              eventCode: that.eventCode,
-            };
-            centereventtdepteventList(param).then((res) => {
-              that.depteventList = res.data;
-              that.showMeetingMsgDialog = true;
-            });
-          },
-        }
-      );
+      selectConfigKey('meeting_plugin_url').then(response => {
+        that.$alert(
+          "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='"+response.data+"'>点击此处</ a>进行下载",
+          "该功能需要使用云会议客户端",
+          {
+            confirmButtonText: "确定",
+            dangerouslyUseHTMLString: true,
+            callback: (action) => {
+              let param = {
+                eventCode: that.eventCode,
+              };
+              centereventtdepteventList(param).then((res) => {
+                that.depteventList = res.data;
+                that.showMeetingMsgDialog = true;
+              });
+            },
+          }
+        );
+      })
     },
     /** ----------------------------------视频会议结束------------------------------------- */
   },

+ 19 - 15
src/views/firespread.vue

@@ -1160,6 +1160,7 @@ import {
 import findUserByDept from '@/views/findUserByDept'
 import Cookies from "js-cookie"; //责任人选择弹框
 import request from "@/utils/request";
+import { selectConfigKey } from "@/api/system/config";
 
 export default {
   dicts: ['task_source'],
@@ -3228,22 +3229,25 @@ export default {
     },
     Meeting() { //弹出发送会议短信弹窗
       let that = this;
-      that.$alert(
-        "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='http://172.18.1.37:15001/CLOUDMeeting_Win.exe'>点击此处</a>进行下载",
-        '该功能需要使用云会议客户端', {
-          confirmButtonText: '确定',
-          dangerouslyUseHTMLString: true,
-          callback: action => {
-            let param = {
-              eventCode: that.eventCode
-            }
-            centereventtdepteventList(param).then(res => {
-              that.depteventList = res.data
-              that.showMeetingMsgDialog = true
-              that.initDutysystemTableData();
-            })
+      selectConfigKey('meeting_plugin_url').then(response => {
+        that.$alert(
+          "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='"+response.data+"'>点击此处</ a>进行下载",
+          "该功能需要使用云会议客户端",
+          {
+            confirmButtonText: "确定",
+            dangerouslyUseHTMLString: true,
+            callback: (action) => {
+              let param = {
+                eventCode: that.eventCode,
+              };
+              centereventtdepteventList(param).then((res) => {
+                that.depteventList = res.data;
+                that.showMeetingMsgDialog = true;
+              });
+            },
           }
-        });
+        );
+      })
     },
     /** ----------------------------------视频会议结束------------------------------------- */
     /** ----------------------------------海康摄像头预览结束------------------------------------- */

+ 2 - 2
vue.config.js

@@ -53,9 +53,9 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:3031`,
-        // target: `http://121.36.228.66:3031`,
+        target: `http://121.36.228.66:3031`,
         // target: `http://192.168.31.235:3031`,
-        target: `http://192.168.31.134:3031`,
+        // target: `http://192.168.31.134:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''