Explorar el Código

Merge branch 'zz-test' into master

LAPTOP-U5GOA5HA\zz hace 1 año
padre
commit
77946462a9

+ 2 - 3
app/src/components/rate3D.vue

@@ -1,5 +1,5 @@
 <template>
-    <div ref="chart" class="item" style="width: 94px; height:138px" />
+    <div ref="chart" class="item" style="width: 96px; height:138px" />
   </template>
   
   <script>
@@ -25,7 +25,6 @@
     methods: {
       initChart() {
       const  option = {
-            // backgroundColor: '#111',
     title: [{
         text: this.title,
         x: 'center',
@@ -47,7 +46,7 @@
         },
     }],
     polar: {
-        radius: ['38%', '53%'],
+        radius: ['74%', '53%'],
         center: ['50%', '50%'],
     },
     angleAxis: {

+ 22 - 11
app/src/views/Fire/components/ManagementContent.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="dle">
-        <div v-for="(item,index) in list" :key="index" >
+        <div v-for="(item,index) in list" :key="index" class="dle-ve">
             <rate3D :data="item.val" :text="item.text" :title="item.title" ></rate3D>
             
         </div>
@@ -22,7 +22,7 @@ export default {
                 },
                 {
                     title:'巡查记录/日',
-                    text:'55%',
+                    text:'75%',
                     val:75,
                 },
                 {
@@ -32,8 +32,8 @@ export default {
                 },
                 {
                     title:'消防预案',
-                    text:'55%',
-                    val:55,
+                    text:'87%',
+                    val:87,
                 },
                 {
                     title:'演练记录/年',
@@ -42,17 +42,17 @@ export default {
                 },
                 {
                     title:'评估报告/年',
-                    text:'55%',
+                    text:'100%',
                     val:100,
                 },
                 {
                     title:'维保记录/月',
-                    text:'55%',
+                    text:'15%',
                     val:15,
                 },
                 {
                     title:'安全制度',
-                    text:'55%',
+                    text:'35%',
                     val:35,
                 },
                 
@@ -65,9 +65,20 @@ export default {
 <style lang="less" scoped>
 .dle{
     display: flex;
-    flex-flow:row wrap;
-    justify-content: space-around;
-    margin: 20px 0px;
- 
+    flex-wrap: wrap;
+//   justify-content: space-between;
+    // margin: 20px 0px 20px 20px;
+    margin: 0px 40px;
+    row-gap: 10px;
+    column-gap: 35px;
+    
+
+ .dle-ve{
+    // margin-right: 30px;
+ }
+}
+.dle::after{
+    content: '';
+  flex: auto;  
 }
 </style>