统计

ruoyi-ui/package.json

@@ -52,6 +52,7 @@
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
+    "v-charts": "^1.19.0",
     "v-echarts": "^1.0.2",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",

ruoyi-ui/src/api/cxxm/statistics.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 获取统计数据
+export function getStatistics(query) {
+  return request({
+    url: '/cxxm/task/statistics',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/assets/icons/svg/assign.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="1710763729216" class="icon" viewBox="0 0 1228 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14605" xmlns:xlink="http://www.w3.org/1999/xlink" width="239.84375" height="200"><path d="M671.37984 36.897561c53.860569 53.792304 38.296298 135.026876 20.615832 174.483668l-2.594045 4.915033-3.14016 4.505447-27.783589 34.473494h420.849692c53.24619 2.867103 149.430653 36.726218 149.430652 144.720413 0 89.426293-70.175747 131.545394-142.740747 135.026876l-9.89833 0.273057h-136.66522c8.737836 27.16921 6.826435 55.976763 3.413218 80.347135-5.256355 37.954976-25.394337 66.967323-56.045028 83.487295 7.236021 25.257808 6.689906 55.021063-1.843138 86.422662-24.711693 82.599858-76.865653 97.276693-107.994194 98.232393-1.57008 11.263617-4.778504 23.278142-10.239652 35.770517-23.346406 48.262892-65.465508 73.998551-118.916491 73.998551h-0.068264l-10.444445-0.341322a228.139443 228.139443 0 0 1-77.411768-19.660131l-1.638344-0.819173-355.725505-114.274514-160.899063-4.573711a42.870009 42.870009 0 0 1-41.095136-36.043575L0 811.015241V390.506872c0-20.342775 14.335513-37.613654 33.654322-41.846044l6.621642-0.955701 138.440093-8.191721c37.886712-46.761077 105.468414-92.83951 133.456796-110.861298l5.324619-3.413217L449.247659 65.909908C503.449549-6.313769 610.692836-23.789442 671.448104 36.829297z m-149.498917 75.568631l-5.324619 6.485113-137.416128 166.223682a42.25563 42.25563 0 0 1-10.580974 9.215686c-26.07698 16.110386-65.738565 43.893974-95.570084 70.653598L273.057383 791.082053l317.224414 102.396518c5.119826 2.04793 25.940451 11.809732 48.809007 13.925927l8.601308 0.409586c20.957154 0 32.903415-7.031228 41.231665-24.302107a48.467685 48.467685 0 0 0 0.068264-37.06754 43.484388 43.484388 0 0 1 10.580974-50.58388 42.665216 42.665216 0 0 1 50.925201-4.437183c2.730574 1.706609 13.311547 6.689906 23.073349 6.689906 4.505447 0 18.158316 0 29.012347-36.180103 6.143791-22.322441 3.481482-38.364562-0.682643-45.054468-1.365287-2.116195-2.730574-3.413217-6.553377-4.095861a43.006538 43.006538 0 0 1-34.268702-49.764708 43.211331 43.211331 0 0 1 49.491651-34.610023c0.682643 0.068264 4.437182 0.546115 9.693537 0.546115 34.268702 0 36.453161-15.837328 37.818447-25.257808 3.549746-25.667394 2.252723-41.709515-4.095861-49.013801-5.119826-5.870734-24.711693-19.387074-96.867106-19.387074a42.870009 42.870009 0 0 1-6.348584-85.330432l6.348584-0.409586h317.565736c26.55483 0 68.400874-6.485113 68.400874-49.559915 0-48.467685-48.672478-57.34205-63.895427-58.843866l-2.594045-0.273057-507.750203 0.136528a42.801745 42.801745 0 0 1-37.340598-64.031956l3.959333-5.734205 79.869284-99.051565c4.641976-13.175019 16.383443-53.655776-4.573711-74.749459-23.619464-23.551199-63.007991-13.857662-88.880178 15.018156zM136.528691 682.678272a68.264346 68.264346 0 1 0 0 136.528691 68.264346 68.264346 0 0 0 0-136.528691z" p-id="14606"></path></svg>

ruoyi-ui/src/assets/icons/svg/check.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="1710764467521" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25628" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M373.493 197.816h187.133a40.726 40.726 0 0 0 40.651-40.651v-1.516a40.726 40.726 0 0 0-40.651-40.651H373.493a40.726 40.726 0 0 0-40.651 40.651v1.516a40.638 40.638 0 0 0 40.651 40.651z" p-id="25629"></path><path d="M457.686 707.676H295.77v-51.675h175.282C503.297 574.01 582.946 515.86 676.374 515.86A219.721 219.721 0 0 1 769.11 536.528v-323a56.987 56.987 0 0 0-57.049-57.05h-73.72v0.827a77.718 77.718 0 0 1-77.719 77.72H373.49a77.717 77.717 0 0 1-77.719-77.72v-0.827h-73.724a56.987 56.987 0 0 0-57.049 57.05v566.08A56.987 56.987 0 0 0 222.047 836.66h257.824a218.609 218.609 0 0 1-24.253-100.18 221.314 221.314 0 0 1 2.068-28.804zM295.77 370.48h342.433v51.675H295.77z m0 142.761h179.967v51.675H295.77z" p-id="25630"></path><path d="M805.354 841.891a165.752 165.752 0 0 0 37.62-105.416c0-91.774-74.689-166.6-166.6-166.6s-166.6 74.686-166.6 166.6 74.826 166.6 166.6 166.6a165.117 165.117 0 0 0 102.111-35c1.1-0.828 2.067-1.928 3.169-2.756l84.334 84.334 23.564-23.564z m-47.264-0.137a131.861 131.861 0 0 1-81.717 27.974c-73.447 0-133.252-59.806-133.252-133.253S602.93 603.222 676.373 603.222 809.63 663.029 809.63 736.475a132.771 132.771 0 0 1-51.541 105.279z" p-id="25631"></path></svg>

ruoyi-ui/src/assets/icons/svg/distribute.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="1710764542093" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="29176" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M928.7 689.2c-13.6-11.2-33.8-9.3-45 4.4l-49.1 59.6V547.5c0-17.7-14.3-32-32-32s-32 14.3-32 32v205.1l-48.6-59c-11.3-13.7-31.4-15.6-45-4.4-13.6 11.2-15.6 31.4-4.4 45l105.5 128.2c6.1 7.4 15.1 11.7 24.7 11.7s18.6-4.3 24.7-11.7L933 734.2c11.3-13.6 9.4-33.8-4.3-45z" p-id="29177"></path><path d="M626.6 809.3H148.1V683.7H345c14 37.5 50 64.6 91.9 64.6 42.9 0 78.6-26.8 92.3-64.6h97.3c17.7 0 32-14.3 32-32s-14.3-32-32-32h-96.1C517.7 580 480.8 551 436.9 551c-43.8 0-80.6 29-93.4 68.7H148.1V484.2h365.3c15.8 33.7 50.1 57 89 57 39.3 0 73.7-23.7 89.1-57h160.3c17.7 0 32-14.3 32-32 0-1.1-0.2-2.1-0.3-3.2 0.1-1.1 0.3-2.1 0.3-3.2V243.1c0-17.7-14.3-32-32-32H428.3c-14.8-35.9-50-61.2-90.6-61.2-40.6 0-75.8 25.2-90.7 61H115.9c-17.8 0-32.2 14.4-32.2 32.2v598.4c0 17.8 14.4 32.2 32.2 32.2h510.7c17.8 0 32.2-14.4 32.2-32.2s-14.4-32.2-32.2-32.2zM436.9 615c18.7 0 33.9 14.8 34.8 33.3-0.1 0.9-0.2 1.8-0.2 2.7-0.4 18.4-15.9 33.4-34.6 33.4-18.5 0-33.9-15-34.4-33.4 0-0.9-0.1-1.7-0.2-2.6 0.9-18.6 16.1-33.4 34.6-33.4z m165.6-137.9c-17.2 0-31.9-12.6-34.5-31.3-0.2-1.1-0.2-2.2-0.2-3.3 0-19.2 15.6-34.8 34.8-34.8 19.1 0 34.6 15.6 34.6 34.8 0 1.1 0 2.2-0.5 5.2-2.5 16.8-17.2 29.4-34.2 29.4zM372.3 247.5c0 0.3 0 0.6 0.1 0.9-0.1-0.5-0.1-0.8-0.1-0.9z m-34.6-33.6c17.9 0 32.9 13.9 34.2 31.6 0.1 1 0.2 2 0.4 2.9 0 19.2-15.5 34.8-34.6 34.8-18.7 0-34-14.9-34.7-34.3 0.3-1.5 0.4-3.1 0.5-4.6 2-17.1 16.7-30.4 34.2-30.4z m-94.5 61.5c11.8 41.3 49.5 71.9 94.6 71.9 45.1 0 82.8-30.6 94.4-72.1h387.7v145.1H698.3c-10.2-43.7-49.1-76.4-95.8-76.4-46.7 0-85.8 32.7-96 76.4H148.1V275.4h95.1z" p-id="29178"></path></svg>

ruoyi-ui/src/assets/icons/svg/import.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="1710764358263" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22684" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M601.152 708.288 400 568 344 568l0 112-224 0 0 112 224 0 0 112L400 904l201.152-140.288C624 749.504 624 722.496 601.152 708.288L601.152 708.288zM891.264 331.2 638.656 76.864C630.528 68.608 619.456 64 607.936 64L232 64C196.032 64 176 83.712 176 120L176 512 288 512 288 176l280 0 0 168c0 24.192 32 56 56 56l168 0 0.768 448L624 848 624 960l224 0c35.968 0 56-19.712 56-56L904 362.176C904 350.528 899.392 339.392 891.264 331.2L891.264 331.2z" p-id="22685"></path></svg>

ruoyi-ui/src/assets/icons/svg/statistics.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="1710763841307" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16763" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M691.2 928.2V543.1c0-32.7 26.5-59.3 59.2-59.3h118.5c32.7 0 59.3 26.5 59.3 59.2V928.2h-237z m192.6-385.1c0-8.2-6.6-14.8-14.8-14.8H750.5c-8.2 0-14.8 6.6-14.9 14.7v340.8h148.2V543.1zM395 157.8c-0.1-32.6 26.3-59.2 58.9-59.3h118.8c32.6 0 59.1 26.5 59.1 59.1v770.6H395V157.8z m44.4 725.9h148V157.9c0-8.1-6.5-14.7-14.7-14.8H454.1c-8.1 0.1-14.7 6.7-14.7 14.8v725.8zM98.6 394.9c0-32.7 26.5-59.2 59.2-59.3h118.5c32.7-0.1 59.3 26.4 59.3 59.1v533.5h-237V394.9z m44.5 488.8h148.2V394.9c0-8.2-6.7-14.8-14.8-14.8H158c-8.2 0-14.8 6.6-14.9 14.7v488.9z" p-id="16764"></path></svg>

ruoyi-ui/src/main.js

@@ -38,6 +38,8 @@ import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
 
+import VCharts from 'v-charts'
+
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
@@ -61,6 +63,7 @@ Vue.component('ImagePreview', ImagePreview)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
+Vue.use(VCharts)
 DictData.install()
 
 /**

ruoyi-ui/src/views/cxxm/task/check/detail.vue

@@ -6,38 +6,38 @@
         <el-card>
           <el-descriptions class="margin-top" :column="5" direction="vertical">
             <el-descriptions-item label="需巡查次数">
-              <el-tag type="info" effect="dark">5次</el-tag>
+              <el-tag type="info" effect="dark">{{form.taskCheckStatistics.xxccs}}次</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="已巡查次数">
-              <el-tag type="success" effect="dark">4次</el-tag>
+              <el-tag type="success" effect="dark">{{form.taskCheckStatistics.yxccs}}次</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="州巡查次数">
-              <el-tag type="warning" effect="dark">1次</el-tag>
+              <el-tag type="warning" effect="dark">{{form.taskCheckStatistics.zjxccs}}次</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="县巡查次数">
-              <el-tag type="info" effect="dark">3次</el-tag>
+              <el-tag type="info" effect="dark">{{form.taskCheckStatistics.xjxccs}}次</el-tag>
             </el-descriptions-item>
-            <el-descriptions-item label="平均巡查频率">
-              <el-tag type="primary" effect="dark">25天/次</el-tag>
+            <el-descriptions-item label="县巡查频率">
+              <el-tag type="primary" effect="dark">{{ form.taskCheckStatistics.xjxcpl }}天/次</el-tag>
             </el-descriptions-item>
           </el-descriptions>
         </el-card>
         <el-card>
           <el-descriptions class="margin-top" :column="5" direction="vertical">
             <el-descriptions-item label="未整改">
-              <el-tag type="danger" effect="dark">5次</el-tag>
+              <el-tag type="danger" effect="dark">{{form.taskCheckStatistics.wzgcs}}次</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="未整改到位">
-              <el-tag type="warning" effect="dark">4次</el-tag>
+              <el-tag type="warning" effect="dark">{{form.taskCheckStatistics.wzgdwcs}}次</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="已整改">
-              <el-tag type="success" effect="dark">1次</el-tag>
+              <el-tag type="success" effect="dark">{{form.taskCheckStatistics.yzgcs}}次</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="审核不通过">
-              <el-tag type="danger" effect="dark">1次</el-tag>
+              <el-tag type="danger" effect="dark">{{form.taskCheckStatistics.shbtgcs}}次</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="审核通过">
-              <el-tag type="success" effect="dark">1次</el-tag>
+              <el-tag type="success" effect="dark">{{form.taskCheckStatistics.shtgcs}}次</el-tag>
             </el-descriptions-item>
           </el-descriptions>
         </el-card>
@@ -161,7 +161,7 @@
         size="medium"
         plain
         type="success"
-        @click="handleCheck"
+        @click="handleCheckAdd"
         v-hasPermi="['cxxm:taskCheckAudit:add']"
       >审核
       </el-button>
@@ -170,7 +170,7 @@
         size="medium"
         plain
         type="info"
-        @click="handleCheck"
+        @click="handleCheckEdit"
         v-hasPermi="['cxxm:taskCheckAudit:edit']"
       >修改审核结果
       </el-button>
@@ -291,10 +291,14 @@ export default {
       });
     },
     // 审核按钮
-    handleCheck() {
+    handleCheckAdd() {
       this.title = "提交审核结果";
       this.open = true;
     },
+    handleCheckEdit() {
+      this.title = "修改审核结果";
+      this.open = true;
+    },
     // 提交审核
     submitAuditForm() {
       this.auditForm.tcId = this.recordForm.tcId
@@ -304,7 +308,7 @@ export default {
       }
       if (this.auditForm.id == null) {
         auditTaskCheck(this.auditForm).then(response => {
-          this.$modal.msgSuccess("审核成功");
+          this.$modal.msgSuccess("提交成功");
           this.open = false;
           this.getTaskCheckDetail();
         });