Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

src/pages/analysis/outdoor/index.vue

@@ -6,7 +6,7 @@ card-warp(title="室外气象分析", height="45px", showBackground)
   div(slot="content", style="height: 90%")
     el-form(:inline="true", size="mini")
       el-form-item(label="设备名称：")
-        el-input(type="primary", size="mini")
+        el-input(type="primary", size="mini" v-model='name' readOnly)
       el-form-item(label="时间范围：")
         el-date-picker(
           size="mini",
@@ -68,6 +68,7 @@ export default {
   data() {
     return {
       activeName: '1',
+      name: '室外气象站',
       startTime: '',
       endTime: '',
       pickerOptions: {
@@ -126,7 +127,7 @@ export default {
       color: #000000;
       line-height: 40px;
       &::before {
-        content: "";
+        content: '';
         display: inline-block;
         width: 10px;
         height: 10px;