修改bug

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js

@@ -1,8 +1,7 @@
 let zData = ["侧翻", "撞障碍物", "自燃", "追尾", "撞护栏", "货物洒落"];
-let lc = [450, 500, 250, 340,450, 500];
-let lc2 = [400, 550, 200, 140,400, 550];
+let lc = [450, 500, 250, 340, 450, 500];
+let lc2 = [400, 550, 200, 140, 400, 550];
 let options = {
-
   tooltip: {
     show: true,
     trigger: "axis",
@@ -14,7 +13,7 @@ let options = {
   },
   grid: {
     right: "4%",
-    top: "12%",
+    top: "20%",
     left: "2%",
     bottom: "0%",
     containLabel: true,
@@ -27,7 +26,7 @@ let options = {
       interval: 0,
       textStyle: {
         color: "rgba(255, 255, 255, 0.80)",
-        fontSize: 16
+        fontSize: 16,
       },
     },
     axisTick: {
@@ -53,7 +52,7 @@ let options = {
         show: true,
         textStyle: {
           color: "rgba(255, 255, 255, 0.90)",
-          fontSize: 16
+          fontSize: 16,
         },
       },
       axisLine: {
@@ -70,6 +69,33 @@ let options = {
       },
     },
   ],
+  legend: {
+    // orient: 'vertical',
+    // icon: "circle",
+    itemHeight: 8,
+    itemWidth: 8,
+    top: "5%",
+    right: "10%",
+    textStyle: {
+      color: "#fff",
+    },
+    data: [
+      {
+        name: "从业人员",
+        icon: "circle",
+        itemStyle: {
+          color: "#02A0F8",
+        },
+      },
+      {
+        name: "去年同期数量",
+        icon: "circle",
+        itemStyle: {
+          color: "#01CFEB",
+        },
+      },
+    ],
+  },
   series: [
     {
       name: "从业人员",
@@ -104,10 +130,11 @@ let options = {
               },
             ],
             globalCoord: false, // 缺省为 false
-          }
           },
         },
-      symbol: "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
+      },
+      symbol:
+        "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
       data: lc,
     },
     {
@@ -115,7 +142,7 @@ let options = {
       type: "pictorialBar",
       stack: "else",
       barGap: "10%",
-      boundaryGap:"100%",
+      boundaryGap: "100%",
       label: {
         normal: {
           show: false,
@@ -145,10 +172,11 @@ let options = {
               },
             ],
             globalCoord: false, // 缺省为 false
-          }
           },
         },
-      symbol: "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
+      },
+      symbol:
+        "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
       data: lc2,
     },
   ],

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js

@@ -1,76 +1,68 @@
-const sxnja = [
-    400,400,400
-  ];
-  const sxnja2 = [
-    700,700,700
-  ];
+const sxnja = [400, 400, 400];
+const sxnja2 = [700, 700, 700];
 
-  const minNumber = 90;
-  const minArray = [];
-  sxnja.map((value) => {
-    minArray.push(parseFloat((value - minNumber).toFixed(2)))
-  })
-  console.log(minArray)
-  let xaxisData = [
-    '客车',
-    '货车',
-    '专项车',
-  ];
+const minNumber = 90;
+const minArray = [];
+sxnja.map((value) => {
+  minArray.push(parseFloat((value - minNumber).toFixed(2)));
+});
+console.log(minArray);
+let xaxisData = ["客车", "货车", "专项车"];
 
