Guoxiaohuan 5 anni fa
parent
commit
0889ed5434

+ 0 - 7
index.html

@@ -6,13 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>sagacloud-cwc-pages</title>
 </head>
-<style>
-  html,
-  body {
-    margin: 0;
-    padding: 0;
-  }
-</style>
 
 <body>
   <div id="app"></div>

+ 29 - 0
src/assets/css/global.css

@@ -0,0 +1,29 @@
+#app, body, html {
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-style: normal
+}
+
+a {
+    color: #000;
+    text-decoration: none
+}
+
+li, ol, ul {
+    list-style: none
+}
+
+.Micbold {
+    font-family: MicrosoftYaHeiSemibold
+}
+.MicrYaHei {
+    font-family: MicrosoftYaHei
+}
+.ArialMT {
+    font-family: ArialMT
+}
+.PingFangSC {
+    font-family: PingFangSC-Regular
+}

+ 174 - 61
src/components/uploadImg.vue

@@ -1,27 +1,37 @@
 <template>
-  <div>
-    <div class="detail-enclosure-img">
-      <div>
-        <div class="img-box" v-for="(image,ind) in distinctFile(souseArr)" :key="ind">
-          <zoom-image
-            :url="`/image-service/common/image_get?systemId=saas&secret=46f869eea8b31d14&key=${image}`"
-          ></zoom-image>
-          <i class="el-icon-delete" @click="handleRemove(image,ind)"></i>
-        </div>
-      </div>
-      <div v-if="loading" class="img-bg">
-        <i class="el-icon-loading"></i>
+  <div class="detail-enclosure-img">
+    <!-- 图片-->
+    <div class="img-box" v-for="(image,ind) in distinctFile(souseArr)" :key="ind">
+      <zoom-image
+        :url="`/image-service/common/image_get?systemId=saas&secret=46f869eea8b31d14&key=${image}`"
+      ></zoom-image>
+      <i class="deleteImg" @click="handleRemove(image,ind)"></i>
+    </div>
+    <!-- 上传中 -->
+    <div class="Uploading" v-if="Uploading">
+      <span>上传中</span>
+      <div class="progress-box">
+        <!-- <div id="progressId" class="progress"></div> -->
+        <el-progress :text-inside="true" :stroke-width="4" :percentage="percentage"></el-progress>
       </div>
-      <el-upload
-        :on-change="getImage"
-        action="string"
-        list-type="picture-card"
-        accept="image/*"
-        capture="camera"
-      >
-        <img src="../assets/addimg.png" alt />
-      </el-upload>
+      <i class="deleteImg2" @click="handleRemove(image,ind)"></i>
     </div>
+    <!-- 上传图片失败 -->
+    <div class="failImg" v-if="failImg">
+      <img src="../assets/bj.png" alt />
+      <span>上传图片失败</span>
+    </div>
+    <!-- 点击上传 -->
+    <el-upload
+      :on-change="getImage"
+      action="string"
+      list-type="picture-card"
+      accept="image/*"
+      capture="camera"
+    >
+      <div class="add"></div>
+      <span>添加图片</span>
+    </el-upload>
   </div>
 </template>
 <script>
