Merge branch 'master' into 'debug-xxa'

# Conflicts:
#   public/static/views/publiAccount.html

src/components/p-header.vue

@@ -15,10 +15,10 @@
     </div> -->
     <div class="bars">
       <div class="bars-item user-info">Hello，{{ username }}</div>
-<!--      <div class="bars-item" @click="handleGoToCalendar">-->
-<!--        <i class="el-icon-date"></i>-->
-<!--        日历-->
-<!--      </div>-->
+      <div class="bars-item" @click="handleGoToCalendar">
+        <i class="el-icon-date"></i>
+        日历
+      </div>
 
       <div class="bars-item" @click="handleHelp">
         <i class="el-icon-time"></i>

src/pages/main/demandDevelop/ywStanding.vue

@@ -137,6 +137,7 @@ export default {
             body: { data, count },
           },
         }) => {
+          this.total = count;
           this.tableData = data;
           this.total = count;
         }

src/pages/main/performance/common/export.js

@@ -29,7 +29,7 @@ export var exportExcel = function (luckysheet, value) {
         const blob = new Blob([data], {
             type: "application/vnd.ms-excel;charset=utf-8",
         });
-        console.log("导出成功！");
+        console.log("导出成功！2");
         FileSaver.saveAs(blob, `${value}.xlsx`);
     });
     return buffer;

src/pages/main/performance/components/table.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-11-01 18:02:58
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-02-10 11:17:50
+ * @LastEditTime: 2022-02-10 18:31:51
  * @FilePath     : /spfm-market-front/src/pages/main/performance/components/table.vue
 -->
 <template>

vue.config.js

@@ -93,7 +93,7 @@ module.exports = {
         proxy: {
             // 开发环境变化可注释 ⬇️⬇️
             "/market/CMK": {
-                target: "127.0.0.1:9113",
+                target: "http://192.168.3.129:9113",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -101,7 +101,7 @@ module.exports = {
                 },
             },
             "/market/mk": {
-                target: "127.0.0.1:9113",
+                target: "http://192.168.3.129:9113",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -109,7 +109,7 @@ module.exports = {
                 },
             },
             "/market/techcentergj": {
-                target: "127.0.0.1:9113",
+                target: "http://192.168.3.129:9113",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -117,7 +117,7 @@ module.exports = {
                 },
             },
             "/mkWangge": {
-                target: "127.0.0.1:9113",
+                target: "http://192.168.3.129:9113",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -135,7 +135,7 @@ module.exports = {
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
-                target: "http://127.0.0.1:9600",
+                target: "http://192.168.3.129:9600",
                 changeOrigin: true,
             },
         },