Browse Source

修改app组件header在主页顶部高度,修改主页两侧标题,修改未完成两个页面背景图、修改火灾页面死亡字体颜色、

夜仔 3 years ago
parent
commit
9b643f32df

+ 1 - 1
src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app">
     <header>
-      <heads class="headS"></heads>
+      <heads class="headS" :style="{height: $route.fullPath === '/' ? '.625rem' : ''}"></heads>
     </header>
     <div class="viewContent">
       <router-view></router-view>

BIN
src/assets/img/home/title2.png


BIN
src/assets/img/test/bg4.png


BIN
src/assets/img/test/bg5.png


BIN
src/assets/img/test/bg6.png


+ 1 - 1
src/assets/scss/element-ui.scss

@@ -18,7 +18,7 @@
             border-color: rgba(0, 250, 251, 0.20);
         }
         .death {
-            color: #962b2b !important;
+            color: red !important;
         }
         tr {
             margin-bottom: 1px;

+ 1 - 1
src/components/fire-pie/index.vue

@@ -8,7 +8,7 @@ export default {
   props: {
     dataMap: { type: Array, default: () => [] },
     isVs: { type: Boolean, default: () => false },
-    radius: { type: Number, default: () => 140 },
+    radius: { type: Number, default: () => 120 },
     color: {
       type: Array,
       default: () => [

+ 3 - 2
src/components/radar/index.vue

@@ -32,7 +32,7 @@ export default {
         };
       });
       echarts.init(this.$refs.echartD).setOption({
-        color: ["#00FFFC"],
+        color: ["yellow"],
         legend: {
           show: false,
         },
@@ -67,6 +67,7 @@ export default {
             }
           },
           name: {
+              fontSize: 14,
             color: "#FFFFFF",
           },
           indicator: indicator,
@@ -79,7 +80,7 @@ export default {
             },
             // 阴影
             areaStyle: {
-              color: "#00FFFC",
+              color: "#ffff0038",
             },
             type: "radar",
             data: [

+ 3 - 2
src/views/Home.vue

@@ -57,9 +57,9 @@
       </el-col>
     </el-col>
     <el-col :span="8" class="boxConentSize boxRight">
-      <img src="~@a/img/home/title1.png" class="titleLift" />
+      <img src="~@a/img/home/title2.png" class="titleLift" />
       <el-col class="flexJ rightTopBox">
-        <h4>历史火灾趋势</h4>
+        <h4>值班表</h4>
         <el-row class="propSituation">
           <el-col v-for="item in unitBeOnDutyList" :key="item.name">
             <el-col><img src="~@a/img/test/bg2.png" alt="" /></el-col>
@@ -442,6 +442,7 @@ $centerCirWidth: 3.375rem;
         width: 32%;
         height: 48%;
         max-height: 48%;
+        border-radius: .0625rem;
         margin: 0.0375rem calc(4% / 6);
         padding: 0.125rem;
         flex: none;

+ 1 - 1
src/views/fire-data-analysis.vue

@@ -40,7 +40,7 @@
                   </el-select>
                 </el-form-item>
               </el-form>
-              <fire-pie ref="firePie1" :dataMap="fireCauseRatioList" :isVs="isVsFirePie" :radius="isVsFirePie ? 80 : 140"></fire-pie>
+              <fire-pie ref="firePie1" :dataMap="fireCauseRatioList" :isVs="isVsFirePie" :radius="isVsFirePie ? 80 : 120"></fire-pie>
             </div>
             <div class="line" v-show="isVsFirePie"></div>
             <div class="flexBoxE" v-show="isVsFirePie">

+ 7 - 3
src/views/fire-signs.vue

@@ -131,7 +131,12 @@ export default {
   mixins: [linstener,map],
   data() {
     return {
-      tableData: [],
+      tableData: [
+        {address:'2020-01-01',burnedArea:'某某单位',propertyLoss:'闵行区消防支队',deathToll:'2020-01-01',nonFatal:'拆除',disasterHome:'拆除'},
+        {address:'2020-01-01',burnedArea:'某某单位',propertyLoss:'闵行区消防支队',deathToll:'2020-01-01',nonFatal:'拆除',disasterHome:'拆除'},
+        {address:'2020-01-01',burnedArea:'某某单位',propertyLoss:'闵行区消防支队',deathToll:'2020-01-01',nonFatal:'拆除',disasterHome:'拆除'},
+        {address:'2020-01-01',burnedArea:'某某单位',propertyLoss:'闵行区消防支队',deathToll:'2020-01-01',nonFatal:'拆除',disasterHome:'拆除'},
+      ],
       headerData: [
         { prop: "address", name: "挂牌时间" },
         { prop: "burnedArea", name: "单位名称" },
@@ -291,8 +296,7 @@ export default {
           })
       );
       if (res){ 
-          this.tableData = res.data.records;
-        // }
+          // this.tableData = res.data.records;
       }
     },
     // 实时警情处理

+ 7 - 9
src/views/head.vue

@@ -12,11 +12,8 @@
         :src="weatherObj.weather_pic || ''"
         alt=""
       />
-      <span v-if="weatherObj.weather"
-        >{{ weatherObj.weather }} {{ weatherObj.temperature }}℃</span
-      >
+      <span v-if="weatherObj.weather" >{{ weatherObj.weather }} {{ weatherObj.temperature }}℃</span>
     </div>
-    {{$route.path}}
     <el-row class="timeSelect" v-if="$route.fullPath !== '/'">
       <img src="~@a/img/home/circle_box.png" alt="" class="timeImage" />
       <el-button size="mini" @click="timeTypeClick('day')">今日</el-button>
@@ -121,13 +118,14 @@ export default {
   position: relative;
   color: #fff;
   .title {
-    text-align: center;
-    margin: 0 auto;
+    position: absolute;
+    left: 0;
+    right: 0;
+    margin: auto;
+    top: .25rem;
     font-size: 0.425rem;
-    line-height: 0.4875rem;
     font-weight: 800;
-    display: flex;
-    align-items: center;
+    width: fit-content;
     text-shadow: #275372 1px 0 0, #28bcfa 0 1px 0, #28bcfa -1px 0 0,
       #28bcfa 0 -1px 0;
   }

+ 1 - 0
src/views/rescue-station.vue

@@ -589,6 +589,7 @@ export default {
         & > .el-col {
           width: 32%;
           height: 48%;
+          border-radius: .0625rem;
           max-height: 48%;
           margin: .0375rem calc(4% / 6);
           flex: none;

+ 1 - 1
src/views/security-plan.vue

@@ -16,7 +16,7 @@ export default {
 .el-row {
   width: 100%;
   height: 100%;
-  // background: url(~@a/img/test/bg5.png) no-repeat;
+  background: url(~@a/img/test/bg4.png) no-repeat;
   background-size: 100% 100%;
 }
 </style>

+ 1 - 1
src/views/self-management.vue

@@ -15,7 +15,7 @@ export default {
 .el-row {
   width: 100%;
   height: 100%;
-  background: url(~@a/img/test/bg6.png) no-repeat;
+  background: url(~@a/img/test/bg5.png) no-repeat;
   background-size: 100% 100%;
 }
 </style>

+ 1 - 0
src/views/water-sources.vue

@@ -437,6 +437,7 @@ export default {
           width: 32%;
           height: 48%;
           max-height: 48%;
+          border-radius: .0625rem;
           margin: .0375rem calc(4% / 6);
           flex: none;
           box-shadow: inset 0 0 0.4375rem 0.0625rem #30cfff;