From 361871c79c5ae6758a569f94698b7192670bb83a Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Mon, 4 Nov 2024 15:51:57 +0800
Subject: [PATCH] 12

---
 src/views/Login.vue                |  4 ++--
 src/views/baseSystemInfo/index.vue | 14 +++++++++++++-
 src/views/homePage/HomePage.vue    |  8 ++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/views/Login.vue b/src/views/Login.vue
index 8722246..64138a7 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -56,8 +56,8 @@ export default {
   data() {
     return {
       form: {
-        account: "", // cdoffice, xin
-        password: "", // 123456
+        account: "cdwxsd07", // cdoffice, xin
+        password: "WxB@2024!User", // WxB@2024!User
       },
       rules: {
         account: { required: true, message: "用户名不能为空", trigger: "blur" },
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 0993e92..e7c0286 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -35,6 +35,13 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="">
+                  <el-select v-model="query.specialRecordType" placeholder="请选择特殊备案类型" clearable>
+                    <el-option v-for="item in specialRecordTypeOption" :key="item.id" :label="item.fullName" :value="item.id"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="3">
+                <el-form-item label="">
                   <el-input v-model="query.principalName" placeholder="请输入联系人" clearable/>
                 </el-form-item>
               </el-col>
@@ -42,7 +49,7 @@
                 <el-form-item label="">
                   <el-input v-model="query.principalPhone" placeholder="请输入联系电话" clearable/>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="3">
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" @click="search()" >搜索</el-button>
@@ -69,6 +76,9 @@
               <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template>
               </el-table-column>
+              <el-table-column label="特殊备案类型" prop="specialRecordType" align="left" show-overflow-tooltip>
+                <template slot-scope="scope">{{ scope.row.specialRecordType | dynamicText(specialRecordTypeOption) }}</template>
+              </el-table-column>
               <el-table-column label="应用分类" prop="systemClassStr" align="left" show-overflow-tooltip>
                 <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> -->
               </el-table-column>
@@ -193,10 +203,12 @@ export default {
         { prop: "principalPhone", label: "联系电话" },
         { prop: "areaId", label: "所属区域" },
       ],
+      specialRecordTypeOption: [],
     };
   },
   
   created() {
+    this.initSpecialRecordTypeOption();
     this.initSystemTypeList();
     this.initAreaTypeList();
     this.initList();
diff --git a/src/views/homePage/HomePage.vue b/src/views/homePage/HomePage.vue
index 4980eee..ff2872f 100644
--- a/src/views/homePage/HomePage.vue
+++ b/src/views/homePage/HomePage.vue
@@ -67,14 +67,14 @@ export default {
   computed: {},
   methods: {
     toSearchInfoList() {
-      if(this.$route.path == '/baseSystemInfo/index.vue') {
-        this.$refs.info.search();
-      } else {
+      // if(this.$route.path == '/baseSystemInfo/index.vue') {
+      //   this.$refs.info.search();
+      // } else {
         this.$router.push({
           path: "/baseSystemInfo/index.vue",
           query: { keyword: this.searchKeyword },
         });
-      }
+      // }
     },
   },
 };
--
libgit2 0.21.4