- var options = {
+var options = {
   title: {
-      text: '单位/%',
-      top: '4%',
-      left: '3%',
+    // text: "单位/%",
+    top: "4%",
+    left: "3%",
     textStyle: {
-        fontSize: '10px',
+      fontSize: "10px",
       fontWeight: 300,
-        color: '#B5C5D4',
-        opacity: 0.8
-      }
+      color: "#B5C5D4",
+      opacity: 0.8,
+    },
   },
   tooltip: {
     valueFormatter: function (value) {
-        return (value + minNumber).toFixed(2) + ' %';
-      }
+      return (value + minNumber).toFixed(2) + " %";
+    },
   },
   legend: {
     // orient: 'vertical',
     icon: "circle",
-        itemHeight: 6,
-        itemWidth: 6,
+    itemHeight: 8,
+    itemWidth: 8,
     top: "5%",
     right: "0%",
     textStyle: {
-          fontSize:10,
+      // fontSize: 12,
       color: "#fff",
     },
   },
   grid: {
-      left: '1%',
-      right: '0%',
-      top: '16%',
-      bottom: '0%',
-      containLabel: true
+    left: "1%",
+    right: "0%",
+    top: "20%",
+    bottom: "0%",
+    containLabel: true,
   },
   xAxis: {
-      type: 'category',
+    type: "category",
     data: xaxisData,
     axisLine: {
       show: true,
       lineStyle: {
         width: 1,
-          color: '#545454'
-        }
+        color: "#545454",
+      },
     },
     axisTick: {
-        show: false
+      show: false,
     },
     axisLabel: {
-        color: '#B5C5D4',
-        fontSize: '10px',
-        interval: 0
-      }
+      color: "#B5C5D4",
+      fontSize: "10px",
+      interval: 0,
+    },
   },
   yAxis: [
     {
@@ -78,67 +70,67 @@ const sxnja = [
       // min: function (value) {
       //   return value.min*0.9;
       // },
-        type: 'value',
+      type: "value",
       min: 0,
-        max:900,
+      max: 900,
       splitNumber: 9,
       // max: yAxisMax,
       axisLine: {
         show: false,
         lineStyle: {
           width: 1,
-            color: '#545454'
-          }
+          color: "#545454",
+        },
       },
       splitLine: {
         show: true,
         lineStyle: {
-            color: '#B2C2D3',
+          color: "#B2C2D3",
           opacity: 0.3,
-            type: 'dotted'
-          }
+          type: "dotted",
+        },
       },
       axisTick: {
-          show: false
+        show: false,
       },
       axisLabel: {
-          color: '#B5C5D4',
-          fontSize: '12px',
+        color: "#B5C5D4",
+        fontSize: "12px",
         formatter: (value) => {
-            return value + minNumber
-          }
-        }
-      }
+          return value + minNumber;
+        },
+      },
+    },
   ],
   series: [
     {
-        name: '事件数量（起）',
+      name: "事件数量（起）",
       data: minArray,
-        type: 'pictorialBar',
-        symbol: 'roundRect',
+      type: "pictorialBar",
+      symbol: "roundRect",
       symbolRepeat: true,
       symbolSize: [12, 5],
       // symbolOffset: symbolOffset,
       // barWidth:'40%',
       itemStyle: {
-          color: '#20E7FF'
-        }
+        color: "#20E7FF",
+      },
     },
     {
       barGap: "10%",
-        name: '平均处置时长（分钟）',
-        data:  sxnja2 ,
-        type: 'pictorialBar',
-        symbol: 'roundRect',
+      name: "平均处置时长（分钟）",
+      data: sxnja2,
+      type: "pictorialBar",
+      symbol: "roundRect",
       symbolRepeat: true,
       symbolSize: [12, 5],
       // symbolOffset: symbolOffset,
       // barWidth:'40%',
       itemStyle: {
-          color: '#20FFC9'
-        }
-      }
-    ]
-  };
+        color: "#20FFC9",
+      },
+    },
+  ],
+};
 
-  export default options;
+export default options;

ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/index.vue

@@ -1,7 +1,159 @@
 <template>
-    <div>1</div>
+    <div class='TrafficFlow'>
+
+    </div>
 </template>
+    
 <script>
 
+
+export default {
+    name: 'digitalRoadNetwork',
+    components: {
+    },
+    data() {
+        return {
+
+        }
+    },
+    methods: {
+        changeTabs() {
+
+        }
+    }
+
+}
 </script>
     
