Browse Source

Merge remote-tracking branch 'origin/v3' into v3

v3
chenrui 2 years ago
parent
commit
b0bf2a4572
  1. 9
      src/api/enforce.js
  2. 9
      src/router/enforceHome.js
  3. 9
      src/views/Home.vue
  4. 9
      src/views/HomeWx.vue
  5. 6
      src/views/administrative/appointmentList.vue
  6. 6
      src/views/enforce/earlyWarning.vue
  7. 40
      src/views/enforce/enforceNotice.vue
  8. 6
      src/views/enforce/enforcementPlan.vue
  9. 164
      src/views/enforce/enforcementPlanDetailed.vue
  10. 2
      src/views/enforce/enterpriseBaseInfo.vue
  11. 38
      src/views/enforceHome.vue
  12. 6
      src/views/enterprise/complaintList.vue
  13. 4
      src/views/enterprise/enterpriseInspectionNotice.vue
  14. 2
      src/views/enterprise/register.vue

9
src/api/enforce.js

@ -27,7 +27,14 @@ export const queryEnforcementInspectionProgramListNoPermission = (params, succes
* @returns
*/
export const queryEnforcementInspectionProgramListNoPermissionNoPaging = (params, success, error) => _get("/app/code/enforcementInspectionProgram/queryListNoPermissionNoPaging", params, success, error);
/**
* 执法计划列表 按id查询
* @param {*} params
* @param {*} success
* @param {*} error
* @returns
*/
export const detail = (id, success, error) => _get("/app/code/enforcementInspectionProgram/detail/"+id, null, success, error);
/**
* 添加年度执法计划
* @param {*} params

9
src/router/enforceHome.js

@ -101,6 +101,15 @@ const routes = [
isKeepAlive: false
},
},
//计划详情页
{
path:"/enforce/enforcementPlanDetailed",
name:"enforcementPlanDetailed",
component: () => import("@/views/enforce/enforcementPlanDetailed.vue"),
meta: {
isKeepAlive: false
},
},
]
export {routes}

9
src/views/Home.vue

@ -1,7 +1,7 @@
<template>
<!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/> -->
<!-- v-if="!isLoading" -->
<div class="home app_content" >
<div class="home app_content" safe-area-inset-bottom>
<!-- 导航栏 -->
<!-- <div class="header_body">-->
<!-- <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
@ -274,6 +274,8 @@
height: 100%;
overflow: hidden;
background-color: #f4f4f4;
padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.warp_body {
position: relative;
@ -295,9 +297,10 @@
}
.boutique_box {
position: absolute;
position: fixed;
width: 100%;
bottom: 1%;
bottom: calc(1.67rem + constant(safe-area-inset-bottom));
bottom: calc(1.67rem + env(safe-area-inset-bottom));
.boutique_body {
padding: 0 0 0.27rem 0;

9
src/views/HomeWx.vue

@ -1,5 +1,5 @@
<template>
<div class="home app_content">
<div class="home app_content" safe-area-inset-bottom>
<!-- 导航栏 -->
<!-- <div class="header_body">-->
<!-- <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
@ -227,6 +227,8 @@
height: 100%;
overflow: hidden;
background-color: #f4f4f4;
padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.warp_body {
position: relative;
@ -248,9 +250,10 @@
}
.boutique_box {
position: absolute;
position: fixed;
width: 100%;
bottom: 1%;
bottom: calc(1.67rem + constant(safe-area-inset-bottom));
bottom: calc(1.67rem + env(safe-area-inset-bottom));
.boutique_body {
padding: 0 0 0.27rem 0;

6
src/views/administrative/appointmentList.vue

@ -1,5 +1,5 @@
<template>
<div class="shop app_content">
<div class="home app_content" safe-area-inset-bottom>
<!-- 导航栏 -->
<!-- <div class="header_body">
<header-nav :leftArrow="false" titelText="行政检查预约"/>
@ -394,12 +394,14 @@
</script>
<style lang="less" scoped>
.shop {
.home {
height: 100%;
display: flex;
flex-direction: column;
overflow: hidden;
background-color: #ebf3fb;
padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.header_body {
height: 1.33rem;

6
src/views/enforce/earlyWarning.vue

@ -1,5 +1,5 @@
<template>
<div class="shop app_content">
<div class="home app_content" safe-area-inset-bottom>
<!-- 导航栏 -->
<!-- <div class="header_body">
<header-nav :leftArrow="false" titelText="预警信息"/>
@ -327,12 +327,14 @@
<style lang="less" scoped>
.shop {
.home {
height: 100%;
display: flex;
flex-direction: column;
overflow: hidden;
background-color: #ebf3fb;
padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.header_body {
height: 1.33rem;

40
src/views/enforce/enforceNotice.vue

@ -1,5 +1,5 @@
<template>
<div class="shop app_content">
<div class="home app_content" safe-area-inset-bottom>
<!-- 导航栏 -->
<!-- <div class="header_body">
<header-nav
@ -37,11 +37,20 @@
<div class="item-text" @click="toPdfView(null==item.fileObject?'':item.fileObject.fileUrl)">
<a>{{ null==item.fileObject?'':item.fileObject.fileName }}</a>
</div>
<div class="item-time" style="display: flex; justify-content: space-between;">
<!-- <div class="item-time" style="display: flex; justify-content: space-between;">
<span>{{ item.bureauDeptName }}</span>
<span>{{ item.createTime }}</span>
</div>
</div>-->
<div class="item-text">
<p><label class="card_box_label">执法部门:</label> <span>{{ item.bureauDeptName }}</span>
</p>
</div>
<div class="item-text">
<p><label class="card_box_label">执法区域:</label> <span>{{ item.enforcementArea }}</span></p>
</div>
<div class="item-text">
<p><label class="card_box_label">发布时间:</label> <span>{{ item.createTime }}</span></p>
</div>
</div>
</div>
@ -274,12 +283,14 @@
</script>
<style lang="less" scoped>
.shop {
.home {
height: 100%;
display: flex;
flex-direction: column;
overflow: hidden;
background-color: #ebf3fb;
padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.header_body {
height: 1.33rem;
@ -410,8 +421,8 @@
display: flex;
position: relative;
margin: 1% 0;
padding: 0 2% 0 0;
width: 96%;
padding: 0 1% 0 0;
width: 98%;
align-items: center;
/*border-bottom: 1px solid #f3f4f5;*/
}
@ -427,7 +438,8 @@
.item-cont {
display: inline-block;
width: calc(100% - 2.0rem);
margin: 3% 0;
width: calc(100% - 1.75rem);
}
.item-time {
@ -454,7 +466,7 @@
.item-text {
width: 100%;
color: #999;
color: #666;
font-size: 0.35rem;
font-weight: normal;
line-height: 2;
@ -464,6 +476,16 @@
color: #2b75fd;
}
.item-text p {
display: flex;
margin: 0;
}
.item-text label {
color: #323233;
}
/deep/ .van-search__content {
height: 0.9rem;
border: 1px solid #ececec;

6
src/views/enforce/enforcementPlan.vue

@ -1,5 +1,5 @@
<template>
<div class="shop app_content">
<div class="home app_content" safe-area-inset-bottom>
<!-- 导航栏 -->
<!-- <div class="header_body">
<header-nav
@ -338,12 +338,14 @@
</script>
<style lang="less" scoped>
.shop {
.home {
height: 100%;
display: flex;
flex-direction: column;
overflow: hidden;
background-color: #ebf3fb;
padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.header_body {
height: 1.33rem;

164
src/views/enforce/enforcementPlanDetailed.vue

@ -0,0 +1,164 @@
<template>
<div class="address_edit">
<div class="warp_body">
<van-cell-group>
<!-- <van-field
label="计划名称"
v-model=obj.planName
readonly
/>-->
<div class="fold-div">
<label>计划名称</label>
<van-text-ellipsis :content="obj.planName" rows="2" autosize expand-text="展开" collapse-text="收起" />
</div>
<van-field
label="计划年度"
v-model=obj.planYear
readonly
/>
<van-field
label="执法部门"
v-model=obj.enforcementDepartment
readonly
/>
<van-field
label="发布时间"
v-model=obj.createTime
readonly
/>
<van-field
label="执法区域"
v-model=obj.enforcementArea
readonly
/>
<!-- <van-field
label="文件名称"
v-model=obj.objList.fileName
readonly
@click="toPdfView(obj.objList.fileUrl)"
right-icon="eye"
/>-->
<div class="fold-div">
<label>文件名称</label>
<van-text-ellipsis :content="obj.objList.fileName" @click="toPdfView(obj.objList.fileUrl)" rows="3" autosize />
<van-icon v-if="obj.iconShow" name="eye" />
</div>
</van-cell-group>
</div>
</div>
</template>
<script setup>
import { reactive } from "vue";
import { detail } from "../../api/enforce";
const router = useRouter();
const route = useRoute();
const obj = reactive({
planName:"",
planYear:"",
enforcementDepartment:"",
createTime:"",
enforcementArea:"",
objList:{
fileName:"",
fileUrl:""
},
iconShow:false
});
const data = reactive({});
const queryList = () => {
detail(route.query?.id, (success) => {
obj.planName = success.data.planName;
obj.planYear=success.data.planYear;
obj.enforcementDepartment=success.data.enforcementDepartment
obj.createTime=success.data.createTime;
obj.enforcementArea=success.data.enforcementArea;
console.log(obj);
if(success.data.fileObject!=null && success.data.fileObject!="undefined"){
obj.objList.fileName = success.data.fileObject.fileName;
obj.objList.fileUrl = success.data.fileObject.fileUrl;
obj.iconShow=true;
}
});
};
const toPdfView = (url) => {
console.log(url)
if(url!=null){
router.push(
{
path: "/pdfView",
query: {
url: url
}
});
}
}
onMounted(() => {
queryList();
});
</script>
<style lang="less" scoped>
.address_edit {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
background-color: #ebf3fb;
}
.warp_body {
margin: 0 3%;
padding-bottom: 3rem;
width: 94%;
height: 98%;
background-color: #ebf3fb;
overflow-y: auto;
margin-top: 0.15rem;
}
/deep/ .van-field__right-icon i {
color: #2b75fd;
}
.fold-div {
position: relative;
display: flex;
margin: 0 0.3rem;
padding-bottom: 0.13rem;
border-bottom: 1px solid #f5f6f7;
color: rgb(50, 50, 51);
font-size: 0.37rem;
}
.fold-div label {
width: 2.6rem;
padding: 0.27rem 0px 0.27rem 0.15rem;
}
.fold-div .van-text-ellipsis {
padding: 0.24rem 0;
width: calc(100% - 2.7rem);
color: #666;
line-height: 1.25;
}
.fold-div i {
position: absolute;
bottom: 0.3rem;
right: 0.1rem;
display: inline-block;
color: #2b75fd;
font-size: 0.5rem;
}
</style>

2
src/views/enforce/enterpriseBaseInfo.vue

@ -795,7 +795,7 @@
}
.fold-div .van-text-ellipsis {
padding: 0.27rem 0px 0px;
padding: 0.24rem 0;
width: calc(100% - 2.7rem);
color: #666;
}

38
src/views/enforceHome.vue

@ -1,7 +1,7 @@
<template>
<!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>-->
<!-- <div class="home app_content" v-if="!isLoading">-->
<div class="home app_content">
<div class="home app_content" safe-area-inset-bottom>
<!-- 导航栏 -->
<!-- <div class="header_body">
<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>
@ -11,12 +11,15 @@
<div class="warp_body">
<div class="logobox"></div>
<div class="noticeContent">
<ul class="notice_list" :class="data.noticeList.length>1?{notice_top:freshMap.animate}:''">
<li v-for="(item, index) in data.noticeList" :key="index" @click="toNoticeDetail(item.url)">
<ul v-if="data.notNull" class="notice_list" :class="data.noticeList.length>1?{notice_top:freshMap.animate}:''">
<li v-for="(item, index) in data.noticeList" :key="index" @click="toNoticeDetail(item) ">
{{item.content}}
<van-icon name="arrow" />
</li>
</ul>
<ul v-else class="notice_list" >
<li>最近一星期暂无年度行政检查计划公布</li>
</ul>
</div>
<div class="carousel_box" @onLoad="onLoad">
</div>
@ -51,7 +54,7 @@
import Vconsolefrom from 'vconsole';
import {Loading, showFailToast} from 'vant';
import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
import {queryEnforcementInspectionProgramListNoPermissionNoPaging} from "@/api/enforce";
const isLoading = ref(true);
const {useCommon} = $globalStore;
@ -93,7 +96,8 @@
});
const data = reactive({
noticeList: []
noticeList: [],
notNull:true
});
const adviceList = reactive([]);
const boutiqueAttr = reactive({
@ -144,13 +148,13 @@
path: "/enforce/enforceNotice",
});
}
const toNoticeDetail = async (url) => {
if (null != url) {
const toNoticeDetail = async (item) => {
if (null != item) {
router.push(
{
path: "/pdfView",
path: "/enforce/enforcementPlanDetailed",
query: {
url: url
id:item.id
}
});
} else {
@ -158,7 +162,7 @@
}
}
const queryList = () => {
queryEnforcementInspectionProgramListNoPermissionNoPaging({dateType:4}, success => {
queryEnforcementInspectionProgramListNoPermissionNoPaging({isPublish:1,dateType:4}, success => {
/* if (success.rows.length > 4) {
for (let i = 0; i < 5; i++) {
carouselList.push(success.rows[i]);
@ -175,12 +179,15 @@
noticeStr += success.rows[0].planName != null ? success.rows[0].planName + "" : "";
} else { */
carouselList = success.data;
if(carouselList.length==0){
data.notNull=false
}
for (let i = 0; i < success.data.length; i++) {
// carouselList.push(success.data[i]);
noticeObj.noticeList.push(success.data[i].planName);
var obj = {
content: success.data[i].planName
content: success.data[i].planName,
id:success.data[i].id
}
data.noticeList.push(obj)
//}
@ -323,6 +330,8 @@
height: 100%;
overflow: hidden;
background-color: #f4f4f4;
padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.warp_body {
position: relative;
@ -344,9 +353,10 @@
}
.boutique_box {
position: absolute;
position: fixed;
width: 100%;
bottom: 1%;
bottom: calc(1.67rem + constant(safe-area-inset-bottom));
bottom: calc(1.67rem + env(safe-area-inset-bottom));
.boutique_body {
padding: 0 0 0.27rem 0;

6
src/views/enterprise/complaintList.vue

@ -1,5 +1,5 @@
<template>
<div class="shop app_content">
<div class="home app_content" safe-area-inset-bottom>
<!-- 导航栏 -->
<!-- <div class="header_body">
<header-nav
@ -413,7 +413,7 @@
</script>
<style lang="less" scoped>
.shop {
.home {
height: 100%;
display: flex;
flex-direction: column;
@ -428,6 +428,8 @@
flex: 1;
overflow-y: scroll;
position: relative;
padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.goods_box {
display: flex;

4
src/views/enterprise/enterpriseInspectionNotice.vue

@ -1,5 +1,5 @@
<template>
<div class="home app_content">
<div class="home app_content" safe-area-inset-bottom>
<!-- 中间 -->
<!-- <div class="warp_body">-->
<!-- <div class="white-body">-->
@ -90,6 +90,8 @@
height: 100%;
overflow: hidden;
background-color: #ebf3fb;
padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.warp_body {
position: relative;

2
src/views/enterprise/register.vue

@ -386,7 +386,7 @@ export default {
}
.fold-div .van-text-ellipsis {
padding: 0.27rem 0px 0px;
padding: 0.24rem 0;
width: calc(100% - 2.7rem);
color: #666;
}

Loading…
Cancel
Save