Merge branch 'feature/9月迭代'

index.html

@@ -35,7 +35,7 @@
   <script src="//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.02.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js"></script>
-  <!-- <script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.12.js"></script> -->
+  <script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.24.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
 </body>

src/components/active/active-select.vue

@@ -553,10 +553,10 @@ export default {
      * 跳转卡片创建页
      */
     toRedirectPage(item) {
-      if (window.location.origin.includes('gicdev')) {
-        window.open(item.url);
-        return false;
-      }
+      // if (window.location.origin.includes('gicdev')) {
+      //   window.open(item.url);
+      //   return false;
+      // }
       if (item.id == 'marking') {
         window.open('/gic-web/#/custom');
       }

src/view/dataDetails/index.vue

@@ -46,7 +46,7 @@
     </div>
     <vue-gic-footer></vue-gic-footer>
 
-    <export-excel
+    <vue-gic-export-excel
       :dataArr="tableData"
       :dialogVisible.sync="dialogVisible"
       :projectName="projectName"
@@ -54,14 +54,14 @@
       :excelUrl="excelUrl"
       :params="params"
     >
-    </export-excel>
+    </vue-gic-export-excel>
   </div>
 </template>
 <script>
 import navCrumb from '@/components/nav/nav.vue';
 import inviteTable from '@/components/data-details/invite-table.vue';
 import invitedTable from '@/components/data-details/invited-table.vue';
-import exportExcel from '@/components/export-excel'
+// import exportExcel from '@/components/export-excel'
 // import { postExcel } from '@/api/api';
 // import errMsg from '@/common/js/error';
 // import showMsg from '@/common/js/showmsg';
@@ -71,7 +71,7 @@ export default {
     navCrumb,
     inviteTable,
     invitedTable,
-    exportExcel
+    // exportExcel
   },
   data() {
     return {

src/view/dataDetails/inviterLog.vue

@@ -70,7 +70,7 @@
       </div>
     </div>
     <vue-gic-footer></vue-gic-footer>
-    <export-excel
+    <vue-gic-export-excel
       :dataArr="tableData"
       :dialogVisible.sync="dialogVisible"
       :projectName="projectName"
@@ -78,7 +78,7 @@
       :excelUrl="excelUrl"
       :params="params"
     >
-    </export-excel>
+    </vue-gic-export-excel>
   </div>
 </template>
 <script>
@@ -86,7 +86,7 @@ import pointLog from '@/components/data-details/point-log.vue';
 import cardLog from '@/components/data-details/card-log.vue';
 import inviteLog from '@/components/data-details/invite-log.vue';
 import navCrumb from '@/components/nav/nav.vue';
-import exportExcel from '@/components/export-excel'
+// import exportExcel from '@/components/export-excel'
 import { getRequest } from '@/api/api';
 import errMsg from '@/common/js/error';
 export default {
@@ -130,7 +130,7 @@ export default {
     inviteLog,
     pointLog,
     cardLog,
-    exportExcel
+    // exportExcel
   },
   methods: {
     /**