diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index a21d2d52f..e15ec5214 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -1413,7 +1413,7 @@ export default { }, // 获取doc文件 downloadFile(data) { - let URL = 'http://10.100.5.116:4201/' + data.docRealName + let URL = 'https://srms.foton.com.cn/ocrResultFile/' + data.docRealName window.open(URL) // console.log(URL); // window.open(data.docRealFile); diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 563d59441..c291b649e 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -113,11 +113,12 @@ -
+
{ - this.height = $(".content").height() * 1.8; + this.warningTableHeight = $(window).height()*0.54; + }; + // alert(this.warningTableHeight) + this.height = $(".content").height(); + window.onresize = () => { + this.height = $(".content").height(); }; //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { @@ -1055,6 +1062,17 @@ export default { // } } + .content { + padding-bottom: 10px; + height: calc(~'100% - 40px'); + + /deep/ .el-button--mini { + padding: 5px 7px; + font-size: 8px; + } + + } + .dynamic-loop-container { position: relative; min-height: 160px; @@ -1134,15 +1152,7 @@ export default { } } - .content { - padding-bottom: 10px; - height: calc(~'100% - 40px'); - /deep/ .el-button--mini { - padding: 5px 7px; - font-size: 8px; - } - } } ::v-deep {