Commit d6fa5a51bd559f3b82e7bb2ee4b65e2b49379b47

Authored by liujun001
1 parent 0d6f1379

优化页面

.env.devTest
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 临港巴士岗前检测系统 @@ -5,7 +5,7 @@ VITE_APP_TITLE = 临港巴士岗前检测系统
5 VITE_APP_ENV = 'devTest' 5 VITE_APP_ENV = 'devTest'
6 6
7 # 签到机系统/测试 7 # 签到机系统/测试
8 -VITE_APP_BASE_API = 'http://192.168.169.100:8100' 8 +VITE_APP_BASE_API = 'http://61.169.120.202:8100'
9 # VITE_APP_BASE_API = 'http://101.95.136.202:8100' 9 # VITE_APP_BASE_API = 'http://101.95.136.202:8100'
10 10
11 # 是否在打包时开启压缩,支持 gzip 和 brotli 11 # 是否在打包时开启压缩,支持 gzip 和 brotli
.env.production
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'production' @@ -6,7 +6,7 @@ VITE_APP_ENV = 'production'
6 6
7 # 签到机系统/生产环境 7 # 签到机系统/生产环境
8 # VITE_APP_BASE_API = 'http://101.95.136.202:8100' 8 # VITE_APP_BASE_API = 'http://101.95.136.202:8100'
9 -VITE_APP_BASE_API = 'http://101.95.136.206:8100' 9 +VITE_APP_BASE_API = 'http://61.169.120.202:8102'
10 # VITE_APP_BASE_API = 'http://1.14.107.94:8100' 10 # VITE_APP_BASE_API = 'http://1.14.107.94:8100'
11 11
12 # 是否在打包时开启压缩,支持 gzip 和 brotli 12 # 是否在打包时开启压缩,支持 gzip 和 brotli
public/favicon.ico
No preview for this file type
src/assets/logo/logo.png

7.95 KB | W: | H:

11.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
src/views/in/in/index.vue
@@ -87,7 +87,8 @@ @@ -87,7 +87,8 @@
87 <el-table-column label="打卡时间" align="center" prop="createTime" width="160" /> 87 <el-table-column label="打卡时间" align="center" prop="createTime" width="160" />
88 <el-table-column label="打卡操作" align="center" prop="singnIn" width="320"> 88 <el-table-column label="打卡操作" align="center" prop="singnIn" width="320">
89 <template #default="scope"> 89 <template #default="scope">
90 - <dict-tag :options="sys_status" :value="scope.row.singnIn ? scope.row.singnIn.split(',') : []" /> 90 + <view><dict-tag :options="sys_status" :value="scope.row.singnIn ? scope.row.singnIn.split(',') : []" /></view>
  91 + <view><button @click="openVideoDialog(scope.row)" v-if="displayViedeo(scope.row)">视频</button></view>
91 </template> 92 </template>
92 </el-table-column> 93 </el-table-column>
93 </el-table> 94 </el-table>
@@ -142,6 +143,12 @@ @@ -142,6 +143,12 @@
142 </template> 143 </template>
143 </el-dialog> 144 </el-dialog>
144 </div> 145 </div>
  146 +
  147 + <div>
  148 + <el-dialog title="查看签到视频" v-model="videoURLOpen" width="1200px">
  149 + <view v-html="videoHTMl" style="width: 900px; height: 800px;text-align: center;"></view>
  150 + </el-dialog>
  151 + </div>
145 </template> 152 </template>
146 153
147 <script setup name="In"> 154 <script setup name="In">
@@ -165,6 +172,8 @@ const multiple = ref(true); @@ -165,6 +172,8 @@ const multiple = ref(true);
165 const dialogLoading = ref(false) 172 const dialogLoading = ref(false)
166 const total = ref(0); 173 const total = ref(0);
167 const title = ref(""); 174 const title = ref("");
  175 +const videoHTMl = ref("");
  176 +const videoURLOpen=ref(false);
168 const sort = ref(0) 177 const sort = ref(0)
169 const timer = ref(0); 178 const timer = ref(0);
170 const options = ref([]) 179 const options = ref([])
@@ -406,6 +415,15 @@ function handleExport() { @@ -406,6 +415,15 @@ function handleExport() {
406 }, `${queryParams.value.date}打卡记录表.xlsx`) 415 }, `${queryParams.value.date}打卡记录表.xlsx`)
407 } 416 }
408 417
  418 +function openVideoDialog(data){
  419 + videoHTMl.value ="<video controls height=600 width=\"100%\" ><source src=\""+data.videoURL+"\" type=\"video/mp4\" /></video>";
  420 + videoURLOpen.value=true;
  421 +}
  422 +
  423 +function displayViedeo(data){
  424 + return null != data.videoURL && undefined != data.videoURL && '' != data.videoURL
  425 +}
  426 +
409 watch(open, (val1, val2) => { 427 watch(open, (val1, val2) => {
410 if (!open.value) { 428 if (!open.value) {
411 dateOptions.value = [] 429 dateOptions.value = []
src/views/system/dict/data.vue
@@ -95,6 +95,7 @@ @@ -95,6 +95,7 @@
95 <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag> 95 <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag>
96 </template> 96 </template>
97 </el-table-column> 97 </el-table-column>
  98 + <el-table-column label="数据key" align="center" prop="discKey" />
98 <el-table-column label="字典键值" align="center" prop="dictValue" /> 99 <el-table-column label="字典键值" align="center" prop="dictValue" />
99 <el-table-column label="字典排序" align="center" prop="dictSort" /> 100 <el-table-column label="字典排序" align="center" prop="dictSort" />
100 <el-table-column label="状态" align="center" prop="status"> 101 <el-table-column label="状态" align="center" prop="status">
@@ -136,6 +137,9 @@ @@ -136,6 +137,9 @@
136 <el-form-item label="数据键值" prop="dictValue"> 137 <el-form-item label="数据键值" prop="dictValue">
137 <el-input v-model="form.dictValue" placeholder="请输入数据键值" /> 138 <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
138 </el-form-item> 139 </el-form-item>
  140 + <el-form-item label="数据key" prop="discKey">
  141 + <el-input v-model="form.discKey" placeholder="请输入样式属性" />
  142 + </el-form-item>
139 <el-form-item label="样式属性" prop="cssClass"> 143 <el-form-item label="样式属性" prop="cssClass">
140 <el-input v-model="form.cssClass" placeholder="请输入样式属性" /> 144 <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
141 </el-form-item> 145 </el-form-item>