From 5503d91087c16312da33bbc6e9d3c70921813297 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 28 五月 2024 15:44:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html | 70 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 1 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index c0f2480..611a0ba 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -196,7 +196,9 @@
HMaterID = params[params[1]]; //鐗╂枡ID
HSourceNo = params[params[2]]; //宸ュ崟鍙�
HSourceEntryID = params[params[3]]; //婧愬崟瀛愬唴鐮�
- get_SopFile(HMaterID, HSourceNo);
+ HProcID = params[params[4]]; //宸ュ簭ID
+ //get_SopFile(HMaterID, HSourceNo);// 鐗╂枡
+ get_SopFile2(HMaterID, HProcID); //鐗╂枡+宸ュ簭
return;
}
else {
@@ -365,6 +367,72 @@
}
//#endregion
+ //#region 鏍规嵁鐗╂枡+宸ュ簭鑾峰彇浣滀笟鎸囧涔�
+ function get_SopFile2(HMaterID, HProcID) {
+ var wait = layer.load();//閬僵
+ $("#file").html("");
+ $(".layui-carousel-ind").html("");
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SopBill/getListByMaterProc',
+ type: "GET",
+ data: { "HMaterID": HMaterID, "HProcID": HProcID },
+
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data[0]) {
+ HInterID = data1.data[0].HInterID
+ }
+ option.data = data1.data;
+ table.render(option);
+ //鏀寔鎾斁鐨勮棰戞牸寮�
+ var videoExtensions = ['.mp4', '.webm', '.Ogg'];
+
+ for (let i = 0; i < data1.data.length; i++) {
+ var html = '';
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
+ var FileName = data1.data[i].鏂囦欢鍚嶇О;
+ var FilePath = data1.data[i].鏂囦欢鍦板潃;
+ //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
+ html += '<div><img src=../../../' + FilePath + ' alt="" style="width:100%;height:100%"></div>'
+ $("#file").append(html);
+ }
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
+ var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
+ var FilePath2 = data1.data[i].鏂囦欢鍦板潃;
+ //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
+ html += '<div><embed src="../../../' + FilePath2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
+ $("#file").append(html);
+ }
+ if (videoExtensions.includes(data1.data[i].鏂囦欢绫诲瀷)) {
+ var FileName3 = data1.data[i].鏂囦欢鍚嶇О;
+ var FilePath3 = data1.data[i].鏂囦欢鍦板潃;
+ var vvv = '';
+ vvv += '<source src=../../../' + FilePath3 + ' type="video/webm" />'
+ $("#video").append(vvv);
+ }
+
+ }
+
+ if (data1.data.length == 0) {
+ var html2 = '<h1 style="text-align:center;line-height:570px;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
+ $("#file").append(html2);
+ }
+ ins.reload({ autoplay: false })
+
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 鍔犺浇缃戞牸
function get_Display(HSourceID, HID) {
var wait = layer.load();//閬僵
--
Gitblit v1.9.1