guoyujia 2 miesięcy temu
rodzic
commit
c812fe23dd

+ 6 - 0
.env.development

@@ -8,3 +8,9 @@ VITE_APP_ENV = 'development'
 
 # 基础接口前缀
 VITE_APP_BASE_API = '/ezhizao-dms-supplier-api'
+# # 服务器地址
+VITE_HOST_URL = 'http://120.46.159.163:402'
+
+VITE_HOST_INNET = 'http://localhost:83'
+
+VITE_HOST_OUTNET = 'http://localhost:83'

+ 7 - 0
.env.production

@@ -9,3 +9,10 @@ VITE_APP_BASE_API = '/ezhizao-dms-supplier-api'
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip
+VITE_HOST_IP = '192.168.10.40'
+# 服务器地址
+VITE_HOST_URL = 'http://120.46.159.163:402'
+
+VITE_HOST_INNET = 'http://192.168.10.41=2:82/onlinePreview?url='
+
+VITE_HOST_OUTNET = 'http://120.46.159.163:8012/onlinePreview?url='

+ 1 - 0
index.html

@@ -8,6 +8,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
   <title>德迈仕数字化平台</title>
+  <script type="text/javascript" src="/js/base64.min.js"></script>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

+ 1 - 0
package.json

@@ -25,6 +25,7 @@
     "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",
     "i": "^0.3.7",
+    "js-base64": "^3.7.7",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.3.1",
     "jszip": "^3.10.1",

+ 178 - 0
public/js/base64.min.js

