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

2025-09-30 09:51:23 +08:00 · 2025-09-30 09:51:23 +08:00 · a47e184e9f
parent c614b21aef 354f4fa91c
commit a47e184e9f
2 changed files with 8 additions and 2 deletions
--- a/src/views/framework/architecture/azjg2.vue
+++ b/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"
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -43,7 +43,6 @@
            type="text"
            tabindex="1"
            auto-complete="on"
-            @blur="getCheck"
          />
        </el-form-item>