update

src/views/assetsManager/profit/index.vue

@@ -186,8 +186,8 @@
             </div>
             <div style="height: 1px;width: 80%;background: #A4A4A4;"></div>
             <div style="display: flex;margin-top: 20px;">
-              <div style="font-size: 14px; color: #1C1C1C; width: 100px;">当前租期：</div>
-              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{(indexData.orderStartTime || '-') + '至' + (indexData.orderEndTime || '-')}}</div>
+              <div style="font-size: 14px; color: #1C1C1C; width: 80px;">当前租期：</div>
+              <div style="width: 50%;text-align: right; font-size: 10px; color: #A4A4A4;">{{(indexData.orderStartTime || '-') + '至' + (indexData.orderEndTime || '-')}}</div>
             </div>
             <div style="display: flex;margin-top: 20px;">
               <div style="font-size: 14px; color: #1C1C1C; width: 100px;">当前租金：</div>
@@ -695,15 +695,15 @@
             </div>
             <div style="display: flex;margin-top: 20px;">
               <div style="font-size: 14px; color: #1C1C1C; width: 100px;">押金-收：</div>
-              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.rental || 0}}</div>
+              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.cashIn || 0}}</div>
             </div>
             <div style="display: flex;margin-top: 20px;">
               <div style="font-size: 14px; color: #1C1C1C; width: 100px;">丢失保障金：</div>
-              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.cash || 0}}</div>
+              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.securityCash || 0}}</div>
             </div>
             <div style="display: flex;margin-top: 20px;">
               <div style="font-size: 14px; color: #1C1C1C; width: 100px;">处置收入：</div>
-              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.cash || 0}}</div>
+              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.handleProfit || 0}}</div>
             </div>
             
             <!-- <div style="margin-top: 40px; color: #fff; background: #58ACFA; width: 80px; height: 50px; line-height: 50px;text-align: center; border-radius: 6px;"  @click="clickHandle">{{isList?'图形展示':'列表展示'}}</div> -->
@@ -715,23 +715,23 @@
             <div style="height: 1px;width: 80%;background: #A4A4A4;"></div>
             <div style="display: flex;margin-top: 20px;">
               <div style="font-size: 14px; color: #1C1C1C; width: 100px;">运维支出：</div>
-              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.income || 0}}</div>
+              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.omTotalCost || 0}}</div>
             </div>
             <div style="display: flex;margin-top: 20px;">
               <div style="font-size: 14px; color: #1C1C1C; width: 100px;">活动支出：</div>
-              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.cashIn || 0}}</div>
+              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.opTotalCost || 0}}</div>
             </div>
             <div style="display: flex;margin-top: 20px;">
               <div style="font-size: 14px; color: #1C1C1C; width: 100px;">赔偿支出：</div>
-              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.securityCash || 0}}</div>
+              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.comTotalCost || 0}}</div>
             </div>
             <div style="display: flex;margin-top: 20px;">
               <div style="font-size: 14px; color: #1C1C1C; width: 100px;">运营支出：</div>
-              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.netRental || 0}}</div>
+              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.opTotalCost || 0}}</div>
             </div>
             <div style="display: flex;margin-top: 20px;">
               <div style="font-size: 14px; color: #1C1C1C; width: 100px;">金融支出：</div>
-              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.netRental || 0}}</div>
+              <div style="width: 50%;text-align: right; font-size: 14px; color: #A4A4A4;">{{indexData.fiPaidCost || 0}}</div>
             </div>
           </div>
         </div>
@@ -789,7 +789,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column label="总体IRR">
+              <el-table-column label="预估总体IRR">
                 <template slot-scope="scope">
                   {{ scope.row.description || '-' }}
                 </template>
@@ -895,8 +895,8 @@ export default {
       ],
       pageData: {},
       indexData: {},
-      // url: 'http://47.111.243.220:8182',
-      url: 'http://192.168.0.113:8082'
+      url: 'http://47.111.243.220:8182',
+      // url: 'http://192.168.0.113:8082'
     }
   },
   mounted() {
@@ -991,23 +991,45 @@ export default {
     },
     //导出
     exporthandle() {
-      axios({
-        url:`${this.url}/api/v1/appassetprofit/export?param.sn=${this.listQuery.sn}&param.timeStart=${this.listQuery.timeStart}&param.timeEnd=${this.listQuery.timeEnd}&param.tableOrder=${this.listQuery.tableOrder}`,
-        method:'get',
-        responseType:'blob',
-        method: 'get',
-        headers: {
-          'X-Token': getToken(),
-          'Content-Type': 'application/json;charset=UTF-8'
-        },
-        // params: {
-        //   sn: this.listQuery.sn,
-        //   timeStart: this.listQuery.timeStart,
-        //   timeEnd: this.listQuery.timeEnd
-        // }
-      }).then(res => {
+      debugger
+      var xhr = new XMLHttpRequest();
+      var formData = new FormData();
+      xhr.open('get', this.url + '/api/v1/appassetprofit/export?sn=${this.listQuery.sn}&timeStart=${this.listQuery.timeStart}&timeEnd=${this.listQuery.timeEnd}&tableOrder=${this.listQuery.tableOrder}&type=${this.listQuery.type}', true);  //url填写后台的接口地址，如果是post，在formData append参数（参考原文地址）
+      xhr.setRequestHeader('X-Token', getToken());
+      xhr.setRequestHeader('Content-Type', 'application/json;charset=utf-8');
+      xhr.responseType = 'blob';
+      xhr.onload = function (e) {
+        debugger
+        var blob = this.response;
+        if(window.navigator.msSaveOrOpenBlob){
+            window.navigator.msSaveBlob(blob, 'msSaveBlob_testFile.xls');
+        }else{
+            var link = document.createElement('a');
+            link.href = window.URL.createObjectURL(blob);
+            link.download = 'msSaveBlob_testFile.xls';
+            link.click();
+            window.URL.revokeObjectURL(link.href);
+        }
+        xhr.send(null);
+      };
+      // xhr.send(formData);
+      // axios({
+      //   url:`${this.url}/api/v1/appassetprofit/export?sn=${this.listQuery.sn}&timeStart=${this.listQuery.timeStart}&timeEnd=${this.listQuery.timeEnd}&tableOrder=${this.listQuery.tableOrder}&type=${this.listQuery.type}`,
+      //   method:'get',
+      //   responseType:'blob',
+      //   headers: {
+      //     'X-Token': getToken(),
+      //     'Content-Type': 'application/json;charset=UTF-8'
+      //   },
+      //   params: {
+      //     sn: this.listQuery.sn,
+      //     timeStart: this.listQuery.timeStart,
+      //     timeEnd: this.listQuery.timeEnd
+      //   }
+      // })
+      // .then(res => {
 
-      })
+      // })
       // window.location.href = `${this.url}/api/v1/appassetprofit/export?sn=${this.listQuery.sn}&timeStart=${this.listQuery.timeStart}&timeEnd=${this.listQuery.timeEnd}`
       // exportData(this.listQuery).then(res => {
 

vue.config.js

@@ -40,8 +40,8 @@ module.exports = {
             // change xxx-api/login => mock/login
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                // target: `http://47.111.243.220:8182`,
-                target: `http://192.168.0.113:8082`,
+                target: `http://47.111.243.220:8182`,
+                // target: `http://192.168.0.113:8082`,
                 changeOrigin: true,
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_BASE_API]: ''