+

src/main/vue/src/plugins/http.js

@@ -5,8 +5,8 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        baseUrl = 'http://localhost:8080';
-        // baseUrl = 'http://wlj.izouma.com';
+        // baseUrl = 'http://localhost:8080';
+        baseUrl = 'http://wlj.izouma.com';
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';

src/main/vue/src/views/PerformanceEdit.vue

@@ -13,7 +13,7 @@
                 <el-input v-model="formData.name"></el-input>
             </el-form-item>
             <el-form-item prop="startTime" label="时间">
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="formData.startTime"
                     type="date"
                     value-format="yyyy-MM-dd"
@@ -29,6 +29,16 @@
                     placeholder="选择日期"
                     style="width: 190px; margin-left: 20px"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="dateRange"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    start-placeholder="请选择开始时间"
+                    end-placeholder="请选择结束时间"
+                    range-separator="至"
+                    style="width: 100%"
+                >
                 </el-date-picker>
             </el-form-item>
             <el-form-item prop="address" label="地点">
@@ -72,7 +82,8 @@ export default {
             statusOptions: [
                 { label: '报名中', value: 'APPLY' },
                 { label: '已结束', value: 'END' }
-            ]
+            ],
+            dateRange: ''
         };
     },
     methods: {
@@ -87,7 +98,8 @@ export default {
         },
         submit() {
             let data = { ...this.formData };
-
+            data.startTime = this.dateRange[0];
+            data.endTime = this.dateRange[1];
             this.saving = true;
             this.$http
                 .post('/performance/save', data, { body: 'json' })

src/main/vue/src/views/Video.vue

@@ -43,11 +43,11 @@ export default {
     data() {
         return {
             layout: [
-                { x: 0, y: 0, w: 4, h: 16, i: '0', name: 'Video3' },
-                { x: 0, y: 0, w: 4, h: 15, i: '0', name: 'Video1' },
-                { x: 4, y: 4, w: 4, h: 15, i: '3', name: 'Video4' },
-                { x: 8, y: 4, w: 3, h: 22.5, i: '1', name: 'Video2' },
-                { x: 4, y: 12.5, w: 4, h: 16, i: '4', name: 'Video5' }
+                { x: 0, y: 0, w: 4, h: 17, i: '0', name: 'Video3' },
+                { x: 0, y: 0, w: 4, h: 16, i: '0', name: 'Video1' },
+                { x: 4, y: 4, w: 4, h: 16, i: '3', name: 'Video4' },
+                { x: 8, y: 4, w: 3, h: 23.5, i: '1', name: 'Video2' },
+                { x: 4, y: 12.5, w: 4, h: 17, i: '4', name: 'Video5' }
                 // { x: 0, y: 12.5, w: 4, h: 12.5, i: '5', name: 'Video4' }
                 // { x: 8, y: 0, w: 4, h: 13.5, i: '6', name: 'Video3' }
             ],

src/main/vue/src/widgets/BarChartWidget.vue

@@ -23,7 +23,7 @@ export default {
         this.myChart = new Chart(this.$refs.chart.getContext('2d'), {
             type: 'bar',
             data: {
-                labels: ['承办单位', '市政专家', '监管人员', '区县单位', '管理员'],
+                labels: ['承办单位', '市政专家', '监管人员', '区县单位', '市政人员'],
                 datasets: [
                     {
                         label: '团队分布',