Merge branch 'dev'
Showing
3 changed files
with
14 additions
and
9 deletions
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2024-01-17 14:28:40 | 4 | * @LastEditTime: 2024-01-18 10:41:05 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;"> | 7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;"> |
... | @@ -14,19 +14,19 @@ | ... | @@ -14,19 +14,19 @@ |
14 | </el-tabs> | 14 | </el-tabs> |
15 | </div> | 15 | </div> |
16 | <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> | 16 | <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> |
17 | <div style="height:85vh"> | 17 | <div style="max-height:85vh;"> |
18 | <div v-show="this.bdcqz.bdcqzlx==1"> | 18 | <div v-show="this.bdcqz.bdcqzlx==1"> |
19 | <el-tabs v-model="activeTitle"> | 19 | <el-tabs v-model="activeTitle"> |
20 | <el-tab-pane label="第一页" name="title1"></el-tab-pane> | 20 | <el-tab-pane label="第一页" name="title1"></el-tab-pane> |
21 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> | 21 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> |
22 | </el-tabs> | 22 | </el-tabs> |
23 | <div :style="{'width':'1185px','overflow-y': 'auto','height': '670px',}"> | 23 | <div style="width:1169px;overflow-x: hidden;height: 833px;margin-top:2px"> |
24 | <canvas ref="zs1" width="1000" v-show="activeTitle=='title1'" height="700"></canvas> | 24 | <canvas ref="zs1" width="1024" v-show="activeTitle=='title1'" height="739"></canvas> |
25 | <canvas ref="zs" width="1000" v-show="activeTitle=='title2'" height="700"></canvas> | 25 | <canvas ref="zs" width="1024" v-show="activeTitle=='title2'" height="739"></canvas> |
26 | </div> | 26 | </div> |
27 | </div> | 27 | </div> |
28 | <div style="width:1185px;overflow-x: hidden;height: 700px;overflow-y:auto" v-show="this.bdcqz.bdcqzlx==2"> | 28 | <div style="width:1169px;overflow-x: hidden;height: 833px;margin-top:2px" v-show="this.bdcqz.bdcqzlx==2"> |
29 | <canvas ref="zm" width="1180" height="780"></canvas> | 29 | <canvas ref="zm" width="1169" height="828"></canvas> |
30 | </div> | 30 | </div> |
31 | </div> | 31 | </div> |
32 | </div> | 32 | </div> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-11-22 13:43:27 | 4 | * @LastEditTime: 2024-01-18 10:45:25 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="container"> | 7 | <div class="container"> |
... | @@ -68,6 +68,7 @@ | ... | @@ -68,6 +68,7 @@ |
68 | <receipt :Receiptdata="Receiptdata" id="boxaaa" /> | 68 | <receipt :Receiptdata="Receiptdata" id="boxaaa" /> |
69 | </div> | 69 | </div> |
70 | </div> | 70 | </div> |
71 | <div style="height:94%"> | ||
71 | <component | 72 | <component |
72 | :key="fresh" | 73 | :key="fresh" |
73 | :is="componentTag" | 74 | :is="componentTag" |
... | @@ -75,6 +76,7 @@ | ... | @@ -75,6 +76,7 @@ |
75 | </div> | 76 | </div> |
76 | </div> | 77 | </div> |
77 | </div> | 78 | </div> |
79 | </div> | ||
78 | <!-- 打印模板需要此模块 --> | 80 | <!-- 打印模板需要此模块 --> |
79 | <object | 81 | <object |
80 | id="LODOP_OB" | 82 | id="LODOP_OB" | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2024-01-18 09:58:50 | 4 | * @LastEditTime: 2024-01-18 10:45:37 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="container"> | 7 | <div class="container"> |
... | @@ -102,6 +102,9 @@ | ... | @@ -102,6 +102,9 @@ |
102 | clxxTab: {} | 102 | clxxTab: {} |
103 | }; | 103 | }; |
104 | }, | 104 | }, |
105 | created () { | ||
106 | console.log(this.$route.query.type); | ||
107 | }, | ||
105 | methods: { | 108 | methods: { |
106 | /** | 109 | /** |
107 | * @description: getCurrentSelectProps | 110 | * @description: getCurrentSelectProps | ... | ... |
-
Please register or sign in to post a comment