Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

.gitignore

@@ -16,3 +16,5 @@ yarn-error.log*
 dist/
 package/
 src/components/work/yim.html
+yarn.lock
+node_modules.rar

src/components/commonPage/RankingIframe/index.vue

+<template>
+  <!-- ppt 模版新增编辑窗口 -->
+  <div class="dialogPptistVisible-box" style="width: 100%;height: 100%;">
+    <!-- <div class="closePptist-box">
+
+      <div class="closePptist">
+        <el-tooltip class="item" effect="dark" :content="$t('pub.closeWindow')" placement="bottom">
+          <i class="el-icon-close" style="color: #E95252;" @click="close()"></i>
+        </el-tooltip>
+      </div>
+    </div> -->
+    <el-tooltip class="item" effect="dark" :content="$t('pub.closeWindow')" placement="bottom">
+        <div class="itemBox">
+          <i class="el-icon-close" style="color: #E95252; font-size: 20px;" @click="close()"></i>
+        </div>
+      </el-tooltip>
+    <iframe id="myTemplateUrl" name="myTemplateUrl" :src="Url" class="TemplateIframe">
+    </iframe>
+  </div>
+</template>
+<script>
+  export default {
+    props: ['Url'],
+    data() {
+      return {
+        dialogPptistVisible: false,
+        userInfo: {},
+        TemplateUrl: '',
+        TemplateUrlImg: '',
+        isPostMessage: false
+      }
+    },
+    watch: {
+      Url: {
+        handler: function (val, oldVal) {
+          if (document.all.myTemplateUrl) {
+            if (this.Url && this.Url != '') {
+              document.all.myTemplateUrl.src = this.Url + `&t=${new Date().getTime()}`
+            }
+          }
+        },
+        deep: true,
+        immediate: true
+      },
+    },
+    mounted() {
+
+    },
+    methods: {
+      close() {
+        this.$emit('close')
+      }
+    }
+  }
+
+</script>
+<style scoped>
+  .dialogPptistVisible-box {
+    position: fixed;
+    z-index: 1000;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.4);
+  }
+
+  .closePptist-box {
+    position: fixed;
+    z-index: 1001;
+    left: 0;
+    right: 0;
+    top: 0;
+    height: 30px;
+    background: #fff;
+    border-bottom: 1px solid #eee;
+  }
+
+  .closePptist {
+    padding: 0 30px;
+    text-align: right;
+    margin: auto;
+    position: relative;
+  }
+
+  .closePptist i {
+    display: inline-block;
+    padding: 5px 10px;
+    font-size: 20px;
+    position: absolute;
+    right: 20px;
+    cursor: pointer;
+  }
+
+  .TemplateIframe {
+    border: none;
+    width: 90vw;
+    height: 90vh;
+    background: rgb(243, 246, 251);
+    position: fixed;
+    z-index: 1002;
+    top: 5vh;
+    left: 5vw;
+    right: 5vw;
+    bottom: 5vh;
+    border-radius: 10px;
+  }
+  .item{
+    position: fixed;
+    right: 2vw;
+    top: 2vh;
+    z-index: 99;
+    
+  }
+  .itemBox{
+    width: 30px;
+    height: 30px;
+    background: #fff;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 33px;
+    cursor: pointer;
+  }
+
+</style>

src/components/index.vue

@@ -1261,6 +1261,7 @@
     </AirTicketMessage>
     <!-- ppt 模版新增编辑窗口 -->
     <!-- <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl" @close="closeIframe()"></pptIframe> -->
+    <RankingIframe v-show="dialogRankingVisible" :Url="TemplateUrl" @close="closeIframe()"></RankingIframe>
   </div>
 </template>
 
@@ -1288,6 +1289,7 @@
   import AirTicketMessage from "../components/administrative/model/AirTicketMessage";
   import ChangeThePriceMessage from "../components/administrative/model/ChangeThePriceMessage";
   import pptIframe from './commonPage/pptIframe/index';
+  import RankingIframe from './commonPage/RankingIframe/index';
   export default {
     components: {
       ChatList,
@@ -1303,6 +1305,7 @@
       pptIframe,
       unTravelMessage,
       AirTicketMessage,
+      RankingIframe,
     },
     data() {
       return {
@@ -1571,6 +1574,8 @@
         F_ContractManagement: false, //合同权限
         F_Finance_Create: false,
         HOTEL_memorandum: false,
+        dialogRankingVisible: false,
+        RankingTime: null,
       };
     },
     filters: {
@@ -2019,6 +2024,11 @@
       if (ActionMenuCode.indexOf("HOTEL_memorandum") != -1) {
         this.HOTEL_memorandum = true;
       }
+      this.RankingTime = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
+      if(!localStorage.getItem("RankingTime")||this.RankingTime!=localStorage.getItem("RankingTime")){
+        this.SalesBoard()
+      }
+      
     },
     watch: {
       filterText(val) {
@@ -2034,7 +2044,11 @@
             if (res.data.resultCode == 1) {
               let href = this.domainManager().SalesBoardUrl
               this.TemplateUrl = `${href}/?uid=${res.data.data}`
-              window.open(this.TemplateUrl)
+              this.dialogRankingVisible = true
+              if(!localStorage.getItem("RankingTime")||this.RankingTime!=localStorage.getItem("RankingTime")){
+                localStorage.setItem("RankingTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
+              }
+              // window.open(this.TemplateUrl)
             }
           }
         );
@@ -2076,6 +2090,7 @@
       },
       closeIframe() {
         this.dialogPptistVisible = false
+        this.dialogRankingVisible = false
       },
       // 添加编辑模版
       journeyTemplate(type) {

src/plug/index.js

@@ -124,9 +124,9 @@ export default {
         let ocrUrl = "http://192.168.5.46:8888";
         // domainUrl = "http://192.168.5.39:8083";
         // domainUrl = "http://192.168.5.46:8501";
-        domainUrl = "http://192.168.5.46";
+        // domainUrl = "http://192.168.5.46";
         // domainUrl = "http://reborn.oytour.com";
-        // domainUrl = "http://192.168.5.214";
+        domainUrl = "http://192.168.5.214";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";