src/components/echarts/bar.vue

@@ -23,8 +23,8 @@ let option = {
   },
   legend: {
     data: [], //"收储面积", "收储个数"
-    left: "7%",
-    top: "5%",
+    // left: "7%",
+    // top: "5%",
     textStyle: {
       color: "#666666",
     },
@@ -34,6 +34,7 @@ let option = {
     show: false,
   },
   xAxis: {
+    type: "category",
     axisTick: { show: false },
     axisLine: { lineStyle: { color: "#BCD3E5" } },
     axisLabel: {
@@ -162,15 +163,16 @@ export default {
         this.myChart = this.$echarts.init(this.$refs.echart);
       }
       option.legend.data = v.legend;
+      option.legend.show = v.legend.length;
       option.xAxis.data = v.xData;
       option.yAxis[0].name = v.yName || "变化面积/km²";
       option.series = [];
       v.yData.forEach((item, k) => {
         let o = cloneDeep(seriesItem); // JSON.parse(JSON.stringify(seriesItem));
-        o.name = v.xData[k];
+        o.name = v.legend[k];
         o.data = item;
-        o.stack = v.stack||undefined
-        o. barWidth=v.barWidth|| "12px"
+        o.stack = v.stack || undefined;
+        o.barWidth = v.barWidth || "12px";
         // alldata = [...alldata, ...o.data];
         // if (v.interval) {
         //   option.xAxis.axisLabel.interval = 0;

src/views/pageCode/checkLand/index.vue

@@ -157,7 +157,7 @@ import {
   getRoles,
 } from "@/api/rsmonitoring/dkjbxx";
 import numCard from "@/components/numCard";
-import useDataStore from '@/store/modules/data'
+import useDataStore from "@/store/modules/data";
 import { FormConfig, TableHeader, countparm, sdlist } from "./config";
 const { proxy } = getCurrentInstance();
 const { num_compare } = proxy.useDict("num_compare");
@@ -289,7 +289,7 @@ function fieldwork(field) {
   title.value = field ? "分发至外业" : "取消分发外业任务";
   if (field) {
     form.value.fieldworkId = "";
-    form.value.fieldworkBy = "zhang";
+    form.value.fieldworkBy = "";
   }
   form.value.auditflowStep = field ? "WYFF" : "WYQR";
   getRoles().then((response) => {
@@ -306,14 +306,20 @@ function submitForm() {
   proxy.$refs["dkjbxxRef"].validate((valid) => {
     if (valid) {
       if (isfield.value) {
-        field(form.value).then((response) => {
-          proxy.$modal.msgSuccess("分发成功");
-          open.value = false;
-          getList();
-        });
+        if (form.value.fieldworkId) {
+          let user = roles.value.find(
+            (r) => r.userId == form.value.fieldworkId
+          );
+          form.value.fieldworkBy = user.nickName;
+          field(form.value).then((response) => {
+            proxy.$modal.msgSuccess("分发成功");
+            open.value = false;
+            getList();
+          });
+        }
       } else {
         removeField(form.value).then((response) => {
-          proxy.$modal.msgSuccess("新增成功");
+          proxy.$modal.msgSuccess("取消分发成功");
           open.value = false;
           getList();
         });

src/views/pageCode/statistic/progress/config.js

@@ -26,16 +26,16 @@ export const zllist = {
     { name: "省级\n已审核", prop: "SJJYSH", prop3: "完成进度" },
   ],
   judge: [
-    { name: "监测\n图斑", pro: "JCAll" },
+    { name: "监测\n图斑", prop: "JCAll" },
     { name: "未判定\n图斑", prop: "WPD", prop3: "占比" },
     { name: "已判定\n图斑\n(拆分前)", prop: "PDCFQ", prop3: "占比" },
     { name: "已判定\n图斑\n(拆分后)", prop: "PDCFH" },
   ],
   result: [
-    { name: "已判定\n图斑", pro: "PDAll", api: "pdjg" },
-    { name: "判定为\n合法用地", prop: "HFYD", prop3: "占比", api: "pdjg" },
-    { name: "判定为\n违法用地", prop: "WFYD", prop3: "占比", api: "pdjg" },
-    { name: "判定为\n其它用地", prop: "QTYD", prop3: "占比", api: "pdjg" },
+    { name: "已判定\n图斑", prop: "PDAll", api: "pdjg" },
+    { name: "判定为\n合法用地", prop: "PDHF", prop3: "占比", api: "pdjg" },
+    { name: "判定为\n违法用地", prop: "PDWF", prop3: "占比", api: "pdjg" },
+    { name: "判定为\n其它用地", prop: "PDQT", prop3: "占比", api: "pdjg" },
   ],
 }
 export const titles = {
@@ -57,27 +57,27 @@ export const allTable = [
 ]
 export const judgeTable = [
   { label: "行政区", prop: "xzqmc", width: '80px', align: 'center' },
-  { label: "图斑数", prop: "countNumber", width: '60px' },
-  { label: "图斑面积", prop: "countSum", width: '100px', align: 'center' },
+  // { label: "图斑数", prop: "countNumber", width: '70px' },
+  // { label: "图斑面积", prop: "countSum", width: '100px', align: 'center' },
   {
     label: "监测图斑", list: [
-      { label: "图斑数", prop: "szxzc", width: '60px' },
-      { label: "图斑面积", prop: "name", width: '100px', align: 'center' },]
+      { label: "图斑数", prop: "v1_number", width: '70px' },
+      { label: "图斑面积", prop: "v1_sum", width: '100px', align: 'center' },]
   },
   {
     label: "未判定图斑", list: [
-      { label: "图斑数", prop: "szxzc", width: '60px' },
-      { label: "图斑面积", prop: "name", width: '100px', align: 'center' },]
+      { label: "图斑数", prop: "v2_number", width: '70px' },
+      { label: "图斑面积", prop: "v2_sum", width: '100px', align: 'center' },]
   },
   {
     label: "已判定图斑（拆分前）", list: [
-      { label: "图斑数", prop: "szxzc", width: '60px' },
-      { label: "图斑面积", prop: "name", width: '100px', align: 'center' },]
+      { label: "图斑数", prop: "v3_number", width: '70px' },
+      { label: "图斑面积", prop: "v3_sum", width: '100px', align: 'center' },]
   },
   {
     label: "已判定图斑（拆分后）", list: [
-      { label: "图斑数", prop: "szxzc", width: '60px' },
-      { label: "图斑面积", prop: "name", width: '100px', align: 'center' },]
+      { label: "图斑数", prop: "v4_number", width: '70px' },
+      { label: "图斑面积", prop: "v4_sum", width: '100px', align: 'center' },]
   },
 ]