Merge branch 'test-new' into 'hjw'

# Conflicts:
#   src/pages/main/fullcalendar/calendar.vue
#   vue.config.js

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/fullcalendar/calendar.vue

@@ -25,7 +25,7 @@
 <!-- 日历菜单栏 -->
                         <full-calendar
                             ref="fullCalendar"
-                            style="height: 100%"
+                            style="height: 100%;color:black"
                             :options="calendarOptions"
                         >
                         </full-calendar>
@@ -192,6 +192,7 @@
                 // },
                 // Colorr:"",
                 dialogVisible: false,
+                xuanting:false,
                 // meetingRoomList: [],
                 subList: [],
                 array: [],

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

@@ -135,8 +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", 
+                target: "http://192.168.3.129:9600",
                 changeOrigin: true,
             },
         },

xuanting

@@ -0,0 +1 @@
+