feat: dev

src/view/organization.vue

@@ -34,7 +34,7 @@
         </el-table-column>
         <el-table-column label="行政区划" v-slot:default="{ row }: { row: OrganizationType }">
           <template v-if="row.province">
-            {{ `${row.province}${row.city}${row.area}` }}
+            {{ `${row.province || ''}${row.city || ''}${row.area || ''}` }}
           </template>
         </el-table-column>
         <el-table-column label="单位账号" prop="userName"></el-table-column>

src/view/relics.vue

@@ -4,29 +4,16 @@
       <div class="search">
         <el-form label-width="100px" inline>
           <el-form-item label="文物名称：">
-            <el-input
-              clearable
-              v-model="pageProps.name"
-              style="width: 250px"
-              placeholder="请输入"
-            />
+            <el-input clearable v-model="pageProps.name" style="width: 250px" placeholder="请输入" />
           </el-form-item>
           <el-form-item label="文物级别：">
             <el-select style="width: 250px" v-model="pageProps.level" clearable>
-              <el-option
-                :value="Number(key)"
-                :label="type"
-                v-for="(type, key) in relicsLevelDesc"
-              />
+              <el-option :value="Number(key)" :label="type" v-for="(type, key) in relicsLevelDesc" />
             </el-select>
           </el-form-item>
           <el-form-item label="类别：">
             <el-select style="width: 250px" v-model="pageProps.category" clearable>
-              <el-option
-                :value="Number(key)"
-                :label="type"
-                v-for="(type, key) in relicsTypeDesc"
-              />
+              <el-option :value="Number(key)" :label="type" v-for="(type, key) in relicsTypeDesc" />
             </el-select>
           </el-form-item>
           <el-form-item class="searh-btns">
@@ -45,11 +32,7 @@
 
     <div class="relics-content">
       <el-table :data="relicsArray" border>
-        <el-table-column
-          prop="name"
-          label="文物名称"
-          v-slot:default="{ row }: { row: Relics }"
-        >
+        <el-table-column prop="name" label="文物名称" v-slot:default="{ row }: { row: Relics }">
           <a class="link" @click="shareHandler(row)">
             <TexToolTip :text="row.name" />
           </a>
@@ -64,7 +47,7 @@
         </el-table-column> -->
         <el-table-column label="行政区划" v-slot:default="{ row }: { row: OrganizationType }">
           <template v-if="row.province">
-            {{ `${row.province}${row.city}${row.area}` }}
+            {{ `${row.province || ''}${row.city || ''}${row.area || ''}` }}
           </template>
         </el-table-column>
 
@@ -84,15 +67,8 @@
         <el-table-column prop="userName" label="创建人账号" v-slot:default="{ row }">
           <TexToolTip :text="row.userName" />
         </el-table-column>
-        <el-table-column
-          prop="creationMethod"
-          label="创建方式"
-          v-slot:default="{ row }: { row: Relics }"
-        >
-          <TexToolTip
-            :text="creationMethodDesc[row.creationMethod!]"
-            v-if="row.creationMethod"
-          />
+        <el-table-column prop="creationMethod" label="创建方式" v-slot:default="{ row }: { row: Relics }">
+          <TexToolTip :text="creationMethodDesc[row.creationMethod!]" v-if="row.creationMethod" />
         </el-table-column>
         <el-table-column label="操作" width="240" fixed="right">
           <template #default="{ row }">
@@ -102,14 +78,9 @@
             <el-button link type="primary" size="small" @click="editHandler(row)">
               编辑
             </el-button>
-            <el-button
-              link
-              type="primary"
-              size="small"
-              @click="
-                router.push({ name: COORD_NAME, params: { relicsId: row.relicsId } })
-              "
-            >
+            <el-button link type="primary" size="small" @click="
+              router.push({ name: COORD_NAME, params: { relicsId: row.relicsId } })
+              ">
               数据提取
             </el-button>
             <el-button link type="danger" @click="delHandler(row.relicsId)" size="small">
@@ -120,15 +91,9 @@
       </el-table>
     </div>
     <div class="pag-layout">
-      <el-pagination
-        background
-        layout="total, prev, pager, next, sizes, jumper"
-        v-model:page-size="pageProps.pageSize"
-        :page-sizes="[10, 20, 50, 100]"
-        :total="total"
-        @current-change="(data: number) => pageProps.pageNum = data"
-        :current-page="pageProps.pageNum"
-      />
+      <el-pagination background layout="total, prev, pager, next, sizes, jumper" v-model:page-size="pageProps.pageSize"
+        :page-sizes="[10, 20, 50, 100]" :total="total" @current-change="(data: number) => pageProps.pageNum = data"
+        :current-page="pageProps.pageNum" />
     </div>
   </div>
 </template>
@@ -142,7 +107,7 @@ import {
   delRelicsFetch,
   updateRelicsFetch,
 } from "@/request";
-
+import type { OrganizationType } from "@/request/organization";
 import {
   Relics,
   relicsLevelDesc,
@@ -221,6 +186,7 @@ onActivated(refresh);
   overflow-y: auto;
   padding: 30px;
 }
+
 .pag-layout {
   margin-top: 20px;
   display: flex;
@@ -231,9 +197,11 @@ onActivated(refresh);
   display: flex;
   align-items: center;
   margin-bottom: 20px;
+
   .search {
     flex: 1;
   }
+
   .relics-oper {
     flex: 0 0 100px;
     text-align: right;