+<style lang='scss' scoped>
+::v-deep .el-tabs__item {
+    display: inline-flex;
+    justify-content: center;
+    font-size: 16px;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 500;
+    color: #FFFFFF;
+    min-width: 128px;
+    position: relative;
+    left: 10px;
+}
+
+::v-deep .el-tabs__active-bar {
+    min-width: 128px;
+}
+
+::v-deep .el-tabs__nav-wrap::after {
+    background-color: #133242;
+    opacity: 0.1;
+}
+
+.footTabs {
+    display: inline;
+    width: 100%;
+
+}
+
+.TrafficFlow {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    z-index: 6;
+    color: white;
+    padding-top: 15px;
+    background: url("./assets/online_bj.jpg") no-repeat;
+    background-size: 100% 100%;
+
+    .header-shot {
+        width: 98%;
+        margin: auto;
+        margin-top: 15px;
+        height: 160px;
+
+    }
+
+    .content {
+        width: 100%;
+        margin: auto;
+        display: flex;
+        flex: 1;
+        pointer-events: none;
+        margin-top: 0px;
+
+        >div {
+            pointer-events: auto;
+        }
+
+        .content-l {
+            width: calc(32.2%);
+            margin-right: 20px;
+            display: inline-flex;
+            flex-direction: column;
+
+            >div {
+                margin-bottom: 15px;
+            }
+        }
+
+        .content-r {
+            width: calc(33%);
+            display: inline-flex;
+        }
+
+        .content-rm {
+            width: calc(33%);
+            margin-right: 10px;
+        }
+
+        .content-mi {
+            width: calc(50%);
+
+            margin-right: 20px;
+        }
+
+        .content-mi:last-child {
+            margin-right: 10px;
+        }
+
+
+        .content-m {
+            display: inline-flex;
+            width: 66%;
+            margin-right: 20px;
+        }
+
+
+    }
+
+    .foot {
+        width: 98%;
+        margin: auto;
+        display: flex;
+        justify-content: space-between;
+        flex: 1;
+        pointer-events: none;
+        margin-top: 8px;
+
+        >div {
+            pointer-events: auto;
+        }
+
+        .foot-w {
+            width: 100%;
+
+        }
+
+        .foot-l {
+            width: 726px;
+        }
+
+        .foot-m {
+            width: 613px;
+        }
+
+        .foot-r {
+            width: 493px;
+        }
+    }
+}
+</style>
+    

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/maintainQuery/index.vue

@@ -2,73 +2,72 @@
   <div class='TrafficFlow'>
 
   </div>
-  </template>
+</template>
   
