chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

v3
chenrui 2 years ago
parent
2a43bea665 9ae1adf618
commit
c4ab4ee394
11 changed files with 242 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/views/administrative/appointmentDetail.vue
  2. 66
      src/views/administrative/deptFilter.vue
  3. 2
      src/views/administrative/userFilter.vue
  4. 2
      src/views/enforce/assistUserFilter.vue
  5. 2
      src/views/enforce/earlyWarning.vue
  6. 2
      src/views/enforce/enterpriseWarningInfo.vue
  7. 21
      src/views/enforce/noScan.vue
  8. 144
      src/views/enforce/scanQrCode.vue
  9. 58
      src/views/enforce/zqyjjdmFilter.vue
  10. 2
      src/views/enterprise/enterpriseEvaluate/evaluate.vue
  11. 6
      src/views/enterprise/registrationList.vue

3
src/views/administrative/appointmentDetail.vue
View File

@ -35,7 +35,6 @@
autosize
readonly
type="textarea"
maxlength="100"
placeholder="请输入检查事项"
show-word-limit
/>
@ -46,7 +45,6 @@
autosize
readonly
type="textarea"
maxlength="100"
placeholder="请输入检查要求"
show-word-limit
/>
@ -74,7 +72,6 @@
autosize
readonly
type="textarea"
maxlength="100"
placeholder="请输入备注"
show-word-limit
/>

66
src/views/administrative/deptFilter.vue
View File

