diff --git a/pages/apply/user.vue b/pages/apply/user.vue index b57992d..ae7af11 100644 --- a/pages/apply/user.vue +++ b/pages/apply/user.vue @@ -326,7 +326,7 @@ .form-sub { /* margin: 20px 16px 10px 16px; */ /* border: 1px solid #EBEEF5; */ - padding: 20px 30px 10px 30px; + padding: 20px 10px 10px 10px; /* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */ background-color: #ffffff; border-radius: 10px; diff --git a/pages/apply/viewCheck.vue b/pages/apply/viewCheck.vue index fbafd4e..21a8a3a 100644 --- a/pages/apply/viewCheck.vue +++ b/pages/apply/viewCheck.vue @@ -33,8 +33,12 @@ v-for="(item, index) in model.ListShow"> - + + + + @@ -127,7 +131,7 @@ this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA' if (this.model.RISK_AREA_ID != undefined && this.model.RISK_AREA_ID != '') { this.PagedCheckMain() //扫二维码 默认赋值 - + const json = initFilter(this.OrgId, null, "NAME", 0, 1); json.IgnoreDataRule = true json.Limit = 2 @@ -289,7 +293,7 @@ .form-sub { /* margin: 20px 16px 10px 16px; */ /* border: 1px solid #EBEEF5; */ - padding: 20px 30px 10px 30px; + padding: 20px 10px 10px 10px; /* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */ background-color: #ffffff; border-radius: 10px; diff --git a/pages/apply/viewEvaluation.vue b/pages/apply/viewEvaluation.vue index b56c6c7..3e4f8e0 100644 --- a/pages/apply/viewEvaluation.vue +++ b/pages/apply/viewEvaluation.vue @@ -3,7 +3,7 @@ - + 隐患信息 - + - + - + @@ -44,10 +45,6 @@ - @@ -77,9 +74,9 @@ data() { return { OrgId: '', - pageIndex:0, - pageSize:20, - total:0, + pageIndex: 0, + pageSize: 20, + total: 0, model: { RISK_AREA_NAME: '请选择区域', RISK_AREA_ID: '', @@ -125,7 +122,7 @@ this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA' if (this.model.RISK_AREA_ID != undefined && this.model.RISK_AREA_ID != '') { // this.PagedCheckMain()//扫二维码 默认赋值 - + const json = initFilter(this.OrgId, null, "NAME", 0, 1); json.IgnoreDataRule = true json.Limit = 2 @@ -147,14 +144,14 @@ const json = initFilter(this.OrgId, this.model.RISK_AREA_ID, "CREATE_TIME", 1, this.pageIndex, (( this.model.ISDOWN == '否' || this.model.ISDOWN == '') ? false : true)) json.IgnoreDataRule = true - json.Limit = this.pageSize - json.SelectField = ["CHECKCONTENT", "DESCREPTION","Nav_RiskArea.NAME", "CREATE_TIME"] + json.Limit = this.pageSize + json.SelectField = ["CHECKCONTENT", "DESCREPTION", "Nav_RiskArea.NAME", "CREATE_TIME"] PagedCheckMain(json).then(res => { if (res.IsSuccessful) { - this.total=res.TotalCount + this.total = res.TotalCount // this.model.ListShow = res.Data if (paginate) { - this.model.ListShow= this.model.ListShow.concat(res.Data) + this.model.ListShow = this.model.ListShow.concat(res.Data) } else { this.model.ListShow = res.Data } @@ -242,7 +239,7 @@ } }, onReachBottom() { - if (this.total > this.pageSize * this.pageIndex) + if (this.total > this.pageSize * this.pageIndex) this.PagedCheckMain(true) } // watch: { @@ -284,7 +281,7 @@ .form-sub { /* margin: 20px 16px 10px 16px; */ /* border: 1px solid #EBEEF5; */ - padding: 20px 30px 10px 30px; + padding: 20px 10px 10px 10px; /* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */ background-color: #ffffff; border-radius: 10px; diff --git a/pages/apply/viewRisk.vue b/pages/apply/viewRisk.vue index 17c7c30..d95b9fd 100644 --- a/pages/apply/viewRisk.vue +++ b/pages/apply/viewRisk.vue @@ -33,8 +33,11 @@ v-for="(item, index) in model.ListShow"> - + + + @@ -271,7 +274,7 @@ .form-sub { /* margin: 20px 16px 10px 16px; */ /* border: 1px solid #EBEEF5; */ - padding: 20px 30px 10px 30px; + padding: 20px 10px 10px 10px; /* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */ background-color: #ffffff; border-radius: 10px; diff --git a/pages/apply/viewVideo.vue b/pages/apply/viewVideo.vue index 92c4763..322e45c 100644 --- a/pages/apply/viewVideo.vue +++ b/pages/apply/viewVideo.vue @@ -284,7 +284,7 @@ .form-sub { /* margin: 20px 16px 10px 16px; */ /* border: 1px solid #EBEEF5; */ - padding: 20px 30px 10px 30px; + padding: 20px 10px 10px 10px; /* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */ background-color: #ffffff; border-radius: 10px; diff --git a/pages/index/index.vue b/pages/index/index.vue index 8c578c0..e788319 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -111,13 +111,19 @@ this.POST_ID = e.split('=')[1] } }) - } else { - //出现公司选择 } } // createType '区域'10 '岗位'20 - if (this.OrgId && this.OrgId.length > 1) + if (this.OrgId && this.OrgId.length > 1) { + this.dataLists.forEach(e => { + if (this.OrgId.toUpperCase() == e.id) { + this.NAME = e.name + //初始化加载 存值 + uni.setStorageSync('tenantId', e.tenantId) + } + }) this.getCaidan() + } }, //页面跳转到APP @@ -232,6 +238,7 @@ this.selectorInfo.showPopup = false this.OrgId = e.id this.NAME = e.name + //公司选择 存值 uni.setStorageSync('tenantId', e.tenantId) if (this.OrgId && this.OrgId.length > 1) this.getCaidan()