Merge pull request #13 from bosscheng/master

fix bug
Monibuca · Dec 25, 2020 · c5d328d · c5d328d
2 parents af8829b + 9ceeb2d
commit c5d328d
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 132 deletions.
diff --git a/ui/dist/plugin-gb28181.common.js b/ui/dist/plugin-gb28181.common.js
diff --git a/ui/dist/plugin-gb28181.common.js.map b/ui/dist/plugin-gb28181.common.js.map
diff --git a/ui/dist/plugin-gb28181.css b/ui/dist/plugin-gb28181.css
diff --git a/ui/dist/plugin-gb28181.umd.js b/ui/dist/plugin-gb28181.umd.js
diff --git a/ui/dist/plugin-gb28181.umd.js.map b/ui/dist/plugin-gb28181.umd.js.map
diff --git a/ui/dist/plugin-gb28181.umd.min.js b/ui/dist/plugin-gb28181.umd.min.js
diff --git a/ui/dist/plugin-gb28181.umd.min.js.map b/ui/dist/plugin-gb28181.umd.min.js.map
diff --git a/ui/src/App.vue b/ui/src/App.vue
@@ -33,7 +33,7 @@
                                         @click="invite(prop.row.ID, $index, item)"
                                 >连接
                                 </mu-button>
-                                <mu-button @click="getRecords(prop.row.ID, $index,item)">录像</mu-button>
+                                <mu-button flat @click="getRecords(prop.row.ID, $index,item)">录像</mu-button>
                             </td>
                         </template>
                     </mu-data-table>

diff --git a/ui/src/components/Records.vue b/ui/src/components/Records.vue
@@ -10,7 +10,7 @@
             <div class="search">
                 <DatePicker type="date" :options="timeOptions" :value="search.time" placeholder="请选择时间"
                             style="width: 200px" :clearable="false"
-                            @change="handleTimeChange"></DatePicker>
+                            @on-change="handleTimeChange"></DatePicker>
             </div>
             <div>
                 <mu-data-table :columns="columns" :data="recordList">
@@ -119,8 +119,8 @@
                     const query = {
                         id: this.search.id,
                         channel: this.search.channel,
-                        startTime: this.search.startTime,
-                        endTime: this.search.endTime
+                        startTime: this.startTime,
+                        endTime: this.endTime
                     };
 
                     this.ajax.get("/gb28181/query/records", query).then((x) => {
@@ -132,7 +132,7 @@
                 this.$emit('close');
             },
             handleTimeChange(date) {
-                this.search.time = date;
+                this.search.time = new Date(date);
                 this._fetchList();
             },
             play() {