Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/router/index.js

@@ -259,7 +259,7 @@ export const dynamicRoutes = [
         path: "content/:id(\\d+)",
         component: () => import("@/views/safetycheck/ruleManager/index.vue"),
         name: "safetycheckRuleManager",
-        meta: { title: "检查手册管理", activeMenu: "/safetycheck/rule" },
+        meta: { title: "检查内容管理", activeMenu: "/safetycheck/rule" },
       },
     ],
   },
@@ -273,7 +273,7 @@ export const dynamicRoutes = [
         path: "content/:id(\\d+)",
         component: () => import("@/views/resumption/ruleManager/index.vue"),
         name: "resumptionRuleManager",
-        meta: { title: "履职手册管理", activeMenu: "/resumption/rule" },
+        meta: { title: "履职内容管理", activeMenu: "/resumption/rule" },
       },
     ],
   },

src/views/board/charts/comprehesive/report.vue

@@ -170,11 +170,11 @@ export default {
             },
             data: [
               {
-                name: "未配置保安",
+                name: "未配备保安",
                 value: this.orgSecurity.unequippedCount,
               },
               {
-                name: "配置保安",
+                name: "配备保安",
                 value: this.orgSecurity.equippedCount,
               },
             ],

src/views/board/charts/drill/report.vue

@@ -189,7 +189,7 @@ export default {
         grid: {
           left: "3%",
           right: "4%",
-          bottom: "2%",
+          bottom: "20",
           top: "20px",
           containLabel: true,
         },
@@ -211,7 +211,7 @@ export default {
             },
             axisLabel: {
               interval: 0,
-              rotate: -45,
+              // rotate: -45,
               fontSize: 12,
               color: "#fff",
             },

src/views/board/charts/edu/report.vue

@@ -186,7 +186,7 @@ export default {
         grid: {
           left: "3%",
           right: "4%",
-          bottom: "2%",
+          bottom: "20",
           top: "20px",
           containLabel: true,
         },
@@ -207,7 +207,7 @@ export default {
             },
             axisLabel: {
               interval: 0,
-              rotate: -45,
+              // rotate: -45,
               fontSize: 12,
               color: "#fff",
             },

src/views/board/charts/ga38/report.vue

@@ -192,7 +192,7 @@ export default {
         grid: {
           left: "3%",
           right: "4%",
-          bottom: "2%",
+          bottom: "20px",
           top: "20px",
           containLabel: true,
         },
@@ -214,7 +214,7 @@ export default {
             },
             axisLabel: {
               interval: 0,
-              rotate: -45,
+              // rotate: -45,
               fontSize: 12,
               color: "#fff",
             },

src/views/board/charts/safetycheck/report.vue

@@ -180,18 +180,29 @@ export default {
         grid: {
           // left: "3%",
           // right: "4%",
-          bottom: "2%",
-          top: "20px",
+          bottom: "0",
+          top: "0",
           // containLabel: true,
         },
 
         radar: {
           indicator: this.data.map((d) => ({ name: d.type })),
-          center: ["28%", "50%"],
-          radius: 55,
+          center: ["28%", "51%"],
+          radius: 60,
+          splitNumber:4,
           axisName: {
             color: "#fff",
           },
+          axisLine:{
+            lineStyle:{
+              color:'rgb(230,230,230)'
+            }
+          },
+          splitLine:{
+            lineStyle:{
+              color:'rgb(230,230,230)'
+            }
+          }
         },
         series: [
           {

src/views/resumption/ruleManager/index.vue

@@ -166,7 +166,7 @@
               align="center"
               prop="areaName"
               label="履职区域"
-              width="150"
+              width="200"
               show-overflow-tooltip
               v-if="columns[4].visible"
             >
@@ -174,7 +174,7 @@
             <el-table-column
               prop="checkName"
               label="履职点位"
-              width="150"
+              width="200"
               show-overflow-tooltip
               align="center"
             >
@@ -450,7 +450,7 @@ export default {
       return "";
     },
     spanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex < 3) {
+      if (columnIndex < 2) {
         if (row.rowSpan > 0) {
           return [row.rowSpan, 1];
         } else {

src/views/safetycheck/ruleManager/index.vue

@@ -171,7 +171,7 @@
               align="center"
               prop="areaName"
               label="履职区域"
-              width="150"
+              width="200"
               show-overflow-tooltip
               v-if="columns[4].visible"
             >
@@ -439,7 +439,7 @@ export default {
       return "";
     },
     spanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex < 3) {
+      if (columnIndex < 2) {
         if (row.rowSpan > 0) {
           return [row.rowSpan, 1];
         } else {