-  <script> 
+<script>
 
 
-  export default {
+export default {
   name: 'maintainQuery',
   components: {
   },
-    data(){
+  data() {
     return {
 
     }
   },
-    methods:{
-      changeTabs(){
+  methods: {
+    changeTabs() {
 
     }
   }
 
-  }
-  </script>
-  
-  <style lang='scss' scoped>
+}
+</script>
   
-   ::v-deep .el-tabs__item{
+<style lang='scss' scoped>
+::v-deep .el-tabs__item {
   display: inline-flex;
   justify-content: center;
   font-size: 16px;
   font-family: PingFang SC, PingFang SC;
   font-weight: 500;
   color: #FFFFFF;
-    min-width:128px;
+  min-width: 128px;
   position: relative;
-    left:10px;
-   }
+  left: 10px;
+}
 
-   ::v-deep .el-tabs__active-bar {
-    min-width:128px;
-   }
+::v-deep .el-tabs__active-bar {
+  min-width: 128px;
+}
 
-   ::v-deep .el-tabs__nav-wrap::after {
+::v-deep .el-tabs__nav-wrap::after {
   background-color: #133242;
   opacity: 0.1;
-   }
+}
 
-   .footTabs {
+.footTabs {
   display: inline;
-     width:100%;
+  width: 100%;
 
-   }
+}
 
-  .TrafficFlow {
+.TrafficFlow {
   width: 100%;
   height: 100%;
   position: relative;
   z-index: 6;
   color: white;
   padding-top: 15px;
-    background-image: url('./assets/online_bj.jpg');
+  background: url("./assets/online_bj.jpg") no-repeat;
   background-size: 100% 100%;
 
-    .header-shot{
+  .header-shot {
     width: 98%;
     margin: auto;
     margin-top: 15px;
-      height:160px;
+    height: 160px;
 
   }
 
@@ -86,12 +85,12 @@
 
     .content-l {
       width: calc(32.2%);
-        margin-right:20px;
+      margin-right: 20px;
       display: inline-flex;
       flex-direction: column;
 
       >div {
-            margin-bottom:15px;
+        margin-bottom: 15px;
       }
     }
 
@@ -102,30 +101,30 @@
 
     .content-rm {
       width: calc(33%);
-        margin-right:10px;
+      margin-right: 10px;
     }
 
     .content-mi {
       width: calc(50%);
 
-        margin-right:20px;
+      margin-right: 20px;
     }
 
     .content-mi:last-child {
-        margin-right:10px;
+      margin-right: 10px;
     }
 
 
     .content-m {
       display: inline-flex;
       width: 66%;
-        margin-right:20px;
+      margin-right: 20px;
     }
 
 
   }
 
-    .foot{
+  .foot {
     width: 98%;
     margin: auto;
     display: flex;
@@ -133,25 +132,28 @@
     flex: 1;
     pointer-events: none;
     margin-top: 8px;
+
     >div {
       pointer-events: auto;
     }
 
     .foot-w {
-        width:100%;
+      width: 100%;
 
     }
 
     .foot-l {
       width: 726px;
     }
+
     .foot-m {
       width: 613px;
     }
+
     .foot-r {
       width: 493px;
     }
   }
-  }
-  </style>
+}
+</style>
   

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/assets/charts.js

@@ -42,24 +42,24 @@ var res = [
     title: [
       {
         text:'999',
-        top: '25%',
+        top: '27%',
         textAlign: 'center',
-        left: '50%',
+        left: '49%',
         textStyle: {
           color: '#ffffff',
           fontSize: 30,
-          fontFamily: 'SourceHanSansCN',
+          fontFamily: 'PangMenZhengDao',
         },
       },
       {
         text: '总数',
         top: '38%',
         textAlign: 'center',
-        left: '50%',
+        left: '49%',
         textStyle: {
           color: 'rgba(242, 252, 253, 0.84)',
-          fontSize: 16,
-          fontFamily: 'SourceHanSansCN',
+          fontSize: 14,
+          fontWeight: 400,
         },
       },
     ],

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/assets/charts.js

@@ -44,24 +44,24 @@ var res = [
     title: [
       {
         text:'999',
-        top: '25%',
+        top: '27%',
         textAlign: 'center',
-        left: '50%',
+        left: '49%',
         textStyle: {
           color: '#ffffff',
           fontSize: 30,
-          fontFamily: 'SourceHanSansCN',
+          fontFamily: 'PangMenZhengDao',
         },
       },
       {
         text: '总数',
         top: '38%',
         textAlign: 'center',
-        left: '50%',
+        left: '49%',
         textStyle: {
           color: 'rgba(242, 252, 253, 0.84)',
-          fontSize: 16,
-          fontFamily: 'SourceHanSansCN',
+          fontSize: 14,
+          fontWeight: 400,
         },
       },
     ],

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js

@@ -64,24 +64,24 @@ function getCirlPoint(x0, y0, r, angle) {
     title: [
       {
         text:'999',
-        top: '25%',
+        top: '27%',
         textAlign: 'center',
-        left: '50%',
+        left: '49%',
         textStyle: {
           color: '#ffffff',
           fontSize: 30,
-          fontFamily: 'SourceHanSansCN',
+          fontFamily: 'PangMenZhengDao',
         },
       },
       {
         text: '总数',
         top: '38%',
         textAlign: 'center',
-        left: '50%',
+        left: '49%',
         textStyle: {
           color: 'rgba(242, 252, 253, 0.84)',
-          fontSize: 16,
-          fontFamily: 'SourceHanSansCN',
+          fontSize: 14,
+          fontWeight: 400,
         },
       },
     ],

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/assets/charts3.js

@@ -94,8 +94,8 @@ let xData = [
     legend: {
       // orient: 'vertical',
       icon: "circle",
-      itemHeight: 6,
-      itemWidth: 6,
+      itemHeight: 8,
+      itemWidth: 8,
       top: "5%",
       right: "10%",
       textStyle: {
@@ -106,7 +106,7 @@ let xData = [
         {
           name:"审核通过",
           itemStyle:{
-            color:'#00A3FF',
+            color:'#08BAF4',
           },
         },
         {
@@ -147,7 +147,7 @@ let xData = [
                   },
                   {
                     offset: 1,
-                    color: "#003B4E", // 100% 处的颜色
+                    color: "#08BAF4", // 100% 处的颜色
                   },
                 ],
                 false
@@ -157,7 +157,7 @@ let xData = [
         },
         itemStyle: {
           // lenged文本
-          opacity: 0.6,
+          opacity: 0.9,
           color: function (params) {
             var a = params.name;
             console.log("==========a=============",a);
@@ -207,7 +207,7 @@ let xData = [
                   },
                   {
                     offset: 1,
-                    color: "#00E4BB53", // 100% 处的颜色
+                    color: "#51BFA4", // 100% 处的颜色
                   },
                 ],
                 false
@@ -217,7 +217,7 @@ let xData = [
         },
         itemStyle: {
           // lenged文本
-          opacity: 0.6,
+          opacity: 0.9,
           color: function (params) {
             var a = params.name;
             console.log("==========a=============",a);
@@ -266,7 +266,7 @@ let xData = [
             },
             {
               offset: 1,
-              color: "#003B4E", // 100% 处的颜色
+              color: "#E2BA74", // 100% 处的颜色
             },
           ],
           false
@@ -276,7 +276,7 @@ let xData = [
   },
   itemStyle: {
     // lenged文本
-    opacity: 0.6,
+    opacity: 0.9,
     color: function (params) {
       var a = params.name;
       console.log("==========a=============",a);