From a84eb3669247ed12f784696040488fc408379a76 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期四, 30 十一月 2023 09:30:44 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/MixingInfo/workShop.vue | 12 +-
web/src/router/index.js | 186 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 191 insertions(+), 7 deletions(-)
diff --git a/web/src/router/index.js b/web/src/router/index.js
index 7fdb36d..2d80873 100644
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -114,7 +114,191 @@
path: `/workShop/num=1`,
name: 'workShop',
meta: {
- title: '钢筋材料标识牌'
+ title: '钢筋材料标识牌1'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=2`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌2'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=3`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌3'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=4`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌4'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=5`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌5'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=6`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌6'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=7`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌7'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=8`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌8'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=9`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌9'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=10`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌10'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=11`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌11'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=12`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌12'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=13`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌13'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=14`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌14'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=15`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌15'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=16`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌16'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=17`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌17'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=18`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌18'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=19`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌19'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=20`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌20'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=21`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌21'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=22`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌22'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=23`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌23'
+ },
+ component: () => import('../views/MixingInfo/workShop.vue'),
+ },
+ {
+ path: `/workShop/num=24`,
+ name: 'workShop',
+ meta: {
+ title: '钢筋材料标识牌24'
},
component: () => import('../views/MixingInfo/workShop.vue'),
},
diff --git a/web/src/views/MixingInfo/workShop.vue b/web/src/views/MixingInfo/workShop.vue
index ca295cf..fc5d3aa 100644
--- a/web/src/views/MixingInfo/workShop.vue
+++ b/web/src/views/MixingInfo/workShop.vue
@@ -25,7 +25,7 @@
</div>
<div class="work_items">
<div class="work_items_text">炉(批)号</div>
- <div class="work_items_data" style="font-size:1.2rem">{{workList&&workList.heatNumber}}</div>
+ <div class="work_items_data" style="font-size:1.5rem">{{workList&&workList.heatNumber}}</div>
</div>
</div>
<div class="work_rows">
@@ -35,13 +35,13 @@
</div>
<div class="work_items">
<div class="work_items_text">报检日期</div>
- <div class="work_items_data" >{{workList&&workList.reportTime}}</div>
+ <div class="work_items_data" style="font-size:1.5rem">{{workList&&workList.reportTime}}</div>
</div>
</div>
<div class="work_rows">
<div class="work_items">
<div class="work_items_text">报告编号</div>
- <div class="work_items_data" style="border-right: 3px solid #001982;">{{workList&&workList.reportNum}}</div>
+ <div class="work_items_data" style="border-right: 3px solid #001982;font-size:1.5rem">{{workList&&workList.reportNum}}</div>
</div>
<div class="work_items">
<div class="work_items_text">检验状态</div>
@@ -98,14 +98,14 @@
.work_headers{
height: 206px;
- padding-top: 120px;
+ padding-top: 100px;
display: flex;
align-items: center;
justify-content: center;
position: relative;
.header_title{
- font-size: 4.5rem;
+ font-size: 4rem;
font-weight: 600;
background: linear-gradient(to bottom,#24A5ED,#1976CE,#145DBE,#071C94);
background-clip: text;
@@ -138,7 +138,7 @@
.work_main{
// height: calc(100% - 200px);
border: 3px solid #001982;
- margin: 20px 100px;
+ margin: 20px 50px;
display: flex;
flex-direction: column;
justify-content: space-between;
--
Gitblit v1.9.3