@@ -0,0 +1,178 @@
+(function (global, factory) {
+    typeof exports === "object" && typeof module !== "undefined" ? module.exports = factory(global) : typeof define === "function" && define.amd ? define(factory) : factory(global)
+}((typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : this), function (global) {
+    global = global || {};
+    var _Base64 = global.Base64;
+    var version = "2.6.3";
+    var b64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    var b64tab = function (bin) {
+        var t = {};
+        for (var i = 0, l = bin.length; i < l; i++) {
+            t[bin.charAt(i)] = i
+        }
+        return t
+    }(b64chars);
+    var fromCharCode = String.fromCharCode;
+    var cb_utob = function (c) {
+        if (c.length < 2) {
+            var cc = c.charCodeAt(0);
+            return cc < 128 ? c : cc < 2048 ? (fromCharCode(192 | (cc >>> 6)) + fromCharCode(128 | (cc & 63))) : (fromCharCode(224 | ((cc >>> 12) & 15)) + fromCharCode(128 | ((cc >>> 6) & 63)) + fromCharCode(128 | (cc & 63)))
+        } else {
+            var cc = 65536 + (c.charCodeAt(0) - 55296) * 1024 + (c.charCodeAt(1) - 56320);
+            return (fromCharCode(240 | ((cc >>> 18) & 7)) + fromCharCode(128 | ((cc >>> 12) & 63)) + fromCharCode(128 | ((cc >>> 6) & 63)) + fromCharCode(128 | (cc & 63)))
+        }
+    };
+    var re_utob = /[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;
+    var utob = function (u) {
+        return u.replace(re_utob, cb_utob)
+    };
+    var cb_encode = function (ccc) {
+        var padlen = [0, 2, 1][ccc.length % 3],
+            ord = ccc.charCodeAt(0) << 16 | ((ccc.length > 1 ? ccc.charCodeAt(1) : 0) << 8) | ((ccc.length > 2 ? ccc.charCodeAt(2) : 0)),
+            chars = [b64chars.charAt(ord >>> 18), b64chars.charAt((ord >>> 12) & 63), padlen >= 2 ? "=" : b64chars.charAt((ord >>> 6) & 63), padlen >= 1 ? "=" : b64chars.charAt(ord & 63)];
+        return chars.join("")
+    };
+    var btoa = global.btoa && typeof global.btoa == "function" ? function (b) {
+        return global.btoa(b)
+    } : function (b) {
+        if (b.match(/[^\x00-\xFF]/)) {
+            throw new RangeError("The string contains invalid characters.")
+        }
+        return b.replace(/[\s\S]{1,3}/g, cb_encode)
+    };
+    var _encode = function (u) {
+        return btoa(utob(String(u)))
+    };
+    var mkUriSafe = function (b64) {
+        return b64.replace(/[+\/]/g, function (m0) {
+            return m0 == "+" ? "-" : "_"
+        }).replace(/=/g, "")
+    };
+    var encode = function (u, urisafe) {
+        return urisafe ? mkUriSafe(_encode(u)) : _encode(u)
+    };
+    var encodeURI = function (u) {
+        return encode(u, true)
+    };
+    var fromUint8Array;
+    if (global.Uint8Array) {
+        fromUint8Array = function (a, urisafe) {
+            var b64 = "";
+            for (var i = 0, l = a.length; i < l; i += 3) {
+                var a0 = a[i],
+                    a1 = a[i + 1],
+                    a2 = a[i + 2];
+                var ord = a0 << 16 | a1 << 8 | a2;
+                b64 += b64chars.charAt(ord >>> 18) + b64chars.charAt((ord >>> 12) & 63) + (typeof a1 != "undefined" ? b64chars.charAt((ord >>> 6) & 63) : "=") + (typeof a2 != "undefined" ? b64chars.charAt(ord & 63) : "=")
+            }
+            return urisafe ? mkUriSafe(b64) : b64
+        }
+    }
+    var re_btou = /[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g;
+    var cb_btou = function (cccc) {
+        switch (cccc.length) {
+            case 4:
+                var cp = ((7 & cccc.charCodeAt(0)) << 18) | ((63 & cccc.charCodeAt(1)) << 12) | ((63 & cccc.charCodeAt(2)) << 6) | (63 & cccc.charCodeAt(3)),
+                    offset = cp - 65536;
+                return (fromCharCode((offset >>> 10) + 55296) + fromCharCode((offset & 1023) + 56320));
+            case 3:
+                return fromCharCode(((15 & cccc.charCodeAt(0)) << 12) | ((63 & cccc.charCodeAt(1)) << 6) | (63 & cccc.charCodeAt(2)));
+            default:
+                return fromCharCode(((31 & cccc.charCodeAt(0)) << 6) | (63 & cccc.charCodeAt(1)))
+        }
+    };
+    var btou = function (b) {
+        return b.replace(re_btou, cb_btou)
+    };
+    var cb_decode = function (cccc) {
+        var len = cccc.length,
+            padlen = len % 4,
+            n = (len > 0 ? b64tab[cccc.charAt(0)] << 18 : 0) | (len > 1 ? b64tab[cccc.charAt(1)] << 12 : 0) | (len > 2 ? b64tab[cccc.charAt(2)] << 6 : 0) | (len > 3 ? b64tab[cccc.charAt(3)] : 0),
+            chars = [fromCharCode(n >>> 16), fromCharCode((n >>> 8) & 255), fromCharCode(n & 255)];
+        chars.length -= [0, 0, 2, 1][padlen];
+        return chars.join("")
+    };
+    var _atob = global.atob && typeof global.atob == "function" ? function (a) {
+        return global.atob(a)
+    } : function (a) {
+        return a.replace(/\S{1,4}/g, cb_decode)
+    };
+    var atob = function (a) {
+        return _atob(String(a).replace(/[^A-Za-z0-9\+\/]/g, ""))
+    };
+    var _decode = function (a) {
+        return btou(_atob(a))
+    };
+    var _fromURI = function (a) {
+        return String(a).replace(/[-_]/g, function (m0) {
+            return m0 == "-" ? "+" : "/"
+        }).replace(/[^A-Za-z0-9\+\/]/g, "")
+    };
+    var decode = function (a) {
+        return _decode(_fromURI(a))
+    };
+    var toUint8Array;
+    if (global.Uint8Array) {
+        toUint8Array = function (a) {
+            return Uint8Array.from(atob(_fromURI(a)), function (c) {
+                return c.charCodeAt(0)
+            })
+        }
+    }
+    var noConflict = function () {
+        var Base64 = global.Base64;
+        global.Base64 = _Base64;
+        return Base64
+    };
+    global.Base64 = {
+        VERSION: version,
+        atob: atob,
+        btoa: btoa,
+        fromBase64: decode,
+        toBase64: encode,
+        utob: utob,
+        encode: encode,
+        encodeURI: encodeURI,
+        btou: btou,
+        decode: decode,
+        noConflict: noConflict,
+        fromUint8Array: fromUint8Array,
+        toUint8Array: toUint8Array
+    };
+    if (typeof Object.defineProperty === "function") {
+        var noEnum = function (v) {
+            return {
+                value: v,
+                enumerable: false,
+                writable: true,
+                configurable: true
+            }
+        };
+        global.Base64.extendString = function () {
+            Object.defineProperty(String.prototype, "fromBase64", noEnum(function () {
+                return decode(this)
+            }));
+            Object.defineProperty(String.prototype, "toBase64", noEnum(function (urisafe) {
+                return encode(this, urisafe)
+            }));
+            Object.defineProperty(String.prototype, "toBase64URI", noEnum(function () {
+                return encode(this, true)
+            }))
+        }
+    }
+    if (global["Meteor"]) {
+        Base64 = global.Base64
+    }
+    if (typeof module !== "undefined" && module.exports) {
+        module.exports.Base64 = global.Base64
+    } else {
+        if (typeof define === "function" && define.amd) {
+            define([], function () {
+                return global.Base64
+            })
+        }
+    }
+    return {
+        Base64: global.Base64
+    }
+}));

+ 7 - 1
src/api/business/outsourcedOrder.js

@@ -26,7 +26,13 @@ export function carrierForOutsource(query) {
 		params: query
 	})
 }