@@ -31,8 +41,10 @@ export default {
   data() {
     return {
       showTrue: true,
-      loading: false,
-      tempArr: []
+      tempArr: [],
+      percentage: 30,
+      Uploading: false, //上传中
+      failImg: false //上传失败
     };
   },
   components: { zoomImage },
@@ -43,12 +55,12 @@ export default {
       return Array.from(new Set(a));
     },
     getImage(event) {
-      this.loading = true;
+      this.Uploading = true;
       this.fileName = new Date().getTime() + "_" + event.name;
       let url =
         "/image-service/common/image_upload?systemId=saas&secret=46f869eea8b31d14&key=" +
         this.fileName;
-      let _this = this;
+      let that = this;
       let reader = new FileReader();
       reader.readAsArrayBuffer(event.raw);
       reader.onload = function(e) {
@@ -58,12 +70,11 @@ export default {
         xhr.onreadystatechange = function() {
           if (xhr.readyState == 4) {
             if (xhr.status == 200) {
-              let src = _this.getPreviewSrc(event.raw);
-              _this.tempArr.push(_this.fileName);
-              _this.souseArr.push(_this.fileName);
-              _this.$emit("setPic", this.souseArr);
-              _this.loading = false;
-              _this.showTrue = true;
+              let src = that.getPreviewSrc(event.raw);
+              that.tempArr.push(that.fileName);
+              that.souseArr.push(that.fileName);
+              that.$emit("setPic", that.souseArr);
+              that.Uploading = false;
             }
           }
         };
@@ -118,46 +129,112 @@ export default {
 </script>
 <style lang="scss" scoped>
 .detail-enclosure-img {
-  width: 112px;
-  height: 112px;
   display: flex;
   flex-wrap: wrap;
   .img-box {
-    width: 112px;
-    height: 112px;
     display: inline-block;
-    margin-right: 15px;
-    margin-bottom: 15px;
-    border-radius: 12px;
+    margin-right: 8px;
+    margin-bottom: 8px;
     position: relative;
-    .bigImg {
-      width: 112px;
-      height: 112px;
-    }
-    i {
-      border-radius: 3px;
+    .deleteImg {
+      position: absolute;
+      top: 9px;
+      right: 9px;
+      width: 16px;
+      height: 16px;
       cursor: pointer;
+      background: url("../assets/delete.png");
+      background-size: 100% 100%;
+      display: none;
     }
-    .el-icon-delete {
-      font-size: 20px;
+  }
+  .img-box:hover .deleteImg {
+    display: block;
+  }
+  .Uploading {
+    width: 112px;
+    height: 112px;
+    margin-right: 8px;
+    background: rgba(248, 249, 250, 1);
+    border-radius: 4px;
+    border: 1px dashed rgba(195, 199, 203, 1);
+    position: relative;
+    .deleteImg2 {
       position: absolute;
-      top: 0;
-      right: 0;
-      background: #ffffff;
+      top: 9px;
+      right: 9px;
+      width: 16px;
+      height: 16px;
+      cursor: pointer;
+      background: url("../assets/delete1.png");
+      background-size: 100% 100%;
+      display: none;
+    }
+    span {
+      text-align: center;
+      display: block;
+      margin-top: 35px;
+      height: 22px;
+      font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: rgba(141, 147, 153, 1);
+      line-height: 22px;
+    }
+    .progress-box {
+      width: 94px;
+      height: 4px;
+      background: rgba(233, 233, 233, 1);
+      border-radius: 2px;
+      margin: 0 auto;
+      margin-top: 8px;
+      position: relative;
+      .progress {
+        width: 0px;
+        height: 4px;
+        background: rgba(0, 145, 255, 1);
+        border-radius: 2px;
+        position: absolute;
+        top: 0;
+        left: 0;
+        transition: all 2s;
+        -moz-transition: all 2s;
+        -webkit-transition: all 2s;
+        -o-transition: all 2s;
+      }
+      .progressHover {
+        width: 94px;
+      }
     }
   }
-  .img-bg {
+  .Uploading:hover .deleteImg2 {
+    display: block;
+  }
+
+  .failImg {
     width: 112px;
     height: 112px;
-    line-height: 112px;
-    text-align: center;
-    display: inline-block;
-    i {
-      font-size: 40px;
+    background: rgba(248, 249, 250, 1);
+    border-radius: 4px;
+    border: 1px solid rgba(209, 212, 215, 1);
+    margin-right: 8px;
+    display: flex;
+    flex-direction: column;
+    img {
+      width: 40px;
+      height: 40px;
+      margin: 0 auto;
+      margin-top: 25px;
+    }
+    span {
+      height: 22px;
+      font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: rgba(141, 147, 153, 1);
+      line-height: 22px;
+      text-align: center;
     }
-  }
-  div {
-    display: inline-block;
   }
 }
 </style>
@@ -175,9 +252,45 @@ export default {
       top: 112px;
       left: 112px;
     }
-    img {
-      width: 112px;
-      height: 112px;
+    .add {
+      width: 18px;
+      height: 18px;
+      color: #8d9399;
+      transition: color 0.25s;
+      position: relative;
+      margin: 0 auto;
+      margin-top: 32px;
+    }
+    .add::before {
+      content: "";
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      width: 18px;
+      margin-left: -9px;
+      margin-top: -1px;
+      border-top: 2px solid;
+    }
+    .add::after {
+      content: "";
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      height: 18px;
+      margin-left: -1px;
+      margin-top: -9px;
+      border-left: 2px solid;
+    }
+    span {
+      position: absolute;
+      right: 28px;
+      bottom: 30px;
+      height: 22px;
+      font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: rgba(31, 36, 41, 1);
+      line-height: 22px;
     }
   }
   .is-uploading {

+ 53 - 48
src/components/zoomImage.vue

@@ -1,60 +1,65 @@
 <template>
-    <div class='zoom-image'>
-        <img :src='url' @click='imagePreview(url)' />
-        <div id='tbody'></div>
-    </div>
+  <div class="zoom-image">
+    <img :src="url" @click="imagePreview(url)" />
+    <div id="tbody"></div>
+  </div>
 </template>
 <script>
 export default {
-    data() {
-        return {}
+  data() {
+    return {};
+  },
+  props: ["url"],
+  methods: {
+    imagePreview(src) {
+        console.log(src)
+      let body = document.querySelector("#tbody");
+      let mask = document.createElement("div");
+      let img = document.createElement("img");
+      img.src = src + "&width=1000";
+      mask.classList.add("mask");
+      this.setStyle(mask, img);
+      this.setEventListener(body, mask);
+      img.onload = function() {
+        mask.appendChild(img);
+        body.appendChild(mask);
+      };
     },
-    props: ['url'],
-    methods: {
-        imagePreview(src) {
-            let body = document.querySelector('#tbody')
-            let mask = document.createElement('div')
-            let img = document.createElement('img')
-            img.src = src+'&width=1000'
-            mask.classList.add('mask')
-            this.setStyle(mask, img)
-            this.setEventListener(body, mask)
-            img.onload = function() {
-                mask.appendChild(img)
-                body.appendChild(mask)
-            }
-        },
-        setStyle(mask, img) {
-            mask.style.position = 'fixed'
-            mask.style.top = 0
-            mask.style.left = 0
-            mask.style.right = 0
-            mask.style.bottom = 0
-            mask.style.background = 'rgba(0,0,0,0.8)'
-            mask.style.zIndex = '99'
-            img.style.position = 'absolute'
-            img.style.top = '50%'
-            img.style.left = '50%'
-            img.style.width = '100%'
-            img.style.transform = 'translate(-50%, -50%)'
-        },
-        setEventListener(body, mask) {
-            mask.addEventListener('click', function() {
-                body.removeChild(mask)
-            })
-        }
+    setStyle(mask, img) {
+      mask.style.position = "fixed";
+      mask.style.top = 0;
+      mask.style.left = 0;
+      mask.style.right = 0;
+      mask.style.bottom = 0;
+      mask.style.background = "rgba(0,0,0,0.8)";
+      mask.style.zIndex = "99";
+      img.style.position = "absolute";
+      img.style.top = "50%";
+      img.style.left = "50%";
+      img.style.width = "100%";
+      img.style.transform = "translate(-50%, -50%)";
+    },
+    setEventListener(body, mask) {
+      mask.addEventListener("click", function() {
+        body.removeChild(mask);
+      });
     }
-}
+  }
+};
 </script>
 <style lang="scss" scoped>
 .zoom-image {
-    width: 80px;
-    height: 80px;
-    display: inline-block;
+  width: 102px;
+  height: 102px;
+  padding: 5px;
+  border-radius: 4px;
+  border: 1px solid rgba(195, 199, 203, 1);
+  display: inline-block;
 
-    img {
-        width: 100%;
-        height: 100%;
-    }
+  img {
+    width: 100%;
+    height: 100%;
+    border-radius: 1px;
+  }
 }
 </style>

+ 2 - 0
src/main.js

@@ -5,6 +5,8 @@ import store from '@/store'
 
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
+import './assets/css/global.css'
+
 Vue.use(ElementUI)
 
 

+ 23 - 18
src/views/appeal/appealDetail.vue

@@ -2,22 +2,22 @@
   <div>
     <Head :headText="headText"></Head>
     <div class="detailContainer">
-      <div class="title">未执行申诉单</div>
-      <div class="nav">
+      <div class="title Micbold">未执行申诉单</div>
+      <div class="nav MicrYaHei">
         <span>项目名称:大连万达广场</span>
         <span>申请人:张三</span>
         <span>申请时间:2020.01.13</span>
       </div>
-      <div class="cont1">申诉未执行指令:2020.01.13 14:30 推送策略未执行</div>
+      <div class="cont1 MicrYaHei">申诉未执行指令:2020.01.13 14:30 推送策略未执行</div>
       <div class="cont2">
         <audit-table></audit-table>
       </div>
       <div class="cont3">
-        <span>策略评价</span>
-        <span>执行策略的评价,判断项目执行策略的好坏,执行策略的评价,判断项目执行策略的好最多50个字</span>
+        <span class="Micbold">策略评价</span>
+        <span class="MicrYaHei">执行策略的评价,判断项目执行策略的好坏,执行策略的评价,判断项目执行策略的好最多50个字</span>
       </div>
       <div class="cont4">
-        <span>申请原因</span>
+        <span class="Micbold">申请原因</span>
         <span>
           <el-select size="mini" v-model="value" placeholder="请选择">
             <el-option
@@ -33,7 +33,7 @@
         </span>
       </div>
       <div class="foot">
-        <upload-img></upload-img>
+        <upload-img :souseArr="souseArr"></upload-img>
       </div>
     </div>
   </div>
@@ -61,7 +61,16 @@ export default {
         }
       ],
       value: "",
-      souseArr: []
+      souseArr: [
+        "1576036336333_image.jpg",
+        "1576036135588_image.jpg",
+        "1576036336333_image.jpg",
+        "1576036135588_image.jpg",
+        "1576036336333_image.jpg",
+        "1576036135588_image.jpg",
+        "1576036336333_image.jpg",
+        "1576036135588_image.jpg"
+      ]
     };
   },
   components: {
@@ -82,7 +91,6 @@ export default {
   .title {
     height: 32px;
     font-size: 24px;
-    font-family: MicrosoftYaHeiSemibold;
     color: rgba(31, 36, 41, 1);
     line-height: 32px;
     text-align: center;
@@ -95,7 +103,6 @@ export default {
     span {
       height: 22px;
       font-size: 14px;
-      font-family: MicrosoftYaHei;
       color: rgba(31, 36, 41, 1);
       line-height: 19px;
     }
@@ -103,7 +110,6 @@ export default {
   .cont1 {
     height: 22px;
     font-size: 14px;
-    font-family: MicrosoftYaHei;
     color: rgba(31, 36, 41, 1);
     line-height: 19px;
     margin-bottom: 16px;
@@ -120,7 +126,6 @@ export default {
     span:nth-of-type(1) {
       height: 24px;
       font-size: 16px;
-      font-family: MicrosoftYaHeiSemibold;
       color: rgba(31, 36, 41, 1);
       line-height: 21px;
       margin-bottom: 8px;
@@ -128,7 +133,6 @@ export default {
     span:nth-of-type(2) {
       height: 22px;
       font-size: 14px;
-      font-family: MicrosoftYaHei;
       color: rgba(100, 108, 115, 1);
       line-height: 19px;
     }
@@ -141,7 +145,6 @@ export default {
     span:nth-of-type(1) {
       height: 24px;
       font-size: 16px;
-      font-family: MicrosoftYaHeiSemibold;
       color: rgba(31, 36, 41, 1);
       line-height: 21px;
     }
@@ -150,7 +153,8 @@ export default {
     }
     span:nth-of-type(3) {
       textarea {
-        width: 762px;
+        width: 100%;
+        // max-width: 762px;
         height: 64px;
         border-radius: 4px;
         border: 1px solid rgba(195, 199, 203, 1);
@@ -159,9 +163,10 @@ export default {
     }
   }
   .foot {
-    width: 112px;
-    height: 112px;
-    background: rgba(248, 249, 250, 1);
+    // width: 112px;
+    // height: 112px;
+    // background: rgba(248, 249, 250, 1);
+    // border: 1px solid red;
   }
 }
 </style>

+ 6 - 13
src/views/appeal/index.vue

@@ -4,15 +4,15 @@
     <div class="appealBox">
       <div class="left">
         <div class="title">
-          <span>可申诉的未执行策略</span>
+          <span class="Micbold">可申诉的未执行策略</span>
           <span>{{data.length}}</span>
         </div>
         <div class="execute" v-for="(item,index) in data" :key="index" @click="menu">
-          <p class="date">{{item.date}}</p>
+          <p class="date MicrYaHei">{{item.date}}</p>
           <div class="card-box">
             <div class="card" v-for="(item2,index) in item.info" :key="index+'i'">
               <div class="time">执行时间:{{item2.time}}</div>
-              <div class="advice">
+              <div class="advice MicrYaHei">
                 <span>策略建议</span>
                 <span>冷机台数</span>
                 <span>{{item2.ad1}}大{{item2.ad2}}小</span>
@@ -37,7 +37,7 @@
       </div>
       <div class="center">
         <div class="title">
-          <span>审核中</span>
+          <span class="Micbold">审核中</span>
           <span>{{review.length}}</span>
         </div>
         <div class="card" v-for="(item,index) in review" :key="index" @click="menu">
@@ -52,11 +52,11 @@
         </div>
       </div>
       <div class="right">
-        <div class="title">审核完成/超时未申诉</div>
+        <div class="title Micbold">审核完成/超时未申诉</div>
         <div class="card" v-for="(item,index) in complete" :key="index" @click="menu">
           <div class="remark">
             <div class="remark-left">审批时间:{{item.time}}</div>
-            <div class="remark-right">
+            <div class="remark-right Micbold">
               <span :class="item.sign>5?'backout':(item.sign>2?'backout1':'backout2')">
                 <img :src="item.img" />
                 {{item.text}}
@@ -276,7 +276,6 @@ export default {
       span:nth-of-type(1) {
         height: 24px;
         font-size: 16px;
-        font-family: MicrosoftYaHeiSemibold;
         color: rgba(31, 36, 41, 1);
         line-height: 21px;
         margin-right: 8px;
@@ -298,7 +297,6 @@ export default {
       .date {
         height: 18px;
         font-size: 12px;
-        font-family: MicrosoftYaHei;
         color: rgba(141, 147, 153, 1);
         line-height: 16px;
         margin: 0;
@@ -334,9 +332,6 @@ export default {
             padding-left: 16px;
             padding-right: 20px;
             align-items: center;
-            span {
-              font-family: MicrosoftYaHei;
-            }
             span:nth-of-type(1),
             span:nth-of-type(3),
             span:nth-of-type(5) {
@@ -405,7 +400,6 @@ export default {
       span:nth-of-type(1) {
         height: 24px;
         font-size: 16px;
-        font-family: MicrosoftYaHeiSemibold;
         color: rgba(31, 36, 41, 1);
         line-height: 21px;
         margin-right: 8px;
@@ -502,7 +496,6 @@ export default {
           height: 24px;
           height: 22px;
           font-size: 14px;
-          font-family: MicrosoftYaHeiSemibold;
           line-height: 22px;
 
           img {

+ 10 - 20
src/views/audit/index.vue

@@ -4,7 +4,7 @@
     <div class="appealContainer">
       <div class="appeal-left">
         <div class="appeal-left-top">
-          <span class="appeal-left-top-span">待审核</span>
+          <span class="appeal-left-top-span Micbold">待审核</span>
           <el-select v-model="value" placeholder="请选择">
             <el-option
               v-for="item in options"
@@ -15,7 +15,7 @@
           </el-select>
         </div>
         <div class="appeal-left-box" v-for="(item,index) in data" :key="index">
-          <p class="date">{{item.date}}</p>
+          <p class="date MicrYaHei">{{item.date}}</p>
           <div class="appeal-card">
             <div class="appeal-left-div" v-for="(eve,index) in item.value" :key="index">
               <div class="time">
@@ -36,22 +36,22 @@
       </div>
       <div class="appeal-right">
         <div class="detailContainer">
-          <div class="title">未执行申诉单</div>
-          <div class="nav">
+          <div class="title Micbold">未执行申诉单</div>
+          <div class="nav MicrYaHei">
             <span>项目名称:大连万达广场</span>
             <span>申请人:张三</span>
             <span>申请时间:2020.01.13</span>
           </div>
-          <div class="cont1">申诉未执行指令:2020.01.13 14:30 推送策略未执行</div>
+          <div class="cont1 MicrYaHei">申诉未执行指令:2020.01.13 14:30 推送策略未执行</div>
           <div class="cont2">
             <audit-table></audit-table>
           </div>
           <div class="cont3">
-            <span>策略评价</span>
-            <span>执行策略的评价,判断项目执行策略的好坏,执行策略的评价,判断项目执行策略的好最多50个字</span>
+            <span class="Micbold">策略评价</span>
+            <span class="MicrYaHei">执行策略的评价,判断项目执行策略的好坏,执行策略的评价,判断项目执行策略的好最多50个字</span>
           </div>
           <div class="cont4">
-            <span>申请原因</span>
+            <span class="Micbold">申请原因</span>
             <span>
               <el-select size="mini" v-model="value" placeholder="请选择">
                 <el-option
@@ -71,8 +71,8 @@
           </div>
         </div>
         <div class="opinion">
-          <span class="opinion-title">审批意见</span>
-          <div class="opinion-bottom">
+          <span class="opinion-title Micbold">审批意见</span>
+          <div class="opinion-bottom MicrYaHei">
             <input type="text" />
             <span>不同意</span>
             <span>同意</span>
@@ -215,7 +215,6 @@ export default {
       .appeal-left-top-span {
         height: 24px;
         font-size: 16px;
-        font-family: MicrosoftYaHeiSemibold;
         color: rgba(31, 36, 41, 1);
         line-height: 21px;
       }
@@ -225,7 +224,6 @@ export default {
       .date {
         height: 18px;
         font-size: 12px;
-        font-family: MicrosoftYaHei;
         color: rgba(141, 147, 153, 1);
         line-height: 16px;
         text-align: center;
@@ -298,7 +296,6 @@ export default {
       .title {
         height: 32px;
         font-size: 24px;
-        font-family: MicrosoftYaHeiSemibold;
         color: rgba(31, 36, 41, 1);
         line-height: 32px;
         text-align: center;
@@ -311,7 +308,6 @@ export default {
         span {
           height: 22px;
           font-size: 14px;
-          font-family: MicrosoftYaHei;
           color: rgba(31, 36, 41, 1);
           line-height: 19px;
         }
@@ -319,7 +315,6 @@ export default {
       .cont1 {
         height: 22px;
         font-size: 14px;
-        font-family: MicrosoftYaHei;
         color: rgba(31, 36, 41, 1);
         line-height: 19px;
         margin-bottom: 16px;
@@ -336,7 +331,6 @@ export default {
         span:nth-of-type(1) {
           height: 24px;
           font-size: 16px;
-          font-family: MicrosoftYaHeiSemibold;
           color: rgba(31, 36, 41, 1);
           line-height: 21px;
           margin-bottom: 8px;
@@ -344,7 +338,6 @@ export default {
         span:nth-of-type(2) {
           height: 22px;
           font-size: 14px;
-          font-family: MicrosoftYaHei;
           color: rgba(100, 108, 115, 1);
           line-height: 19px;
         }
@@ -357,7 +350,6 @@ export default {
         span:nth-of-type(1) {
           height: 24px;
           font-size: 16px;
-          font-family: MicrosoftYaHeiSemibold;
           color: rgba(31, 36, 41, 1);
           line-height: 21px;
         }
@@ -390,7 +382,6 @@ export default {
       .opinion-title {
         height: 24px;
         font-size: 16px;
-        font-family: MicrosoftYaHeiSemibold;
         color: rgba(31, 36, 41, 1);
         line-height: 21px;
         margin-bottom: 8px;
@@ -415,7 +406,6 @@ export default {
           border-radius: 4px;
           border: 1px solid rgba(195, 199, 203, 1);
           font-size: 14px;
-          font-family: MicrosoftYaHei;
           color: rgba(31, 35, 41, 1);
           line-height: 32px;
           text-align: center;

+ 3 - 9
src/views/evaluate/evCard.vue

@@ -2,14 +2,14 @@
   <div class="count-card-box">
     <div class="count-card" v-for="(item,index) in cardList" :key="index">
       <div class="card-div1">执行时间:{{item.a}}</div>
-      <div class="card-div2">
+      <div class="card-div2 MicrYaHei">
         <span>策略建议</span>
         <span>冷机台数</span>
         <span>{{item.b}}大{{item.c}}小</span>
         <span>冷机出水温度</span>
         <span>{{item.d}}°C</span>
       </div>
-      <div class="card-div3">
+      <div class="card-div3 MicrYaHei">
         <span>实际执行</span>
         <span>冷机台数</span>
         <span>{{item.e}}大{{item.f}}小</span>
@@ -22,7 +22,7 @@
           <img :src="item.i" alt />
           {{item.k}}
         </span>
-        <span @click="viewSnapshots = true">查看快照</span>
+        <span class="MicrYaHei" @click="viewSnapshots = true">查看快照</span>
       </div>
     </div>
     <div class="view-dialog">
@@ -93,7 +93,6 @@ export default {
       span:nth-of-type(1) {
         height: 19px;
         font-size: 14px;
-        font-family: MicrosoftYaHei;
         color: rgba(31, 36, 41, 1);
         line-height: 19px;
         margin-right: 36px;
@@ -101,7 +100,6 @@ export default {
       span:nth-of-type(2) {
         height: 18px;
         font-size: 12px;
-        font-family: MicrosoftYaHei;
         color: rgba(141, 147, 153, 1);
         line-height: 22px;
         margin-right: 8px;
@@ -109,7 +107,6 @@ export default {
       span:nth-of-type(3) {
         height: 19px;
         font-size: 14px;
-        font-family: MicrosoftYaHei;
         color: rgba(31, 36, 41, 1);
         line-height: 19px;
         margin-right: 36px;
@@ -117,7 +114,6 @@ export default {
       span:nth-of-type(4) {
         height: 18px;
         font-size: 12px;
-        font-family: MicrosoftYaHei;
         color: rgba(141, 147, 153, 1);
         line-height: 22px;
         margin-right: 8px;
@@ -125,7 +121,6 @@ export default {
       span:nth-of-type(5) {
         height: 21px;
         font-size: 16px;
-        font-family: MicrosoftYaHei;
         color: rgba(31, 36, 41, 1);
         line-height: 21px;
       }
@@ -165,7 +160,6 @@ export default {
         cursor: pointer;
         height: 22px;
         font-size: 14px;
-        font-family: MicrosoftYaHei;
         color: rgba(31, 35, 41, 1);
         line-height: 22px;
         background: rgba(255, 255, 255, 1);

+ 2 - 9
src/views/evaluate/evHistory.vue

@@ -1,7 +1,7 @@
 <template>
-  <div>
+  <div class="MicrYaHei">
     <p>
-      <span>根据历史数据计算</span>
+      <span class="Micbold">根据历史数据计算</span>
       <span></span>
       <span>本日概况</span>
       <span></span>
@@ -53,7 +53,6 @@ p {
   span:nth-of-type(1) {
     height: 24px;
     font-size: 16px;
-    font-family: MicrosoftYaHeiSemibold;
     color: rgba(31, 36, 41, 1);
     line-height: 21px;
     margin-right: 24px;
@@ -67,7 +66,6 @@ p {
   span:nth-of-type(3) {
     height: 18px;
     font-size: 12px;
-    font-family: MicrosoftYaHei;
     color: rgba(0, 0, 0, 1);
     line-height: 16px;
     margin-right: 20px;
@@ -81,7 +79,6 @@ p {
   span:nth-of-type(5) {
     height: 18px;
     font-size: 12px;
-    font-family: MicrosoftYaHei;
     color: rgba(0, 0, 0, 1);
     line-height: 16px;
   }
@@ -105,7 +102,6 @@ p {
       left: 0;
       height: 22px;
       font-size: 14px;
-      font-family: MicrosoftYaHei;
       color: rgba(31, 36, 41, 1);
       line-height: 19px;
     }
@@ -137,7 +133,6 @@ p {
       left: 0;
       height: 22px;
       font-size: 14px;
-      font-family: MicrosoftYaHei;
       color: rgba(31, 36, 41, 1);
       line-height: 19px;
     }
@@ -169,7 +164,6 @@ p {
       left: 0;
       height: 22px;
       font-size: 14px;
-      font-family: MicrosoftYaHei;
       color: rgba(31, 36, 41, 1);
       line-height: 19px;
     }
@@ -194,7 +188,6 @@ p {
 .count-text {
   height: 16px;
   font-size: 12px;
-  font-family: MicrosoftYaHei;
   color: rgba(100, 108, 115, 1);
   line-height: 16px;
   display: flex;

+ 3 - 4
src/views/evaluate/evRateTitle.vue

@@ -2,19 +2,19 @@
   <div class="count-bottom-title">
     <span v-if="tab==1" class="count-bottom-text">
       <span class="span1"></span>
-      <span class="span2">室内温度满足率</span>
+      <span class="span2 Micbold">室内温度满足率</span>
       <span class="span3">90.2%</span>
     </span>
     <span v-if="tab==2" class="count-bottom-text">
       <span class="span1"></span>
-      <span class="span2">节能率</span>
+      <span class="span2 Micbold">节能率</span>
       <span class="span4">22.6%</span>
       <span class="span5">准确率</span>
       <span class="span6">90%</span>
     </span>
     <span v-if="tab==3" class="count-bottom-text">
       <span class="span1"></span>
-      <span class="span2">执行率</span>
+      <span class="span2 Micbold">执行率</span>
       <img class="span7" src="../../assets/finish.png" alt />
     </span>
   </div>
@@ -47,7 +47,6 @@ export default {
     }
     .span2 {
       font-size: 20px;
-      font-family: MicrosoftYaHeiSemibold;
       color: rgba(31, 36, 41, 1);
       margin-right: 12px;
     }

+ 9 - 16
src/views/evaluate/evSnapshotsDialog.vue

@@ -9,7 +9,7 @@
         <span>10:00-22:00</span>
       </div>
       <div class="snapshotss-top-center">
-        <span>当前运行模式</span>
+        <span class="MicrYaHei">当前运行模式</span>
         <span>间歇供冷</span>
       </div>
       <div class="snapshotss-top-right">
@@ -18,17 +18,17 @@
       </div>
     </div>
     <div class="snapshotss-center1">
-      <div class="snapshotss-center1-title">系统运行状态</div>
+      <div class="snapshotss-center1-title Micbold">系统运行状态</div>
       <div class="snapshotss-center1-content">
         <div class="snapshotss-cont">
-          <div class="snapshotss-cont-top">冷水机组</div>
+          <div class="snapshotss-cont-top Micbold">冷水机组</div>
           <div class="snapshotss-cont-bottom">
             <div class="snapshotss-cont-bot-1">
               <span>0</span>
               <span>0</span>
               <span>12 °C</span>
             </div>
-            <div class="snapshotss-cont-bot-2">
+            <div class="snapshotss-cont-bot-2 MicrYaHei">
               <span>大</span>
               <span>小</span>
               <span>温度</span>
@@ -36,7 +36,7 @@
           </div>
         </div>
         <div class="snapshotss-cont">
-          <div class="snapshotss-cont-top">冷冻水泵</div>
+          <div class="snapshotss-cont-top Micbold">冷冻水泵</div>
           <div class="snapshotss-cont-bottom">
             <div class="snapshotss-cont-bot-1">
               <span>0</span>
@@ -51,7 +51,7 @@
           </div>
         </div>
         <div class="snapshotss-cont">
-          <div class="snapshotss-cont-top">冷却水泵</div>
+          <div class="snapshotss-cont-top Micbold">冷却水泵</div>
           <div class="snapshotss-cont-bottom">
             <div class="snapshotss-cont-bot-1">
               <span>0</span>
@@ -66,7 +66,7 @@
           </div>
         </div>
         <div class="snapshotss-cont">
-          <div class="snapshotss-cont-top">冷却塔</div>
+          <div class="snapshotss-cont-top Micbold">冷却塔</div>
           <div class="snapshotss-cont-bottom">
             <div class="snapshotss-cont-bot-1">
               <span>0</span>
@@ -83,7 +83,7 @@
       </div>
     </div>
     <div class="snapshotss-center2">
-      <div class="snapshotss-cont2-box1">
+      <div class="snapshotss-cont2-box1 MicrYaHei">
         <span>数据传输情况</span>
         <span :class="imgFinish?'span1':'span2'" v-for="(item,index) in imgFinishList" :key="index">
           {{item.name}}
@@ -91,7 +91,7 @@
           <img v-else :src="item.img2" alt />
         </span>
       </div>
-      <div class="snapshotss-cont2-box2">
+      <div class="snapshotss-cont2-box2 MicrYaHei">
         <span>实际冷量</span>
         <span>2800 KW</span>
         <span>未来1小时预测冷量</span>
@@ -304,7 +304,6 @@ export default {
     span:nth-of-type(1) {
       height: 22px;
       font-size: 14px;
-      font-family: MicrosoftYaHei;
       color: rgba(100, 108, 115, 1);
       line-height: 19px;
       margin-bottom: 4px;
@@ -324,7 +323,6 @@ export default {
     .snapshotss-center1-title {
       height: 24px;
       font-size: 16px;
-      font-family: MicrosoftYaHeiSemibold;
       color: rgba(31, 36, 41, 1);
       line-height: 21px;
       margin-bottom: 14px;
@@ -341,7 +339,6 @@ export default {
           background: rgba(248, 249, 250, 1);
           border-radius: 4px;
           font-size: 16px;
-          font-family: MicrosoftYaHeiSemibold;
           color: rgba(31, 36, 41, 1);
           line-height: 40px;
           padding-left: 20px;
@@ -368,7 +365,6 @@ export default {
             span {
               height: 22px;
               font-size: 14px;
-              font-family: MicrosoftYaHei;
               color: rgba(100, 108, 115, 1);
               line-height: 19px;
             }
@@ -400,7 +396,6 @@ export default {
       span:nth-of-type(1) {
         height: 22px;
         font-size: 14px;
-        font-family: MicrosoftYaHei;
         color: rgba(100, 108, 115, 1);
         line-height: 19px;
         margin-right: 20px;
@@ -410,7 +405,6 @@ export default {
         background: rgba(255, 255, 255, 1);
         border-radius: 16px;
         font-size: 14px;
-        font-family: MicrosoftYaHei;
         color: rgba(31, 36, 41, 1);
         display: flex;
         justify-content: space-between;
@@ -435,7 +429,6 @@ export default {
       span:nth-of-type(3) {
         height: 22px;
         font-size: 14px;
-        font-family: MicrosoftYaHei;
         color: rgba(100, 108, 115, 1);
         line-height: 19px;
         margin-right: 16px;

+ 4 - 9
src/views/evaluate/evTwoLevelMenu.vue

@@ -3,12 +3,12 @@
     <div class="evTwoContainer-out">
       <Head :headText="headText"></Head>
       <div class="count-top">
-        <div class="count-top-left">
+        <div class="count-top-left MicrYaHei">
           <span @click="jumpIndex">首页</span>
           <span>></span>
           <span>单日运行评价</span>
         </div>
-        <ul>
+        <ul class="MicrYaHei">
           <div>
             <li :class="{current: num == 1}" @click="change(1)">室内温度</li>
             <li :class="{current: num==2}" @click="change(2)">节能率</li>
@@ -38,8 +38,8 @@
               <ev-history></ev-history>
               <div class="count-foot">
                 <div class="count-foot-title">
-                  <span>相似日概况</span>
-                  <span>相似度高</span>
+                  <span class="Micbold">相似日概况</span>
+                  <span class="MicrYaHei">相似度高</span>
                 </div>
                 <div class="count-foot-table">
                   <ev-energy-table></ev-energy-table>
@@ -162,7 +162,6 @@ export default {
       top: 68px;
       span {
         display: inline-block;
-        font-family: MicrosoftYaHei;
       }
       span:nth-of-type(1) {
         height: 22px;
@@ -202,12 +201,10 @@ export default {
     }
 
     ul li {
-      list-style: none;
       cursor: pointer;
       height: 21px;
       float: left;
       font-size: 16px;
-      font-family: MicrosoftYaHei;
       color: rgba(31, 35, 41, 1);
       line-height: 21px;
       padding: 14px 16px;
@@ -242,7 +239,6 @@ export default {
             span:nth-of-type(1) {
               height: 24px;
               font-size: 16px;
-              font-family: MicrosoftYaHeiSemibold;
               color: rgba(31, 36, 41, 1);
               line-height: 21px;
               margin-right: 16px;
@@ -253,7 +249,6 @@ export default {
               background: rgba(225, 242, 255, 1);
               border-radius: 2px;
               font-size: 14px;
-              font-family: MicrosoftYaHei;
               color: rgba(0, 101, 179, 1);
               line-height: 22px;
               text-align: center;

+ 2 - 4
src/views/evaluate/index.vue

@@ -24,12 +24,12 @@
     <div class="evaluateContainer">
       <div class="ev-content">
         <div class="ev-cont-div">
-          <p class="ev-top">室内温度满足率</p>
+          <p class="ev-top Micbold">室内温度满足率</p>
           <div class="ev-bottom">
             <div class="ev-bottom-left">
               <ev-satisfaction-rate></ev-satisfaction-rate>
             </div>
-            <div class="ev-bottom-right">
+            <div class="ev-bottom-right MicrYaHei">
               <p>
                 <span>超限时长</span>
                 <span>0.3</span>
@@ -208,7 +208,6 @@ export default {
         margin: 0;
         height: 24px;
         font-size: 16px;
-        font-family: MicrosoftYaHeiSemibold;
         color: rgba(31, 36, 41, 1);
         line-height: 21px;
       }
@@ -228,7 +227,6 @@ export default {
         .ev-bottom-right {
           p {
             font-size: 14px;
-            font-family: MicrosoftYaHei;
             color: rgba(100, 108, 115, 1);
             line-height: 19px;
             span {

+ 2 - 7
src/views/main/index.vue

@@ -38,10 +38,10 @@
               <span class="line"></span>
             </li>
             <li>
-              <span class="head-text">天气:多云</span>
+              <span class="head-text MicrYaHei">天气:多云</span>
             </li>
             <li>
-              <span class="head-text">25℃</span>
+              <span class="head-text MicrYaHei">25℃</span>
             </li>
             <li>
               <span class="line"></span>
@@ -157,7 +157,6 @@ export default {
           display: flex;
           justify-content: space-between;
           align-items: center;
-          list-style: none;
           margin: 0;
           padding: 0;
           li {
@@ -192,7 +191,6 @@ export default {
             .head-text {
               height: 26px;
               font-size: 14px;
-              font-family: MicrosoftYaHei;
               color: rgba(31, 36, 41, 1);
               line-height: 26px;
             }
@@ -221,7 +219,6 @@ export default {
           display: flex;
           justify-content: space-between;
           align-items: center;
-          list-style: none;
           margin: 0;
           padding: 0;
           li {
@@ -242,7 +239,6 @@ export default {
             .head-text {
               height: 18px;
               font-size: 14px;
-              font-family: MicrosoftYaHei;
               color: #646c73;
               line-height: 19px;
             }
@@ -313,7 +309,6 @@ export default {
     .nav-title {
       padding: 0 24px;
       a {
-        text-decoration: none;
         color: #fff;
         font-size: 16px;
         line-height: 24px;

+ 1 - 2
src/views/strategy/index.vue

@@ -6,7 +6,7 @@
       <img class="nav-icon" v-if="navText" src="@/assets/shape.png" alt />
       <span class="nav-text1" v-if="navText">今日已收到 8 条策略,其中有 1 条未执行</span>
       <span class="nav-text" v-else>今天已收到 8 条策略</span>
-      <span class="nav-look" @click="showTodayStrategy = true">查看</span>
+      <span class="nav-look MicrYaHei" @click="showTodayStrategy = true">查看</span>
     </div>
     <div class="strategyContainer">
       <div class="strate-left">
@@ -88,7 +88,6 @@ export default {
   .nav-look {
     height: 22px;
     font-size: 14px;
-    font-family: MicrosoftYaHei;
     color: rgba(0, 145, 255, 1);
     line-height: 22px;
     margin: 0 12px;