From c5cb75e69127ce6a2020be78e0a10f284e2091ca Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 02 一月 2020 23:56:42 +0800
Subject: [PATCH] 合并最新功能版本
---
WebService/src/main/resources/components/applicationKeyPackage/edit-applicationKey/editApplicationKey.html | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/WebService/src/main/resources/components/applicationKeyPackage/edit-applicationKey/editApplicationKey.html b/WebService/src/main/resources/components/applicationKeyPackage/edit-applicationKey/editApplicationKey.html
index 8034d5c..7bb9c07 100644
--- a/WebService/src/main/resources/components/applicationKeyPackage/edit-applicationKey/editApplicationKey.html
+++ b/WebService/src/main/resources/components/applicationKeyPackage/edit-applicationKey/editApplicationKey.html
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-sm-5" style="text-align:center">
- <video id="photo" style="width: 100%;"></video>
- <canvas id="canvas" style="display:none;"></canvas>
+ <video id="editApplicationKeyPhoto" style="width: 100%;"></video>
+ <canvas id="editApplicationKeyCanvas" style="display:none;"></canvas>
<div style="margin-top:20px">
<button class="btn btn-primary" type="button" v-on:click="_takeEditPhoto()"><span
class="glyphicon glyphicon-camera"></span> 鎷嶇収
@@ -47,6 +47,16 @@
<option value="10001">淇濇磥</option>
<option value="10002">淇濆畨</option>
<option value="10003">鍏朵粬浜哄憳</option>
+ </select></div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">閽ュ寵绫诲瀷</label>
+ <div class="col-sm-10">
+ <select class="custom-select" v-model="editApplicationKeyInfo.typeFlag" readonly="true">
+ <option selected disabled value="">蹇呭～锛岃閫夋嫨閽ュ寵绫诲瀷鐢宠</option>
+ <option value="1100101">浜鸿劯</option>
+ <option value="1100102">鍥哄畾瀵嗙爜</option>
+ <option value="1100103">涓存椂瀵嗙爜</option>
</select></div>
</div>
<div class="form-group row">
@@ -128,7 +138,7 @@
class="form-control editApplicationStartTime">
</div>
</div>
- <div class="form-group row">
+ <div class="form-group row" v-show="editApplicationKeyInfo.typeFlag == '1100101' || editApplicationKeyInfo.typeFlag == '1100102' ">
<label class="col-sm-2 col-form-label">缁撴潫鏃堕棿</label>
<div class="col-sm-10">
<input v-model="editApplicationKeyInfo.endTime" readonly type="text"
@@ -136,6 +146,11 @@
class="form-control editApplicationEndTime">
</div>
</div>
+ <div class="form-group row" v-if="editApplicationKeyInfo.typeFlag == '1100101'">
+ <label class="col-sm-2 col-form-label">鐓х墖</label>
+ <div class="col-sm-10"><img width="100%" height="100%"
+ v-bind:src="editApplicationKeyInfo.photo" alt="鐢宠浜虹収鐗�"></div>
+ </div>
<div class="ibox-content">
<button class="btn btn-primary float-right" type="button"
--
Gitblit v1.8.0