-
+export function getDrawingDetail(data) {
+	return request({
+		url: baseUrl + '/business/outsource/getDrawingDetail',
+		method: 'post',
+		data: data
+	})
+}
 export function saveCarriers(data) {
 	return request({
 		url: baseUrl + '/business/outsource/saveCarriers',

+ 102 - 0
src/views/business/outsourcedOrder/drawingDetail.vue

@@ -0,0 +1,102 @@
+<template>
+	<el-drawer title="工艺图纸" :with-header="false" v-model="visible" direction="rtl" size="30%">
+		<div class="form-container column-container">
+			<div class="form-btns-container">
+				<span class="title-label">
+					<el-icon>
+						<Document />
+					</el-icon>
+					<span>工艺图纸</span>
+				</span>
+				<div class="close-btn" @click="cancel">
+					<i class="fa fa-times" aria-hidden="true" />
+					<!-- <span>关闭</span> -->
+				</div>
+			</div>
+	<!-- 渲染数据区 -->
+			<div class="el-table-container" style="width: 100%;">
+				<div class="el-table-inner-container">
+					<el-table v-drawingLoading="drawingLoading" :data="drawingList" size="small" border height="100%">
+						<el-table-column label="工序简称" align="center" prop="processAlias" width="104" />
+						<el-table-column label="图纸" align="center" prop="drawingName"  />
+						<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="64">
+						<template #default="scope">
+							<el-button link type="primary" @click="handleShowDrawing(scope.row)"> 图纸 </el-button>
+						</template>
+					</el-table-column>
+					</el-table>
+				</div>
+			</div>
+		</div>
+	</el-drawer>
+</template>
+<script setup>
+import { getDrawingDetail } from '@/api/business/outsourcedOrder'
+const { proxy } = getCurrentInstance()
+/** 字典数组区 */
+/** 表单抽屉 页变量 */
+
+const drawingLoading = ref(false)
+const visible = ref(false)
+const drawingUrl = ref("");
+const webHost = import.meta.env.VITE_APP_BASE_API;
+const fileUrl = import.meta.env.VITE_PREVIEW_API;
+const hostUrl = import.meta.env.VITE_HOST_URL;
+
+const inNet = import.meta.env.VITE_HOST_INNET;
+const outNet = import.meta.env.VITE_HOST_OUTNET;
+const hostIp = import.meta.env.VITE_HOST_IP;
+const drawingList = ref([])
+
+/***********************  方法区  ****************************/
+/** 打开抽屉 */
+const open = (data) => {
+	console.log(data)
+	drawingLoading.value = true
+	visible.value = true
+	getDrawingDetail({id:data.id}).then(res => {
+		if(res.data && res.data.length > 0){
+			res.data.forEach(element => {
+				let itemUrl = document.location.origin;
+    let fUrl = "";
+    if (itemUrl.includes(hostIp)) {
+      fUrl = inNet;
+    } else {
+      fUrl = outNet;
+    }
+	console.log(hostUrl,webHost,fUrl)
+    element.drawingUrl =
+      fUrl + encodeURIComponent(Base64.encode(hostUrl + webHost + element.url));
+			});
+			drawingList.value = res.data
+		}else{
+			drawingList.value = []
+		}
+		
+	})
+}
+function handleShowDrawing(row){
+	console.log(row.drawingUrl)
+	window.open(row.drawingUrl);
+}
+
+/** 取消按钮 */
+const cancel = () => {
+	visible.value = false
+	reset()
+}
+/** 暴露给父组件的方法 */
+defineExpose({
+	open
+})
+</script>
+<style scoped>
+:deep(.el-table-inner-container){
+	position: absolute;
+    top: 0;
+    right: 0px;
+    bottom: 0;
+    left: 0px;
+}
+
+</style>

+ 11 - 0
src/views/business/outsourcedOrder/form.vue

@@ -75,14 +75,22 @@
 							width="320" />
 						<el-table-column label="外协工序" align="center" prop="processNames" width="320" />
 						<el-table-column label="备注" align="center" prop="remark" />
+						<el-table-column label="图纸" align="center" class-name="small-padding fixed-width" width="64">
+						<template #default="scope">
+							<el-button link type="primary" icon="View" @click="handleShowDrawingDialog(scope.row)"> 查看 </el-button>
+						</template>
+					</el-table-column>
 					</el-table>
 				</div>
 			</div>
 		</div>
+		<!-- 图纸 -->
+		<drawing-dialog ref="drawingDialogRef" />
 	</el-drawer>
 </template>
 <script setup>
 import { getOrder } from '@/api/business/outsourcedOrder'
+import drawingDialog from './drawingDetail.vue'
 const { proxy } = getCurrentInstance()
 /** 父组件传参 */
 const props = defineProps({
@@ -125,6 +133,9 @@ const cancel = () => {
 	visible.value = false
 	reset()
 }
+function handleShowDrawingDialog(row) {
+	proxy.$refs.drawingDialogRef.open(row)
+}
 
 /** 表单重置 */
 const reset = () => {