@ -9,15 +9,20 @@
<!-- 弹窗的内容 -->
<div class="popup-content">
<div class="subsearch">
<!-- <div class="subsearch">
<input class="searchbox" v-model="searchKey" placeholder="请输入人员姓名"/>
</div>
<div class="btnbox">
<button class='btn-reset' @click="cancel()">重置</button>
<button class='btn-search' @click="queryUserList()">搜索</button>
<button class='btn-search' @click="selectData()">确定</button>
</div>-->
<div class="subsearch">
<input class="searchbox" v-model="searchKey" placeholder="请输入人员姓名"/>
<van-icon class="ibtn-reset" name="clear" @click="cancel()" title="重置"/>
<button class='btn-search' @click="queryUserList()">搜索</button>
<button class='btn-search' @click="selectData()">确定</button>
</div>
<div class="search-result">
<!-- <van-checkbox-group v-model="checked">-->
<!-- <van-cell-group inset>-->
@ -42,7 +47,7 @@
<div style="width: 70%; text-align: left;">
{{item.deptName}}
</div>
<div style="width: 30%;"><van-icon name="arrow" size="0.5rem" /></div>
<div style="width: 30%;"><van-icon name="arrow" size="0.35rem" /></div>
</div>
</van-cell>
@ -246,23 +251,50 @@
}
.subsearch {
width: 100%;
height: 1.25rem;
display: flex;
align-items: center;
justify-content: space-between;
margin: 3%;
width: 94%;
height: 1.25rem;
font-size: 0.38rem;
}
.subsearch .ibtn-reset {
margin: 0 0.5rem 0 -1rem;
width: 1rem;
color: #afabab;
font-size: 0.5rem;
}
.subsearch .btn-search {
margin: 0 0.8rem 0 -0.5rem;
width: 20%;
height: 1rem;
border-radius: 0 0.15rem 0.15rem 0;
}
.subsearch .btn-search:last-child {
margin-right: 0;
border-radius: 0.15rem;
background: #19ab47;
border-color: #19ab47;
}
.searchbox {
margin: 2% 3%;
padding: 0.15rem 0.3rem 0.1rem 1.15rem;
width: 94%;
height: 1.0rem;
background: #f6f7fe url(../../assets/images/icon_sou.png) no-repeat;
background-position: left 0.5rem center;
background-size: auto 50%;
box-sizing: border-box;
border: 1px solid rgba(0, 0, 0, .05);
border-radius: 0.5rem;
color: #999999;
outline: none;
margin: 2% 0;
padding: 0.1rem 1.2rem 0.1rem 0.9rem;
width: 100%;
height: 1rem;
background: #f6f7fe url(../../assets/images/icon_sou.png) no-repeat;
background-position: left 0.25rem center;
background-size: auto 50%;
box-sizing: border-box;
border: 1px solid rgba(0, 0, 0, .1);
border-radius: 0.15rem 0 0 0.15rem;
color: #999999;
outline: none;
}
.subtitle {

2
src/views/administrative/userFilter.vue
View File

@ -16,7 +16,7 @@
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
<div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">
<div class="case-title">姓名：{{ item.userName }}</div>
<div class="case-title">{{ item.userName }}</div>
<!-- <div class="case-depart">电话：{{ item.phonenumber }}</div> -->
<div class="case-time">执法证件号：{{ item.lawCertificateNum }}</div>
</div>

2
src/views/enforce/assistUserFilter.vue
View File

@ -14,7 +14,7 @@
</div>
<div class="search-result">
<div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">
<div class="case-title">姓名：{{ item.userName }}</div>
<div class="case-title">{{ item.userName }}</div>
<!-- <div class="case-depart">电话：{{ item.phonenumber }}</div> -->
<div class="case-time">执法证件号：{{ item.lawCertificateNum }}</div>
</div>

2
src/views/enforce/earlyWarning.vue
View File

@ -43,7 +43,7 @@
</van-popup>
</div>
<div class="warning-rule">
<b>预警规则：</b>Ⅰ级 (严重)，红色图标，当月被检查次数为 <i>6</i>次以上；Ⅱ级 (较重)，橙色图标，当月被检查次数为 <i>5-6</i>次；Ⅲ级 (一般)，黄色图标，当月被检查次数为 <i>3-4</i>次。
<b>预警规则：</b>Ⅰ级 (严重)，红色图标，当月被检查次数为 <i>7</i>次及以上；Ⅱ级 (较重)，橙色图标，当月被检查次数为 <i>5-6</i>次；Ⅲ级 (一般)，黄色图标，当月被检查次数为 <i>3-4</i>次。
</div>
<!-- 中间 -->

2
src/views/enforce/enterpriseWarningInfo.vue
View File

@ -29,7 +29,7 @@
</van-button>
</div>
<div class="warning-rule">
<b>预警规则：</b>Ⅰ级 (严重)，红色图标，当月被检查次数为 <i>6</i>次以上；Ⅱ级 (较重)，橙色图标，当月被检查次数为 <i>5-6</i>次；Ⅲ级 (一般)，黄色图标，当月被检查次数为 <i>3-4</i>次。
<b>预警规则：</b>Ⅰ级 (严重)，红色图标，当月被检查次数为 <i>7</i>次及以上；Ⅱ级 (较重)，橙色图标，当月被检查次数为 <i>5-6</i>次；Ⅲ级 (一般)，黄色图标，当月被检查次数为 <i>3-4</i>次。
</div>
<!-- 中间 -->
<div class="shop-center">

21
src/views/enforce/noScan.vue
View File

@ -265,7 +265,7 @@
.case-title {
margin: 2% 0 1%;
padding-left: 0.65rem;
background: url(/src/assets/images/icon_jd.png) no-repeat left top 0.08rem;
background: url(/src/assets/images/icon_jd.png) no-repeat left top 0.02rem;
background-size: auto 0.5rem;
font-size: 0.40rem;
font-weight: bold;
@ -274,16 +274,15 @@
}
.case-area {
display: table;
margin: 2% 0 2% -4.5%;
padding: 1% 15% 1% 4%;
width: auto;
/*background-color: #d0e5ff;
border-radius: 0 0.75rem 0.75rem 0;*/
background: linear-gradient(to right, #cce5ff, #dfedfb 30%, transparent 70%);
color: #077bf7;
font-size: 0.4rem;
line-height: 1.5;
display: table;
margin: 2% 0 2% -4.5%;
padding: 1% 0 1% 4%;
width: auto;
background: linear-gradient(to right, #d3e6f9, #dfedfb 30%, transparent 70%);
border-radius: 0 0 0 0.35rem;
color: #68acf5;
font-size: 0.35rem;
line-height: 1.5;
}
.case-info {

144
src/views/enforce/scanQrCode.vue
View File

@ -33,15 +33,17 @@
</div>
</div>
<div class="scan-note">扫一扫企业二维码，即可查看企业信息</div>
<div class="nocode" @click="toNoScanView">扫码不成功？手动输入关键词查询 >></div>
</div>
</div>
<!-- <div class="recommend_box">
<van-cell :border="false" title="推荐" />
<div class="recommend_body">
<goodsCard :goodsList="recommend"></goodsCard>
</div>
</div> -->
<div class="nocode" @click="toNoScanView">扫码不成功？手动输入关键词查询 >></div>
<!-- <div class="nocode" @click="showPopup">扫码不成功？手动输入关键词查询 >></div>-->
</div>
</div>
<!-- <div class="recommend_box">
<van-cell :border="false" title="推荐" />
<div class="recommend_body">
<goodsCard :goodsList="recommend"></goodsCard>
</div>
</div> -->
<!-- </refresh-list> -->
</div>
@ -50,6 +52,7 @@
<footer-nav></footer-nav>
</div> -->
</div>
</template>
<script setup name="Home">
@ -222,6 +225,7 @@
const goBack = () => {
router.go(-1);
};
</script>
<style lang="less" scoped>
@ -321,11 +325,12 @@
}
.nocode {
margin: 15% 0 0;
width: 100%;
color: #fb7905;
font-size: 0.42rem;
text-align: center;
line-height: 13;
line-height: 5;
}
.scan-note {
@ -335,4 +340,123 @@
text-align: center;
line-height: 2;
}
.popup {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.35);
}
.popup-content {
position: fixed;
z-index: 999;
bottom: 0;
left: 0;
padding: 0 3%;
width: 94%;
height: 35vh;
background: #fff;
overflow-y: auto;
font-size: 0.38rem;
}
.subtitle {
margin: 5% 2% 2%;
width: 96%;
/*font-size: 0.4rem;
font-weight: 600;*/
border-bottom: 1px solid #f4f4f4;
line-height: 2;
}
.item-btn {
float: left;
margin: 0.3rem 0.2rem;
padding: 0.2rem 0.3rem;
background-color: #f2f3f4;
color: #999;
border-radius: 1rem;
font-size: 0.35rem;
}
.item-btn.active {
background-color: #e9f2fb;
color: #1367fe;
}
.btnbox {
display: flex;
justify-content: center;
position: absolute;
bottom: 1rem;
left: 5%;
width: 90%;
height: 1rem;
}
.btn-reset {
display: inline-block;
margin: 0 2%;
padding: 0;
width: 60%;
color: #fff;
font-size: 0.35rem;
border-radius: 1rem;
background: #1367fe;
border: 1px solid #1367fe;
text-align: center;
}
.btn-search {
display: inline-block;
margin: 3% 7%;
padding: 0;
width: 70%;
color: #fff;
font-size: 0.35rem;
border-radius: 1rem;
background: #1367fe;
border: 1px solid #1367fe;
text-align: center;
height: 90%;
}
.btn-reset {
width: 35%;
background-color: #fff;
border-color: rgba(19, 103, 254, .7);
color: #1367fe;
}
.close-button {
position: absolute;
top: 0.15rem;
right: 0.1rem;
width: 0.8rem;
height: 0.8rem;
background-color: rgba(255, 255, 255, .5);
border: 0.05rem solid rgba(255, 255, 255, .7);
border-radius: 50%;
transform: rotate(45deg);
}
.close-button:before,
.close-button:after {
content: '';
position: absolute;
top: 50%;
left: 50%;
background: #333;
border-radius: 50%;
transform: translate(-50%, -50%);
height: 0.4rem;
width: 0.02rem;
}
.close-button:after {
height: 0.02rem;
width: 0.4rem;
}
</style>

58
src/views/enforce/zqyjjdmFilter.vue
View File

@ -7,13 +7,20 @@
<!-- 弹窗的内容 -->
<div class="popup-content">
<div class="subsearch">
<!-- <div class="subsearch">
<input class="searchbox" v-model="searchParam.searchValue" placeholder="请输入关键词"/>
</div>
<div class="btnbox">
<button class='btn-reset' @click="cancel()">重置</button>
<button class='btn-search' @click="search()">搜索</button>
</div>
</div>-->
<div class="subsearch">
<input class="searchbox" v-model="searchParam.searchValue" placeholder="请输入关键字搜索"/>
<van-icon class="ibtn-reset" name="clear" @click="cancel()" title="重置"/>
<button class='btn-search' @click="search()">搜索</button>
</div>
<div class="search-result">
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
@ -201,23 +208,42 @@
}
.subsearch {
width: 100%;
height: 1.25rem;
display: flex;
align-items: center;
justify-content: space-between;
margin: 3%;
width: 94%;
height: 1.25rem;
font-size: 0.38rem;
}
.subsearch .ibtn-reset {
margin: 0 0.5rem 0 -1rem;
width: 1rem;
color: #afabab;
font-size: 0.5rem;
}
.subsearch .btn-search {
margin: 0 0 0 -0.5rem;
width: 20%;
height: 1rem;
border-radius: 0 0.15rem 0.15rem 0;
}
.searchbox {
margin: 2% 3%;
padding: 0.15rem 0.3rem 0.1rem 1.15rem;
width: 94%;
height: 1.0rem;
background: #f6f7fe url(../../assets/images/icon_sou.png) no-repeat;
background-position: left 0.5rem center;
background-size: auto 50%;
box-sizing: border-box;
border: 1px solid rgba(0, 0, 0, .05);
border-radius: 0.5rem;
color: #999999;
outline: none;
margin: 2% 0;
padding: 0.1rem 1.2rem 0.1rem 0.9rem;
width: 100%;
height: 1rem;
background: #f6f7fe url(../../assets/images/icon_sou.png) no-repeat;
background-position: left 0.25rem center;
background-size: auto 50%;
box-sizing: border-box;
border: 1px solid rgba(0, 0, 0, .1);
border-radius: 0.15rem 0 0 0.15rem;
color: #999999;
outline: none;
}
.subtitle {

2
src/views/enterprise/enterpriseEvaluate/evaluate.vue
View File

@ -78,7 +78,7 @@
</div>
<div class="cardsty">
<label>检查反馈</label>
<label>意见|建议</label>
<van-field class="eval-cont"
v-model="data.dataObj.writingEvaluation"

6
src/views/enterprise/registrationList.vue
View File

@ -108,10 +108,8 @@
<!-- @click.stop="toComplaintView(item.id,item.lawEnforcementItem,item.lawEnforcementItemText)">-->
<!-- <van-icon name="warning-o"/>-->
<!-- 投诉</a>-->
<a
@click.stop="toEvaluate(item.id,item.lawEnforcementItemText)">
<van-icon name="flower-o"/>
评价</a>
<a @click.stop="toEvaluate(item.id,item.lawEnforcementItemText)">
<van-icon name="flower-o"/>评价</a>
</div>
<div class="card_box_action" v-if="item.comOrOpi == 0">

Write Preview
Loading…
Cancel
Save