Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test

src/views/framework/architecture/azjg2.vue

@@ -105,7 +105,14 @@
             prop="pointTypeLabel"
             label="点位类型"
             width="100"
-          />
+          >
+            <template slot-scope="scope">
+              <el-tag size="small" :type="scope.row.pointTypeLabel === '普通点位' ? 'info' : 'warning'">
+                {{ scope.row.pointTypeLabel }}
+              </el-tag>
+
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="stage"

src/views/login/index.vue

@@ -43,7 +43,6 @@
             type="text"
             tabindex="1"
             auto-complete="on"
-            @blur="getCheck"
           />
         </el-form-item>