fit: 修复大屏小数点问题

1 year ago · ea4f5be28a
9 changed files with 34 additions and 102 deletions
--- a/public/imgs/police.jpeg
+++ b/public/imgs/police.jpeg
--- a/src/assets/icons/police.svg
+++ b/src/assets/icons/police.svg
@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1730699260266" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2520" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M99.9 980.6c5.3-79.7 16.4-187.7 41-286.2 4.9-25.5 23.1-47 23.6-47.9 2.2-15.2 187-15.2 187-15.2l30.7-3.2c-4.5 27.3-7.6 68.6 4 103.9 15.1 46.6 39.2 92.8 71.7 120.5l7.1-123.6h62.8l10.7 116c22.7-32.7 49.4-84.7 52.6-151 2.2-51.5 15.1-75.2 26.2-86 76.6 3.1 172.3 17 211 38.5 36.5 20.1 48.1 146.5 81.5 334.1H99.9v0.1z m561.4-706.3s6.2 17 4 33.6c1.4 7.6 2.7 16.1 3.6 26.9 1.8 29.5 16.5 231.6-168.3 250.8 0 0-213.7-4-195-249.5-5.3-7.2-8.4-12.6-8.4-12.6s-1.3-38.5 1.8-48.4c0 0-62.8-21.9-63.7-73-0.9-51.5 126-121.4 245.8-117.4 119.8 4.1 229.7 60.9 248.4 99 19.1 38.1-41 80.3-68.2 90.6z m-130-114.2c0-20.6-18.3-37.6-40.5-37.6-22.3 0-40.6 17-40.6 37.6 0 1.8 0 3.1 0.5 4.9-20-1.8-36.5 0.5-36.9 0 31.2 13 45 22.4 45 22.4 8.9 7.6 20.5 9.4 29.4 9.4 0.9 0 1.4 0.4 2.3 0.4 3.6 0 7.1-0.4 10.7-1.4 1.8 0 3.1-0.5 3.1-0.5 0.5 0 0.5-0.5 0.9-0.5 3.6-0.9 6.2-2.7 9.3-4.5 19.1-9.4 53-25.1 53-25.1-12 0-24.9 0.9-36.9 2.2 0.3-2 0.7-4.7 0.7-7.3z m99.7 76.1H324.7v36.3H631v-36.3z m-87.7 439.4L519.7 711h-39.6l-31.6-26.4 47.6-62.3 47.2 53.3z" fill="#bfbfbf" p-id="2521"></path></svg>
--- a/src/components/datav/statistic.vue
+++ b/src/components/datav/statistic.vue
@ -1,7 +1,7 @@
 <template>
    <div class="statistic">
        <div class="statistic-number">
-            {{ parseFloat(outputValue.toFixed(2)) }}{{ valueUnit }}
+            {{ isDecimal ? parseFloat(outputValue.toFixed(2)) : parseInt(outputValue) }}{{ valueUnit }}
        </div>
        <div class="statistic-title">{{ title }}</div>
    </div>
