wangmingyong@163.com 3 weeks ago
parent
commit
8ba14b618e
  1. 5
      zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust
  2. 54
      zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/statistics_enterprise/index.vue
  3. 20
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue
  4. 3
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue
  5. 8
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
  6. 3
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue

5
zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust

@ -1,7 +1,8 @@
# VITE_APP_PROXY_TARGET = 'http://139.186.148.21:8080' # VITE_APP_PROXY_TARGET = 'http://139.186.148.21:8080'
# VITE_APP_PROXY_TARGET = 'http://10.132.108.3:85/efcode20-sup-web/prod-api' # VITE_APP_PROXY_TARGET = 'http://10.132.108.3:85/efcode20-sup-web/prod-api'
# VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080' VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080'
VITE_APP_PROXY_TARGET = 'http://172.16.21.93:8080' # VITE_APP_PROXY_TARGET = 'http://172.16.21.93:8080'
# VITE_PROXY_TARGET = 'http://172.16.20.72:8080'
# 页面标题 # 页面标题
VITE_APP_TITLE = 执法监督码•执法监督 VITE_APP_TITLE = 执法监督码•执法监督
VITE_APP_LOGO_TITLE = 执法监督码•执法监督 VITE_APP_LOGO_TITLE = 执法监督码•执法监督

54
zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/statistics_enterprise/index.vue

