From e63926cffb16b8c4ea6faf0ab5c01ca5092201c0 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 13 Apr 2023 16:26:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=81=E4=B9=A6=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=80=E5=BC=A0;opl=20detail=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scOpl/scFire.vue | 56 +++++++++++++++++++++++++++------
 src/views/hrm/certificate.vue   |  2 ++
 src/views/login/index.vue       | 15 +++++++--
 src/views/rpm/rcertificate.vue  |  1 +
 4 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue
index ee01597d..1661f3d1 100644
--- a/src/components/scOpl/scFire.vue
+++ b/src/components/scOpl/scFire.vue
@@ -97,15 +97,36 @@
 					<el-descriptions-item label="监控状态:" span=2  v-if="form.mtask_uid">
 						<span>进行中</span>
 					</el-descriptions-item>
-					<el-descriptions-item label="作业前照片:" span=2 v-if="form.create_imgs&&form.create_imgs.length>0">
-						<el-image 
-							v-for="item in form.create_imgs_" 
-							:key="item.id"
-							:src="item.path" 
-							style="width: 100px;height: 80px;vertical-align: middle;"
-						></el-image> 
+					<el-descriptions-item label="现场照片:" span=2 v-if="form.create_imgs&&form.create_imgs.length>0">
+						<!-- <el-upload
+							v-model:file-list="create_imgs_list"
+							list-type="picture-card"
+							:auto-upload="false"
+							action="#"
+							:disabled="true"
+						>
+						</el-upload>-->
+							<el-image 
+								v-for = "item in form.create_imgs_"
+								:key = "item.id"
+								style="margin-right: 8px;height: 146px;height:146px;"
+								:src="item.path"
+								:preview-src-list="item.path"
+								:initial-index="1"
+								fit="cover"
+							/>
+					</el-descriptions-item>
+					<el-descriptions-item label="关闭照片:" span=2 v-if="form.close_imgs&&form.close_imgs.length>0">
+						<el-image 
+								v-for = "item in form.close_imgs_"
+								:key = "item.id"
+								style="margin-right: 8px;height: 146px;height:146px;"
+								:src="item.path"
+								:preview-src-list="item.path"
+								:initial-index="1"
+								fit="cover"
+							/>
 					</el-descriptions-item>
-
 				</el-descriptions>
 			</el-card>
 			<!-- <p class="tables-title" v-if="ticketDetailState">进度流程</p>
@@ -207,6 +228,8 @@
 		},
 		data() {
 			return {
+				create_imgs_list: [],
+				close_imgs_list: [],
 				mainLoading: false,
 				issave: false, //控制基本信息提交
 				search: {
@@ -304,9 +327,22 @@
 					that.form = res;
 					that.oplcateCode = res.cate_code;
 					that.ticketId = res.ticket;
+					res.create_imgs_.forEach(item=>{
+						console.log(item)
+						that.create_imgs_list.push({
+							url: item.path,
+							name: '',
+						})
+					})
+					res.close_imgs_.forEach(item=>{
+						that.close_imgs_list.push({
+							url: item.path,
+							name: '',
+						})
+					})
 					that.$nextTick(()=>{
-						this.$API.wf.ticket.ticketFlowlogs.req(that.ticketId).then((res) => {
-							if (res.err_msg) {
+						this.$API.wf.ticket.ticketFlowlogs.req(that.ticketId).then((res2) => {
+							if (res2.err_msg) {
 							} else {
 							that.logsData = res;
 							}
diff --git a/src/views/hrm/certificate.vue b/src/views/hrm/certificate.vue
index e9a47949..3c3be5e2 100644
--- a/src/views/hrm/certificate.vue
+++ b/src/views/hrm/certificate.vue
@@ -166,9 +166,11 @@
             />
           </el-form-item>
           <el-form-item label="上传证书">
+            <!-- <sc-upload v-model="form.file" :modelValue="form.file" title="证件图片" :width="300" :height="148"></sc-upload> -->
             <sc-upload-file
               v-model="form.file"
               :multiple="false"
+              :limit="1"
               accept="image/png, image/jpeg, image/jpeg, pdf"
             >
               <el-button type="primary" icon="el-icon-upload"
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 8a501597..adcfed1c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -39,7 +39,8 @@
 				</div>
 				-->
 				<div class="login-oauth">
-					<el-button type="success" @click="appDown" style="background-color:#2cd4f9;border-color:#2cd4f9">安卓APP</el-button>
+					<el-button type="default" @click="appDown">安卓APP</el-button>
+					<el-button type="default" @click="h5Show">H5访问</el-button>
 					<el-button type="primary" @click="MonitorOpen" style="background-color:orange;border-color:orange">监控视频</el-button>
 				</div>
 			</div>
@@ -59,6 +60,11 @@
 			<sc-qr-code class="qrCode" :size="200" :text="appUrl"></sc-qr-code>
 		</div>
 	</el-dialog>
+	<el-dialog v-model="showH5" title="H5页面" :width="400" destroy-on-close>
+		<div class="qrCodeLogin">
+			<sc-qr-code class="qrCode" :size="200" :text="h5Url"></sc-qr-code>
+		</div>
+	</el-dialog>
 </template>
 
 <script>
@@ -91,7 +97,9 @@ import passwordForm from './components/passwordForm'
 				showWechatLogin: false,
 				isWechatLoginResult: false,
 				showApp: false,
-				appUrl: 'http://222.222.144.147:6013/media/zc_ehs.apk'
+				appUrl: 'http://222.222.144.147:6013/media/zc_ehs.apk',
+				showH5: false,
+				h5Url: 'http://222.222.144.147:6013/h5/'
 			}
 		},
 		watch:{
@@ -124,6 +132,9 @@ import passwordForm from './components/passwordForm'
 			appDown() {
 				this.showApp = true;
 			},
+			h5Show() {
+				this.showH5 = true;
+			},
 			MonitorOpen(){
 				window.open('http://10.99.5.79:5515/')
 			},
diff --git a/src/views/rpm/rcertificate.vue b/src/views/rpm/rcertificate.vue
index 931c372c..e9815780 100644
--- a/src/views/rpm/rcertificate.vue
+++ b/src/views/rpm/rcertificate.vue
@@ -189,6 +189,7 @@
             <sc-upload-file
               v-model="form.file"
               :multiple="false"
+              :limit="1"
               accept="image/png, image/jpeg, image/jpeg, pdf"
             >
               <el-button type="primary" icon="el-icon-upload">上传</el-button>