@ -20,6 +20,11 @@ const props = defineProps({
    valueUnit: {
        type: String,
    },
+    // 是否是小数
+    isDecimal: {
+        type: String,
+        defalut: false
+    }
 });
 const value = ref(0);
 watch(() => props.value, (val) => {
@ -62,6 +67,7 @@ const outputValue = useTransition(value, {
    }
    .statistic-title {
        font-size: 27px;
+        white-space: break-spaces;
    }

    .statistic-footer {
--- a/src/views/datav/AuditSuper.vue
+++ b/src/views/datav/AuditSuper.vue
@ -39,12 +39,14 @@
                            />
                            <datav-statistic
                                :value="437"
-                                title="审计总金额（万元）"
+                                :title="`审计总金额\n（万元）`"
+                                :isDecimal="true"
                                style="width: 20%"
                            />
                            <datav-statistic
                                :value="54"
-                                title="审减金额 &nbsp;&nbsp;&nbsp;（万元）"
+                                :title="`审减金额\n（万元）`"
+                                :isDecimal="true"
                                style="width: 20%"
                            />
                            <datav-statistic
--- a/src/views/datav/CaseVerif.vue
+++ b/src/views/datav/CaseVerif.vue
@ -31,7 +31,7 @@
                            </datav-tabs>
                        </datav-card>
                        <datav-card title="案件问题性质">
-                            <datav-tabs v-model="activeTab">
+                            <datav-tabs>
                                <datav-tab-item label="执法办案" name="1">
                                    <v-charts
                                        style="height: 320px"
@ -106,7 +106,7 @@
                    </el-col>
                    <el-col :span="6">
                        <datav-card>
-                            <datav-tabs v-model="activeTab">
+                            <datav-tabs>
                                <datav-tab-item label="案件来源占比" name="1">
                                    <div class="mb-40">
                                        <v-charts
@ -121,7 +121,7 @@
                            </datav-tabs>
                        </datav-card>
                        <datav-card>
-                            <datav-tabs v-model="activeTab">
+                            <datav-tabs>
                                <datav-tab-item label="停职处理情况" name="1">
                                    <div class="mb-40">
                                        <v-charts
--- a/src/views/datav/RightsComfort.vue
+++ b/src/views/datav/RightsComfort.vue
@ -74,7 +74,8 @@
                            />
                            <datav-statistic
                                :value="comfortMoney"
-                                title="&nbsp;&nbsp;&nbsp;&nbsp;抚慰金额（万元）"
+                                :title="`抚慰金额\n（万元）`"
+                                :isDecimal="true"
                                style="width: 20%"
                            />
                        </div>
--- a/src/views/sensitivePerception/DepartNegative.vue
+++ b/src/views/sensitivePerception/DepartNegative.vue
@ -170,7 +170,7 @@
                                    label1="民警总人数"
                                    label2="问题涉及民警数"
                                    :value1="departInfo.policeSize"
-                                    :value2="departInfo.policeSize"
+                                    :value2="departInfo.negativePoliceSize"
                                    size="large"
                                />
                            </el-col>
@ -179,7 +179,7 @@
                                    label1="协辅警人数"
                                    label2="问题涉及协辅警数"
                                    :value1="departInfo.auxSize"
-                                    :value2="departInfo.policeSize"
+                                    :value2="departInfo.negativeAuxSize"
                                    size="large"
                                />
                            </el-col>
--- a/src/views/sensitivePerception/PoliceNegative.vue
+++ b/src/views/sensitivePerception/PoliceNegative.vue
@ -67,7 +67,7 @@
                    </template>
                </el-table-column>
                <el-table-column label="警号" prop="empNo" />
-                <el-table-column label="任职年限" prop="employmentDate" />
+                <el-table-column label="入职时间" prop="employmentDate" />
                <el-table-column label="所属单位" prop="departName">
                    <template #default="{ row }">
                        <span
@ -147,7 +147,7 @@
                        <h5>民警基本情况</h5>
                        <el-row>
                            <el-col :span="6">
-                                <img src="/favicon.png" />
+                                <icon name="local-icon-police" :size="120" />
                            </el-col>
                            <el-col :span="18">
                                <div class="row">
@ -183,7 +183,7 @@
                                        <span>{{ policeInfo.empNo }}</span>
                                    </div>
                                    <div class="col col-12">
-                                        <label>任职年份</label>
+                                        <label>入职时间</label>
                                        <span>{{
                                            policeInfo.employmentDate || "/"
                                        }}</span>
@ -215,7 +215,7 @@
                            </el-col>
                            <el-col :span="18">
                                <el-row>
-                                    <el-col :span="12">
+                                    <el-col :span="12" class="mb-20">
                                        <description-pair
                                            label1="110接处警量"
                                            label2="问题数"
@ -225,6 +225,16 @@
                                            :value2="negativeInfo.jcjSize"
                                        />
                                    </el-col>
+                                    <el-col :span="12">
+                                        <description-pair
+                                            label1="122接处警量"
+                                            label2="问题数"
+                                            :value1="
+                                                negativeInfo.jcjBusinessSize
+                                            "
+                                            :value2="negativeInfo.jcjSize"
+                                        />
+                                    </el-col>
                                    <el-col :span="12">
                                        <description-pair
                                            label1="执法办案"
@ -246,7 +256,7 @@
                                type="dashboard"
                                :percentage="78"
                                :stroke-width="16"
-                                :width="250"
+                                :width="230"
                                color="#DC6231"
                            >
                                <div style="line-height: 64px" class="mt-40">
--- a/vite.config.ts.timestamp-1730686774606-8b00c58248ca4.mjs
+++ b/vite.config.ts.timestamp-1730686774606-8b00c58248ca4.mjs
				`@ -0,0 +1 @@`
				<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1730699260266" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2520" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M99.9 980.6c5.3-79.7 16.4-187.7 41-286.2 4.9-25.5 23.1-47 23.6-47.9 2.2-15.2 187-15.2 187-15.2l30.7-3.2c-4.5 27.3-7.6 68.6 4 103.9 15.1 46.6 39.2 92.8 71.7 120.5l7.1-123.6h62.8l10.7 116c22.7-32.7 49.4-84.7 52.6-151 2.2-51.5 15.1-75.2 26.2-86 76.6 3.1 172.3 17 211 38.5 36.5 20.1 48.1 146.5 81.5 334.1H99.9v0.1z m561.4-706.3s6.2 17 4 33.6c1.4 7.6 2.7 16.1 3.6 26.9 1.8 29.5 16.5 231.6-168.3 250.8 0 0-213.7-4-195-249.5-5.3-7.2-8.4-12.6-8.4-12.6s-1.3-38.5 1.8-48.4c0 0-62.8-21.9-63.7-73-0.9-51.5 126-121.4 245.8-117.4 119.8 4.1 229.7 60.9 248.4 99 19.1 38.1-41 80.3-68.2 90.6z m-130-114.2c0-20.6-18.3-37.6-40.5-37.6-22.3 0-40.6 17-40.6 37.6 0 1.8 0 3.1 0.5 4.9-20-1.8-36.5 0.5-36.9 0 31.2 13 45 22.4 45 22.4 8.9 7.6 20.5 9.4 29.4 9.4 0.9 0 1.4 0.4 2.3 0.4 3.6 0 7.1-0.4 10.7-1.4 1.8 0 3.1-0.5 3.1-0.5 0.5 0 0.5-0.5 0.9-0.5 3.6-0.9 6.2-2.7 9.3-4.5 19.1-9.4 53-25.1 53-25.1-12 0-24.9 0.9-36.9 2.2 0.3-2 0.7-4.7 0.7-7.3z m99.7 76.1H324.7v36.3H631v-36.3z m-87.7 439.4L519.7 711h-39.6l-31.6-26.4 47.6-62.3 47.2 53.3z" fill="#bfbfbf" p-id="2521"></path></svg>