@ -143,18 +143,52 @@ const handleStreetChange = (val: string) => {
const loadTab1Data = async () => { const loadTab1Data = async () => {
loading1.value = true; loading1.value = true;
try { try {
const [overviewRes, areaRes] = await Promise.all([ // TODO:
getOverview(queryParams), // const [overviewRes, areaRes] = await Promise.all([
listByArea(queryParams) // getOverview(queryParams),
]); // listByArea(queryParams)
overviewData.value = overviewRes.data; // ]);
areaStatList.value = areaRes.data || []; // overviewData.value = overviewRes.data;
// areaStatList.value = areaRes.data || [];
//
overviewData.value = {
total: 4439216,
existCount: 0,
cancelledCount: 0,
areaLabel: '全市'
};
areaStatList.value = [
{ name: '宝安区', totalNumber: 984119, existNumber: 0, sort: 1 },
{ name: '龙岗区', totalNumber: 966252, existNumber: 0, sort: 2 },
{ name: '福田区', totalNumber: 615441, existNumber: 0, sort: 3 },
{ name: '南山区', totalNumber: 601902, existNumber: 0, sort: 4 },
{ name: '龙华区', totalNumber: 572932, existNumber: 0, sort: 5 },
{ name: '罗湖区', totalNumber: 311483, existNumber: 0, sort: 6 },
{ name: '光明区', totalNumber: 192114, existNumber: 0, sort: 7 },
{ name: '坪山区', totalNumber: 92084, existNumber: 0, sort: 8 },
{ name: '盐田区', totalNumber: 62220, existNumber: 0, sort: 9 },
{ name: '大鹏新区', totalNumber: 29258, existNumber: 0, sort: 10 },
{ name: '深汕特别合作区', totalNumber: 11411, existNumber: 0, sort: 11 }
];
areaPageNum.value = 1; areaPageNum.value = 1;
} finally { } finally {
loading1.value = false; loading1.value = false;
} }
}; };
/** 区域汇总表合计行 */
const getAreaSummary = ({ columns, data }: { columns: any[]; data: EnterpriseAreaStatVo[] }) => {
return columns.map((col, index) => {
if (index === 0) return '总计';
if (index === 1) {
const total = data.reduce((sum, item) => sum + (item.totalNumber || 0), 0);
return `${(total / 10000)} 万家`;
}
return '';
});
};
/** 搜索 */ /** 搜索 */
const handleQuery = () => { const handleQuery = () => {
if (viewLevel.value === 1) { if (viewLevel.value === 1) {
@ -406,13 +440,13 @@ const handleExportType = async () => {
<!-- 统计指标 --> <!-- 统计指标 -->
<div class="stats-line"> <div class="stats-line">
<span class="stats-item">企业数量<em>{{ overviewData.total }}</em></span> <span class="stats-item">企业数量<em>{{ overviewData.total }}</em></span>
<span class="stats-item">续存企业数量<em>{{ overviewData.existCount }}</em></span> <!-- <span class="stats-item">续存企业数量<em>{{ overviewData.existCount }}</em></span> -->
<span class="stats-item">注销企业数量<em>{{ overviewData.cancelledCount }}</em></span> <!-- <span class="stats-item">注销企业数量<em>{{ overviewData.cancelledCount }}</em></span> -->
</div> </div>
<!-- 区域汇总表 (viewLevel=1) --> <!-- 区域汇总表 (viewLevel=1) -->
<el-card v-if="viewLevel === 1" shadow="hover" v-loading="loading1"> <el-card v-if="viewLevel === 1" shadow="hover" v-loading="loading1">
<el-table :data="areaStatList" border stripe> <el-table :data="areaStatList" border stripe show-summary :summary-method="getAreaSummary">
<el-table-column label="区域" align="center"> <el-table-column label="区域" align="center">
<template #default="{ row }"> <template #default="{ row }">
<el-link v-if="row.name !== '其他'" type="primary" :underline="false" @click="handleAreaClick(row)">{{ row.name }}</el-link> <el-link v-if="row.name !== '其他'" type="primary" :underline="false" @click="handleAreaClick(row)">{{ row.name }}</el-link>
@ -420,7 +454,7 @@ const handleExportType = async () => {
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="企业数量" prop="totalNumber" align="center" /> <el-table-column label="企业数量" prop="totalNumber" align="center" />
<el-table-column label="续存企业数量" prop="existNumber" align="center" /> <!-- <el-table-column label="续存企业数量" prop="existNumber" align="center" /> -->
<el-table-column label="操作" width="80" align="center"> <el-table-column label="操作" width="80" align="center">
<template #default="{ row }"> <template #default="{ row }">
<el-link type="success" :underline="false" @click="handleAreaDetailClick(row)">详情</el-link> <el-link type="success" :underline="false" @click="handleAreaDetailClick(row)">详情</el-link>

20
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue

@ -54,6 +54,12 @@
<span class="custom-cell-label">入企时间</span> <span class="custom-cell-label">入企时间</span>
<span class="custom-cell-value">{{ formatTime(activityDetail.enforcementTime) }}</span> <span class="custom-cell-value">{{ formatTime(activityDetail.enforcementTime) }}</span>
</div> </div>
<div class="custom-cell" v-if="activityDetail.lawEnforcementBasisText">
<span class="custom-cell-label">活动依据</span>
<div class="custom-cell-value basis-list">
<div v-for="(basis, index) in activityDetail.lawEnforcementBasisText.split(',')" :key="index" class="basis-item">{{ basis }}</div>
</div>
</div>
<div class="custom-cell"> <div class="custom-cell">
<span class="custom-cell-label">原因</span> <span class="custom-cell-label">原因</span>
<span class="custom-cell-value">{{ activityDetail.reason }}</span> <span class="custom-cell-value">{{ activityDetail.reason }}</span>
@ -190,6 +196,20 @@ onMounted(() => {
flex-direction: column; flex-direction: column;
} }
.basis-list {
display: flex;
flex-direction: column;
}
.basis-item {
padding-bottom: 6px;
line-height: 1.5;
&:last-child {
padding-bottom: 0;
}
}
.enforcer-line { .enforcer-line {
display: flex; display: flex;
align-items: baseline; align-items: baseline;

3
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue

@ -750,10 +750,11 @@ const onSubmit = () => {
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
padding: 0.2rem 0.4rem; padding: 0.2rem 0.4rem calc(0.2rem + env(safe-area-inset-bottom));
background: #fff; background: #fff;
box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05); box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05);
z-index: 10; z-index: 10;
-webkit-tap-highlight-color: transparent;
} }
/* ===== 只读状态可点击元素设置不可交互光标 ===== */ /* ===== 只读状态可点击元素设置不可交互光标 ===== */

8
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue

@ -34,11 +34,11 @@
@add-basis="handleAddBasis" @remove-basis="handleRemoveBasis" @add-person="handleAddPerson" /> @add-basis="handleAddBasis" @remove-basis="handleRemoveBasis" @add-person="handleAddPerson" />
<!-- 底部按钮 --> <!-- 底部按钮 -->
<div class="bottom-buttons"> <van-action-bar class="bottom-buttons">
<van-button v-if="!isNonEnforcement" class="btn-save" @click="handleSave">保存</van-button> <van-button v-if="!isNonEnforcement" class="btn-save" @click="handleSave">保存</van-button>
<van-button class="btn-submit" type="primary" native-type="submit">提交</van-button> <van-button class="btn-submit" type="primary" native-type="submit">提交</van-button>
<van-button v-if="showTransferButton && !isNonEnforcement" class="btn-transfer" @click="handleSubmitAndTransfer">提交并转办案</van-button> <van-button v-if="showTransferButton && !isNonEnforcement" class="btn-transfer" @click="handleSubmitAndTransfer">提交并转办案</van-button>
</div> </van-action-bar>
</van-form> </van-form>
<!-- 弹窗组件 --> <!-- 弹窗组件 -->
@ -891,11 +891,11 @@ onMounted(() => {
right: 0; right: 0;
display: flex; display: flex;
gap: 0.2rem; gap: 0.2rem;
padding: 0.28rem 0.32rem; padding: 0.28rem 0.32rem calc(0.28rem + env(safe-area-inset-bottom));
background: #fff; background: #fff;
box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.08); box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.08);
z-index: 99; z-index: 99;
-webkit-tap-highlight-color: transparent;
.btn-save, .btn-save,
.btn-submit, .btn-submit,
.btn-transfer { .btn-transfer {

3
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue

@ -227,7 +227,7 @@ const onPublish = (item) => {
.add-btn { .add-btn {
position: fixed; position: fixed;
right: 22px; right: 22px;
bottom: 28px; bottom: calc(28px + env(safe-area-inset-bottom));
width: 56px; width: 56px;
height: 56px; height: 56px;
border-radius: 50%; border-radius: 50%;
@ -237,6 +237,7 @@ const onPublish = (item) => {
justify-content: center; justify-content: center;
box-shadow: 0 8px 20px rgba(24, 144, 255, 0.38); box-shadow: 0 8px 20px rgba(24, 144, 255, 0.38);
z-index: 100; z-index: 100;
-webkit-tap-highlight-color: transparent;
&:active { &:active {
transform: scale(0.96); transform: scale(0.96);

Loading…
Cancel
Save