Skip to content

G
GaoQuYingJiH5-ASD
Commit fac45351 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

add：隐患详情整改ui构建，隐患审核tablist修改

parent 271dd0e5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 592 additions and 734 deletions
sdk/axios_http.js
View file @ fac45351
...@@ -35,8 +35,8 @@ axios.defaults.headers.common['Authorization'] = ...@@ -35,8 +35,8 @@ axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTcyMTAzMTg4NiIsImxvZ2luX3VzZXJfa2V5IjoiNGJjY2JjYzUtNmY0Yy00ZDhlLWJiYzEtZjYzMzVlZDBlZTgwIn0.j3jEfHzeu3kklm60kKCirwwyKaWD51ABicOzxEnuFOfGe63FFqYOQ122ojAhukbInnKj4try3DjrST6wNDVjVQ' // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTcyMTAzMTg4NiIsImxvZ2luX3VzZXJfa2V5IjoiNGJjY2JjYzUtNmY0Yy00ZDhlLWJiYzEtZjYzMzVlZDBlZTgwIn0.j3jEfHzeu3kklm60kKCirwwyKaWD51ABicOzxEnuFOfGe63FFqYOQ122ojAhukbInnKj4try3DjrST6wNDVjVQ'
// admin账号token // admin账号token
// axios.defaults.headers.common['Authorization'] = axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw' 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw'
// 请求拦截器 // 请求拦截器
......
sdk/axios_http3.js
View file @ fac45351
...@@ -11,16 +11,16 @@ if (window.env == 'dev') { ...@@ -11,16 +11,16 @@ if (window.env == 'dev') {
// axios.defaults.headers.common['Authorization'] = // axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLmtojotLnogIUiLCJsb2dpbl91c2VyX2tleSI6ImExNWIwMDNjLWRlYWItNGU2MC04ODg4LTJiODNjMzVkNDUzNSJ9.l6gHzFX-U5rKGJ7zoDA4jMBIxkhVgCjWr5ynFg1DR6xspM9Ls6raTxyEo2Kr61UbG2UD6P2kN63vF_U8nX8afg' // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLmtojotLnogIUiLCJsb2dpbl91c2VyX2tleSI6ImExNWIwMDNjLWRlYWItNGU2MC04ODg4LTJiODNjMzVkNDUzNSJ9.l6gHzFX-U5rKGJ7zoDA4jMBIxkhVgCjWr5ynFg1DR6xspM9Ls6raTxyEo2Kr61UbG2UD6P2kN63vF_U8nX8afg'
// 商户token // 商户token
axios.defaults.headers.common['Authorization'] = // axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlvKDlrZ3lvakiLCJsb2dpbl91c2VyX2tleSI6IjNjMmRiMWFiLWIyZGMtNDBjYi04YjM5LWRiNTJmM2VmYzNkYyJ9.sfZyPP-COShNCjwxKR26zGDsPHXss97gu7JEpaMapIZyMQEsxzMigVickcqdhaqDwTRcfr0IxAj64vnrriS9Cw' // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlvKDlrZ3lvakiLCJsb2dpbl91c2VyX2tleSI6IjNjMmRiMWFiLWIyZGMtNDBjYi04YjM5LWRiNTJmM2VmYzNkYyJ9.sfZyPP-COShNCjwxKR26zGDsPHXss97gu7JEpaMapIZyMQEsxzMigVickcqdhaqDwTRcfr0IxAj64vnrriS9Cw'
// 凯丽 // 凯丽
// axios.defaults.headers.common['Authorization'] = // axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJlUzUxMiJ9.eyJzdWlioilxNZ92MZAzMDl00SlslmxyZ2luX3VzZXJfa2V5ljoiMEONTM1NzktNTJiMSO0N2QwLTkzNmEtMmViNWFhYzMzMTI1In0.EG_EwS7xS1jgi29Ly7WXOJBCW4DcAyOtLD4he06sV8b4i70kknNQqVAx063NpcDa5kmTFdZ6zEfPHYPfVR4dEO' // 'Bearer eyJhbGciOiJlUzUxMiJ9.eyJzdWlioilxNZ92MZAzMDl00SlslmxyZ2luX3VzZXJfa2V5ljoiMEONTM1NzktNTJiMSO0N2QwLTkzNmEtMmViNWFhYzMzMTI1In0.EG_EwS7xS1jgi29Ly7WXOJBCW4DcAyOtLD4he06sV8b4i70kknNQqVAx063NpcDa5kmTFdZ6zEfPHYPfVR4dEO'
// admin账号token // admin账号token
// axios.defaults.headers.common['Authorization'] = axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw' 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw'
}else{ }else{
axios.defaults.baseURL = 'https://gqyjpt.weihai.cn/prod-api' axios.defaults.baseURL = 'https://gqyjpt.weihai.cn/prod-api'
......
src/_check_info.css
View file @ fac45351
...@@ -77,6 +77,7 @@ body { ...@@ -77,6 +77,7 @@ body {
.van-form .van-field__label { .van-form .van-field__label {
width: 1.8rem; width: 1.8rem;
} }
.van-form .van-field__control { .van-form .van-field__control {
text-align: right; text-align: right;
padding-right: 0.3rem; padding-right: 0.3rem;
...@@ -86,6 +87,7 @@ body { ...@@ -86,6 +87,7 @@ body {
.van-form .van-cell__value { .van-form .van-cell__value {
background: #fff; background: #fff;
} }
.yh_desc { .yh_desc {
width: 6.2rem; width: 6.2rem;
min-height: 0.68rem; min-height: 0.68rem;
...@@ -139,8 +141,7 @@ body { ...@@ -139,8 +141,7 @@ body {
margin: 0.3rem 0px 0.1rem 0.3rem; margin: 0.3rem 0px 0.1rem 0.3rem;
} }
.item-number { .item-number {}
}
.item-title { .item-title {
font-size: 0.28rem; font-size: 0.28rem;
...@@ -173,6 +174,7 @@ body { ...@@ -173,6 +174,7 @@ body {
background: #f5f6fa; background: #f5f6fa;
padding: 0.1rem 0.3rem; padding: 0.1rem 0.3rem;
} }
/* 图片预览大小 */ /* 图片预览大小 */
.expand-section .van-uploader__preview-image { .expand-section .van-uploader__preview-image {
display: block; display: block;
...@@ -255,7 +257,7 @@ body { ...@@ -255,7 +257,7 @@ body {
padding-right: 0.2rem; padding-right: 0.2rem;
} }
.bottom_bar > div { .bottom_bar>div {
/* display: grid; /* display: grid;
grid-template-columns: auto auto 0.6fr;*/ grid-template-columns: auto auto 0.6fr;*/
display: flex; display: flex;
...@@ -266,7 +268,7 @@ body { ...@@ -266,7 +268,7 @@ body {
width: 100vw; width: 100vw;
} }
.bottom_bar > div > span { .bottom_bar>div>span {
font-weight: 500; font-weight: 500;
font-size: 0.28rem; font-size: 0.28rem;
color: #545454; color: #545454;
...@@ -274,7 +276,7 @@ body { ...@@ -274,7 +276,7 @@ body {
/* width: 1.8rem; */ /* width: 1.8rem; */
} }
.bottom_bar > div > span:before { .bottom_bar>div>span:before {
display: inline-block; display: inline-block;
width: 0.3rem; width: 0.3rem;
height: 0.3rem; height: 0.3rem;
...@@ -285,11 +287,11 @@ body { ...@@ -285,11 +287,11 @@ body {
margin-right: 0.1rem; margin-right: 0.1rem;
} }
.bottom_bar > div > span:first-child:before { .bottom_bar>div>span:first-child:before {
background-image: url('../image/code/check_num.png'); background-image: url('../image/code/check_num.png');
} }
.bottom_bar > div > span:nth-child(2):before { .bottom_bar>div>span:nth-child(2):before {
background-image: url('../image/code/yh_num.png'); background-image: url('../image/code/yh_num.png');
} }
...@@ -304,7 +306,8 @@ body { ...@@ -304,7 +306,8 @@ body {
padding-left: 0.2rem; padding-left: 0.2rem;
background-color: #fff; background-color: #fff;
} }
.textareaEle{
.textareaEle {
border: 0.01rem solid #d8d8d8; border: 0.01rem solid #d8d8d8;
border-radius: 2px; border-radius: 2px;
font-size: .28rem; font-size: .28rem;
...@@ -312,76 +315,95 @@ body { ...@@ -312,76 +315,95 @@ body {
padding: .15rem; padding: .15rem;
} }
.content h5{ .content h5 {
margin-top: 0.3rem; margin-top: 0.3rem;
margin-bottom: 0.3rem; margin-bottom: 0.3rem;
font-family: PingFang SC; font-family: PingFang SC;
} }
.footer-bar{ .footer-bar {
display: flex; justify-content: space-around; display: flex;
justify-content: space-around;
margin-top: .5rem; margin-top: .5rem;
} }
.footer-bar .van-button--info{
width:2rem; .footer-bar .van-button--info {
} width: 2rem;
}
/* 隐患整改模块 */ /* 隐患整改模块 */
.rectification-module { .rectification-module {
padding: 0.3rem; /* 上下左右内边距30px */ padding: 0.3rem;
/* 上下左右内边距30px */
background: #fff; background: #fff;
margin-bottom: 0.2rem; /* 底部边距20px */ margin-bottom: 0.2rem;
/* 底部边距20px */
overflow: hidden;
} }
.module-header { .module-header {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 0.15rem; /* 图标与标题间距15px */ gap: 0.15rem;
margin-bottom: 0.3rem; /* 模块标题与内容间距30px */ /* 图标与标题间距15px */
margin-bottom: 0.3rem;
/* 模块标题与内容间距30px */
} }
.module-icon { .module-icon {
width: 0.4rem; /* 图标宽度40px */ width: 0.4rem;
height: 0.4rem; /* 图标高度40px */ /* 图标宽度40px */
height: 0.4rem;
/* 图标高度40px */
} }
.module-title { .module-title {
font-size: 0.32rem; /* 标题字体32px */ font-size: 0.28rem;
/* 标题字体32px */
font-weight: bold; font-weight: bold;
color: #333; color: #00B55E;
} }
.timeline-list { .timeline-list {
padding-left: 0.3rem; /* 时间线左侧内边距30px */ padding-left: 0.3rem;
/* 时间线左侧内边距30px */
} }
.timeline-item { .timeline-item {
display: flex; display: flex;
margin-bottom: 0.4rem; /* 时间线项间距40px */ margin-bottom: 0.4rem;
/* 时间线项间距40px */
} }
.timeline-marker { .timeline-marker {
position: relative; position: relative;
width: 0.4rem; /* 左侧标记区域宽度40px */ width: 0.4rem;
margin-right: 0.2rem; /* 标记与内容间距20px */ /* 左侧标记区域宽度40px */
margin-right: 0.2rem;
/* 标记与内容间距20px */
} }
.marker-dot { .marker-dot {
width: 0.2rem; /* 时间点直径20px */ width: 0.2rem;
/* 时间点直径20px */
height: 0.2rem; height: 0.2rem;
background: #1989fa; background: #1989fa;
border-radius: 50%; border-radius: 50%;
position: absolute; position: absolute;
left: 0; left: 0;
top: 0.05rem; /* 时间点垂直偏移5px */ top: 0.05rem;
/* 时间点垂直偏移5px */
} }
.marker-line { .marker-line {
width: 0.02rem; /* 时间线宽度2px */ width: 0.02rem;
/* 时间线宽度2px */
height: 100%; height: 100%;
background: #e5e7eb; background: #e5e7eb;
margin-left: 0.09rem; /* 时间线水平居中 */ margin-left: 0.09rem;
margin-top: 0.25rem; /* 时间线顶部偏移25px */ /* 时间线水平居中 */
margin-top: 0.25rem;
/* 时间线顶部偏移25px */
} }
.timeline-content { .timeline-content {
...@@ -389,67 +411,109 @@ body { ...@@ -389,67 +411,109 @@ body {
} }
.rectification-date { .rectification-date {
color: #666; color: #000;
font-size: 0.28rem; /* 日期字体28px */ font-size: 0.28rem;
margin-bottom: 0.15rem; /* 日期与图片间距15px */ /* 日期字体28px */
margin-bottom: 0.15rem;
/* 日期与图片间距15px */
font-weight: 500;
} }
.rectification-images { .rectification-images {
display: flex; display: flex;
gap: 0.2rem; /* 图片间距20px */ gap: 0.2rem;
margin-bottom: 0.2rem; /* 图片与状态容器间距20px */ /* 图片间距20px */
margin-bottom: 0.2rem;
/* 图片与状态容器间距20px */
} }
.rect-image { .rect-image {
width: 1.2rem; /* 图片宽度120px */ width: 1.2rem;
height: 1.2rem; /* 图片高度120px */ /* 图片宽度120px */
height: 1.2rem;
/* 图片高度120px */
object-fit: cover; object-fit: cover;
border-radius: 0.08rem; /* 图片圆角8px */ border-radius: 0.08rem;
/* 图片圆角8px */
} }
.status-container { .status-container {
border-radius: 0.08rem; /* 状态容器圆角8px */ border-radius: 0.08rem;
padding: 0.2rem; /* 状态容器内边距20px */ /* 状态容器圆角8px */
padding: 0.2rem;
/* 状态容器内边距20px */
} }
/* 审批拒绝状态 */ /* 审批拒绝状态 */
.reject-status { .reject-status {
background: #fef2f2; background: #fef2f2;
border: 0.02rem solid #fee2e2; /* 边框宽度2px */ border: 0.02rem solid #fee2e2;
/* 边框宽度2px */
padding: .1rem .24rem;
position: relative;
} }
.reject-status .status-tag { .reject-status .status-tag {
position: absolute;
right: .2rem;
top: 0.2rem;
background: #ef4444; background: #ef4444;
color: #fff; color: #fff;
font-size: 0.24rem; /* 标签字体24px */ font-size: 0.24rem;
padding: 0.04rem 0.12rem; /* 标签内边距4px 12px */ /* 标签字体24px */
border-radius: 0.04rem; /* 标签圆角4px */ padding: 0.09rem 0.12rem;
/* 标签内边距4px 12px */
border-radius: 0.04rem;
/* 标签圆角4px */
}
.reject-status>.status-content>p {
font-weight: 500;
font-size: 0.28rem;
color: #545454;
} }
/* 待审批状态 */ /* 待审批状态 */
.pending-status { .pending-status {
border: 0.02rem solid #fcd34d; /* 边框宽度2px */ border: 0.02rem solid #fcd34d;
/* 边框宽度2px */
background: #fffbeb; background: #fffbeb;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
padding: 0.12rem;
} }
.pending-status .status-tag { .pending-status .status-tag {
color: #f59e0b; color: #fff;
font-size: 0.24rem; /* 标签字体24px */ background: #FF9415;
font-weight: 500;
font-size: 0.24rem;
padding: .1rem .3rem;
} }
/* 审批通过状态 */ /* 审批通过状态 */
.approve-status { .approve-status {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 0.12rem;
align-items: center; align-items: center;
background: #f0f9ff; background: #f0f9ff;
border: 0.02rem solid #e0f2fe; /* 边框宽度2px */ border: 0.02rem solid #e0f2fe;
/* 边框宽度2px */
} }
.approve-status .status-tag { .approve-status .status-tag {
color: #0ea5e9; color: #fff;
font-size: 0.24rem; /* 标签字体24px */ background: #00B55E;
font-weight: bold; font-weight: 500;
font-size: 0.24rem;
padding: .1rem .1rem;
display: inline-block;
width: 1.2rem;
}
.approve-status>.status-content>p {
font-weight: 500;
font-size: 0.28rem;
color: #545454;
} }
\ No newline at end of file
src/_check_info.html
View file @ fac45351
This diff is collapsed.
src/_check_info.js
View file @ fac45351
...@@ -74,7 +74,7 @@ window.onload = function () { ...@@ -74,7 +74,7 @@ window.onload = function () {
reviewRecord: '', reviewRecord: '',
show4yanqi:false, show4yanqi:false,
show4shangbao:false, show4shangbao:false,
show4jujue :true, show4jujue :false,
refuseContent: '', // 拒绝原因 refuseContent: '', // 拒绝原因
dept4resuse:[], // 拒绝部门 dept4resuse:[], // 拒绝部门
rectificationRecords: [ rectificationRecords: [
......
src/_yh_check.html
View file @ fac45351
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<van-tabs v-model:active="activeTab" title-active-color="#1989fa" line-height="2px" @change="tabChange" <van-tabs v-model:active="activeTab" title-active-color="#1989fa" line-height="2px" @change="tabChange"
style="margin-bottom: 15px;"> style="margin-bottom: 15px;">
<!-- <div v-for="item in tabList""> --> <!-- <div v-for="item in tabList""> -->
<van-tab :title="item.title" :badge="item.msgNum||null" v-for="item in remindStatistic"></van-tab> <van-tab :title="item.title" :badge="item.msgNum||null" v-for="item in tabList"></van-tab>
<!-- </div> --> <!-- </div> -->
......
src/_yh_check.js
View file @ fac45351
...@@ -51,8 +51,9 @@ window.addEventListener('load', function () { ...@@ -51,8 +51,9 @@ window.addEventListener('load', function () {
if (gemhoUtil.getCookie('userType') !== 'shop') { if (gemhoUtil.getCookie('userType') !== 'shop') {
this.showSearch = true this.showSearch = true
} }
this.init()
this.getRemindStatistic() this.getRemindStatistic()
this.init()
}, },
methods: { methods: {
markAllAsRead() { // 全部标记为已读 markAllAsRead() { // 全部标记为已读
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment