瀏覽代碼

公务用车 pad界面修改

zhanghao 1 月之前
父節點
當前提交
f6c496e5ba

+ 4 - 0
src/components/Echarts/BarChart.vue

@@ -12,6 +12,7 @@ import resize from './mixins/resize'
 export default {
 export default {
   mixins: [resize],
   mixins: [resize],
   props: {
   props: {
+    fun: Function,
     className: {
     className: {
       type: String,
       type: String,
       default: 'chart'
       default: 'chart'
@@ -145,6 +146,9 @@ export default {
           axisPointer: {
           axisPointer: {
             type: 'shadow'
             type: 'shadow'
           },
           },
+          position: typeof this.fun !== 'undefined' ? function (point) {
+            return [point[0] + 10, point[1]];
+          } : undefined
         },
         },
         grid: this.grid,
         grid: this.grid,
         xAxis: this.xAxis,
         xAxis: this.xAxis,

+ 4 - 0
src/views/pad/official/carWarning.vue

@@ -62,6 +62,7 @@
           <div style="position: absolute;left: 20px;top: 8px;color: #FFFFFF;font-size: 12px;">前三名单位情况</div>
           <div style="position: absolute;left: 20px;top: 8px;color: #FFFFFF;font-size: 12px;">前三名单位情况</div>
         </div>
         </div>
         <bar-chart
         <bar-chart
+          :fun="fun"
           :chart-data="barDataTop"
           :chart-data="barDataTop"
           :x-axis="barAxisTop"
           :x-axis="barAxisTop"
           :y-axis="barYAxis"
           :y-axis="barYAxis"
@@ -139,6 +140,9 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      fun:function (point) {
+        return [point[0] + 10, point[1]];
+      },
       // 公务用车资源情况
       // 公务用车资源情况
       dataList: [
       dataList: [
         {
         {

+ 3 - 1
src/views/pad/official/terminalData.vue

@@ -532,7 +532,9 @@ export default {
   color: #00FFFF;
   color: #00FFFF;
   font-size: 24px;
   font-size: 24px;
   margin-left: 3px;
   margin-left: 3px;
-  align-content: end;
+  display: flex;
+  flex-direction: column;
+  justify-content: end;
 }
 }
 .c1_titleText{
 .c1_titleText{
   width: 100%;
   width: 100%;

+ 5 - 3
src/views/pad/official/terminalDataDialog.vue

@@ -111,7 +111,7 @@
             <div style="display: flex;align-items: center;margin-bottom: 20px">
             <div style="display: flex;align-items: center;margin-bottom: 20px">
               <div style="position: relative;cursor: pointer" @click="chooseX">
               <div style="position: relative;cursor: pointer" @click="chooseX">
                 <img src="../../../assets/zhang/publicCar/arcBlue.png" width="97" style="margin: 10px 5px 0 33px">
                 <img src="../../../assets/zhang/publicCar/arcBlue.png" width="97" style="margin: 10px 5px 0 33px">
-                <div style="position: absolute;width: 48px;color: #00FFFF;top: 5px;left: 55px;font-size: 12px;text-align: center">年度增加车辆数</div>
+                <div style="position: absolute;width: 55px;color: #00FFFF;top: 5px;left: 55px;font-size: 12px;text-align: center">年度增加车辆数</div>
               </div>
               </div>
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 20px">
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 20px">
                 <span style="font-family: 'electronicFont'">{{ resourceData.yearAddNum }}</span>
                 <span style="font-family: 'electronicFont'">{{ resourceData.yearAddNum }}</span>
@@ -121,7 +121,7 @@
             <div style="display: flex;align-items: center">
             <div style="display: flex;align-items: center">
               <div style="position: relative;cursor: pointer" @click="chooseY">
               <div style="position: relative;cursor: pointer" @click="chooseY">
                 <img src="../../../assets/zhang/publicCar/arcOrange.png" width="97" style="margin: 10px 5px 0 33px">
                 <img src="../../../assets/zhang/publicCar/arcOrange.png" width="97" style="margin: 10px 5px 0 33px">
-                <div style="position: absolute;width: 48px;color: #FEC72F;top: 5px;left: 55px;font-size: 12px;text-align: center">年度减少车辆数</div>
+                <div style="position: absolute;width: 55px;color: #FEC72F;top: 5px;left: 55px;font-size: 12px;text-align: center">年度减少车辆数</div>
               </div>
               </div>
               <div style="width: 108px;height: 24px;color: #FEC72F;font-size: 34px;margin-bottom: 20px">
               <div style="width: 108px;height: 24px;color: #FEC72F;font-size: 34px;margin-bottom: 20px">
                 <span style="font-family: 'electronicFont'">{{ resourceData.yearReduceNum }}</span>
                 <span style="font-family: 'electronicFont'">{{ resourceData.yearReduceNum }}</span>
@@ -637,7 +637,9 @@ export default {
   color: #00FFFF;
   color: #00FFFF;
   font-size: 24px;
   font-size: 24px;
   margin-left: 3px;
   margin-left: 3px;
-  align-content: end;
+  display: flex;
+  flex-direction: column;
+  justify-content: end;
 }
 }
 .c1_titleText{
 .c1_titleText{
   width: 100%;
   width: 100%;

+ 4 - 0
src/views/screen/official/carWarning.vue

@@ -62,6 +62,7 @@
           <div style="position: absolute;left: 20px;top: 8px;color: #FFFFFF;font-size: 12px;">前三名单位情况</div>
           <div style="position: absolute;left: 20px;top: 8px;color: #FFFFFF;font-size: 12px;">前三名单位情况</div>
         </div>
         </div>
         <bar-chart
         <bar-chart
+          :fun="fun"
           :chart-data="barDataTop"
           :chart-data="barDataTop"
           :x-axis="barAxisTop"
           :x-axis="barAxisTop"
           :y-axis="barYAxis"
           :y-axis="barYAxis"
@@ -139,6 +140,9 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      fun:function (point) {
+        return [point[0] + 10, point[1]];
+      },
       // 公务用车资源情况
       // 公务用车资源情况
       dataList: [
       dataList: [
         {
         {