用户备案修改

src/main/vue/src/views/ExamRoomEdit.vue

@@ -12,7 +12,7 @@
             <el-form-item prop="name" label="考场名称">
                 <el-input v-model="formData.name"></el-input>
             </el-form-item>
-            <el-form-item prop="address" label="考场地址">
+            <el-form-item prop="address" label="考场详细地址">
                 <el-input type="textarea" :rows="2" v-model="formData.address"></el-input>
             </el-form-item>
             <el-form-item prop="deviceSerial" label="设备序列号">

src/main/vue/src/views/ExamRoomList.vue

@@ -31,7 +31,7 @@
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
             <el-table-column prop="name" label="考场名称"> </el-table-column>
-            <el-table-column prop="address" label="考场地址"> </el-table-column>
+            <el-table-column prop="address" label="考场详细地址"> </el-table-column>
             <el-table-column prop="deviceSerial" label="设备序列号"> </el-table-column>
             <el-table-column prop="validateCode" label="设备验证码"> </el-table-column>
             <el-table-column prop="status" label="状态"
@@ -41,13 +41,13 @@
             >
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
-                    <el-button @click="monitor(row)" type="success" size="mini" plain>监控</el-button>
                     <el-button @click="editRow(row)" type="primary" size="mini" plain v-if="organization"
                         >编辑</el-button
                     >
-                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain v-if="organization"
+                    <el-button @click="monitor(row)" type="success" size="mini" plain>查看视频</el-button>
+                    <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain v-if="organization"
                         >删除</el-button
-                    >
+                    > -->
                 </template>
             </el-table-column>
         </el-table>

src/main/vue/src/views/record/RecordList.vue

@@ -53,12 +53,6 @@
             >
                 <el-button slot="trigger" size="small" type="primary" class="filter-item">批量上传</el-button>
             </el-upload>
-
-            <!-- <el-button @click="upload" type="primary" icon="el-icon-plus" class="filter-item">批量上传 </el-button> -->
-            <!-- <el-button @click="update" type="primary" icon="el-icon-refresh" class="filter-item"
-                    >一键获取
-                </el-button> -->
-            <!-- <el-button @click="distribute" type="primary" class="filter-item">一键分发 </el-button> -->
             <el-button
                 @click="download"
                 type="primary"

src/main/vue/src/views/record/RecordOrganizationList.vue

@@ -1,17 +1,59 @@
 <template>
     <div class="list-view">
         <div class="filters-container">
-            <div style="padding-left: 20px">
-                <el-button
-                    @click="download"
-                    type="primary"
-                    icon="el-icon-download"
-                    :loading="downloading"
-                    class="filter-item"
-                    :disabled="totalElements <= 0"
-                    >导出EXCEL
-                </el-button>
-            </div>
+            <el-form :model="form" inline size="small">
+                <el-form-item label="考级活动名称">
+                    <el-input placeholder="输入考级活动名称" v-model="search" clearable class="filter-item"></el-input>
+                </el-form-item>
+                <el-form-item label="考级机构名称">
+                    <el-input placeholder="输入考级机构名称" v-model="agency" clearable class="filter-item"></el-input>
+                </el-form-item>
+                <el-form-item label="考级活动时间">
+                    <el-date-picker
+                        v-model="dateRange"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        start-placeholder="请选择开始时间"
+                        end-placeholder="请选择结束时间"
+                        range-separator="至"
+                        class="filter-item"
+                    >
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="考级活动地址">
+                    <el-select
+                        class="filter-item"
+                        v-model="districtId"
+                        clearable
+                        placeholder="请选择区县"
+                        style="width: 200px"
+                    >
+                        <el-option
+                            v-for="item in district"
+                            :key="item.id"
+                            :value="item.name"
+                            :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="考级详细地址">
+                    <el-input style="width: 200px" placeholder="输入考级详细地址"></el-input>
+                </el-form-item>
+                <el-col :span="24">
+                    <el-button @click="getVideo" type="primary" icon="el-icon-search" class="filter-item"
+                        >查询
+                    </el-button>
+                    <el-button
+                        @click="download"
+                        type="primary"
+                        icon="el-icon-download"
+                        :loading="downloading"
+                        class="filter-item"
+                        :disabled="totalElements <= 0"
+                        >导出
+                    </el-button>
+                </el-col>
+            </el-form>
         </div>
         <el-table
             :data="tableData"
@@ -32,38 +74,52 @@
                 </template>
             </el-table-column>
             <el-table-column prop="examinationAgency" label="考级机构名称" min-width="150"></el-table-column>
-            <el-table-column prop="district" label="考级地点" min-width="70"></el-table-column>
-            <el-table-column prop="examinationAddress" label="考级详细地址" min-width="70"></el-table-column>
-            <el-table-column label="考级状态" min-width="70">
+            <el-table-column prop="district" label="考级地点" min-width="65"></el-table-column>
+            <el-table-column prop="examinationAddress" label="考级详细地址" min-width="150"></el-table-column>
+            <el-table-column label="考级状态" min-width="65">
                 <template slot-scope="{ row }">
-                    <el-link
-                        style="font-size: 13px"
-                        :underline="false"
-                        type="info"
-                        v-if="currentTime < row.examinationStartTime"
+                    <el-link style="font-size: 13px" :underline="false" v-if="currentTime < row.examinationStartTime"
                         >未开考
                     </el-link>
-                    <el-link
-                        style="font-size: 13px"
-                        :underline="false"
-                        type="warning"
-                        v-else-if="currentTime > row.examinationEndTime"
+                    <el-link style="font-size: 13px" :underline="false" v-else-if="currentTime > row.examinationEndTime"
                         >已开考
                     </el-link>
                     <el-link
                         style="font-size: 13px"
                         :underline="false"
-                        type="success"
                         v-else-if="currentTime >= row.examinationStartTime && currentTime <= row.examinationEndTime"
                         >考级中
                     </el-link>
                 </template>
             </el-table-column>
             <!-- <el-table-column prop="recordTime" label="备案时间" min-width="90"></el-table-column> -->
-            <el-table-column label="操作" align="center" fixed="right" min-width="140">
+            <el-table-column label="操作" align="center" fixed="right" min-width="240">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
-                    <el-button @click="showVideo(row)" type="success" size="mini" plain>视频设置</el-button>
+                    <el-button @click="editRow(row)" size="mini" plain>查看</el-button>
+                    <el-button
+                        @click="showVideo(row)"
+                        size="mini"
+                        type="warning"
+                        plain
+                        v-if="currentTime >= row.examinationStartTime"
+                        >设置视频</el-button
+                    >
+                    <el-button
+                        @click="showVideo(row)"
+                        size="mini"
+                        plain
+                        type="success"
+                        v-if="currentTime < row.examinationStartTime || currentTime > row.examinationEndTime"
+                        >视频监控</el-button
+                    >
+                    <el-button
+                        @click="showVideo(row)"
+                        size="mini"
+                        plain
+                        v-if="currentTime <= row.examinationEndTime"
+                        type="primary"
+                        >上传视频</el-button
+                    >
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
             </el-table-column>
@@ -256,21 +312,8 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.span-size {
-    font-size: 14px;
-    color: #565b66;
-    line-height: 15px;
-    padding: 0 10px 0 10px;
-}
-.span-width {
-    width: 330px;
-    display: inline-block;
-    text-align: right;
-}
-.span-width2 {
-    width: 500px;
-    // float: left;
-    text-align: right;
-    display: inline-block;
+/deep/.el-form-item--mini.el-form-item,
+.el-form-item--small.el-form-item {
+    margin-bottom: 3px;
 }
 </style>