yy

package.json

@@ -86,6 +86,7 @@
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",
+    "svg-sprite-loader": "5.1.1",
     "vue-template-compiler": "2.6.12"
   },
   "engines": {

src/assets/iconfont/iconfont.json

@@ -6,6 +6,48 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "680694",
+      "name": "确认",
+      "font_class": "queren",
+      "unicode": "e6f8",
+      "unicode_decimal": 59128
+    },
+    {
+      "icon_id": "4065592",
+      "name": "催办",
+      "font_class": "cuiban",
+      "unicode": "e770",
+      "unicode_decimal": 59248
+    },
+    {
+      "icon_id": "5809108",
+      "name": "归档",
+      "font_class": "guidang",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "5809119",
+      "name": "办结",
+      "font_class": "banjie",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "25076147",
+      "name": "上报",
+      "font_class": "shangbao",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "27856542",
+      "name": "已签收",
+      "font_class": "yiqianshou",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
       "icon_id": "36358348",
       "name": "交通精细化摄像头",
       "font_class": "jiaotongjingxihuashexiangtou",
@@ -15,7 +57,7 @@
     {
       "icon_id": "36789955",
       "name": "水质断面",
-      "font_class": "centerdata-t-environment-water-monitor",
+      "font_class": "shuizhiduanmian",
       "unicode": "e661",
       "unicode_decimal": 58977
     },

src/assets/styles/base.scss

@@ -70,8 +70,9 @@ $eventStateColor-bj: #6ae08f;
 $eventStateColor-gd: #0369ef;
 $eventStateColor-qr: #20EF56;
 
-$eventStateColor-xsb: #11b57e;
+$eventStateColor-xsb: #24cfc0;
 $eventStateColor-cb: #e63b4a;
+$eventStateColor-qr: #51b700;
 $eventStateColor-yqs: #f18425;
 $eventStateColor-ld: #a23737;
 $eventStateColor-tb: #0369ef;

src/components/vBottomMenu.vue

@@ -4,15 +4,19 @@
 
     <div class="btm-left" :class="btmTipIndent">
       <div class="btm-left-tip">
-        <div class="btm-left-block btm-left-state-c1"></div>
+        <div class="btm-left-block btm-left-state-c1"><i class="iconfont sj-icon-shangbao"></i></div>
         新上报
       </div>
       <div class="btm-left-tip">
-        <div class="btm-left-block btm-left-state-c2"></div>
+        <div class="btm-left-block btm-left-state-c2"><i class="iconfont sj-icon-cuiban"></i></div>
         催办
       </div>
       <div class="btm-left-tip">
-        <div class="btm-left-block btm-left-state-c3"></div>
+        <div class="btm-left-block btm-left-state-c3-1"><i class="iconfont sj-icon-queren"></i></div>
+        确认
+      </div>
+      <div class="btm-left-tip">
+        <div class="btm-left-block btm-left-state-c3"><i class="iconfont sj-icon-yiqianshou"></i></div>
         已签收
       </div>
       <!-- div class="btm-left-tip">
@@ -20,11 +24,11 @@
         联动
       </div> -->
       <div class="btm-left-tip">
-        <div class="btm-left-block btm-left-state-c5"></div>
+        <div class="btm-left-block btm-left-state-c5"><i class="iconfont sj-icon-banjie"></i></div>
         办结
       </div>
       <div class="btm-left-tip">
-        <div class="btm-left-block btm-left-state-c6"></div>
+        <div class="btm-left-block btm-left-state-c6"><i class="iconfont sj-icon-guidang"></i></div>
         归档
       </div>
       <div class="btm-legend" @click="btmIndent">
@@ -1690,8 +1694,8 @@ export default {
     border-left: none;
     color: $inBlue;
     display: flex;
-    -webkit-transform: translateX(-21rem) !important;
-    transform: translateX(-21rem) !important;
+    -webkit-transform: translateX(-24rem) !important;
+    transform: translateX(-24rem) !important;
     transition: all 0.5s ease-in-out !important;
 
     .btm-legend {
@@ -1719,7 +1723,14 @@ export default {
         margin-right: .3rem;
         border-radius: .2rem;
 
-
+        i{
+          font-size: 10px;
+          color: #fff;
+          line-height: 1rem;
+          display: block;
+          margin: auto auto;
+          text-align: center;
+        }
       }
 
       .btm-left-state-c1 {
@@ -1729,6 +1740,9 @@ export default {
       .btm-left-state-c2 {
         background-color: $eventStateColor-cb;
       }
+      .btm-left-state-c3-1 {
+        background-color: $eventStateColor-qr;
+      }
 
       .btm-left-state-c3 {
         background-color: $eventStateColor-yqs;