update

src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { getInfo, login, logout } from "@/api/login";
 import { getToken, removeToken, setToken } from "@/utils/auth";
-// import defAva from "@/assets/images/profile.jpg";
+import defAva from "@/assets/images/profile.jpg";
 
 const useUserStore = defineStore("user", {
   state: () => ({
@@ -41,10 +41,9 @@ const useUserStore = defineStore("user", {
             const user = res.data.user;
             const enterprise = res.data.enterprise;
             const userId = user.userId;
-            const avatar =
+            const avatar = !user.avatar
-              /*user.avatar == "" || user.avatar == null
                                 ? defAva
-                                :*/ user.avatar;
+                                : user.avatar;
 
             if (res.roles && res.roles.length > 0) {
               // 验证返回的roles是否是一个非空数组

src/views/admin/expert/technology/patent.vue

@@ -43,10 +43,12 @@
             icon="Search"
             size="small"
             @click="handleQuery"
-          >搜索</el-button
+        >搜索
+        </el-button
         >
         <el-button icon="Refresh" size="small" @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -58,14 +60,16 @@
             icon="Plus"
             size="small"
             @click="handleAdd"
-          >新增</el-button
+        >新增
+        </el-button
         >
       </el-col>
       <!-- 无接口  暂时注释 -->
       <el-col :span="1.5">
         <router-link to="./claimPatent">
           <el-button type="primary" plain icon="Plus" size="small"
-            >认领</el-button
+          >认领
+          </el-button
           >
         </router-link>
       </el-col>
@@ -77,7 +81,7 @@
 
     <!-- 表格数据 -->
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column label="数据编号" prop="id" />
+      <el-table-column label="数据编号" prop="id"/>
       <el-table-column
           label="专利名称"
           prop="title"
@@ -88,8 +92,8 @@
           prop="applyCode"
           :show-overflow-tooltip="true"
       />
-      <el-table-column label="发明人" prop="inventor" />
+      <el-table-column label="发明人" prop="inventor"/>
-      <el-table-column label="申请（专利权）人" prop="applyName" />
+      <el-table-column label="申请（专利权）人" prop="applyName"/>
       <el-table-column label="申请日期" align="center" prop="applyAt">
         <template #default="{ row }">
           <span>{{ dayjs(row.applyAt).format("YYYY-MM-DD") }}</span>
@@ -106,14 +110,16 @@
               type="text"
               icon="Edit"
               @click="handleUpdate(row)"
-            >修改</el-button
+          >修改
+          </el-button
           >
           <el-button
               size="small"
               type="text"
               icon="Delete"
               @click="handleDelete(row.id)"
-            >删除</el-button
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
@@ -149,13 +155,13 @@
           />
         </el-form-item>
         <el-form-item label="专利名称:" prop="title">
-          <el-input v-model="form.title" placeholder="请输入专利名称" />
+          <el-input v-model="form.title" placeholder="请输入专利名称"/>
         </el-form-item>
         <el-form-item label="申请号:" prop="applyCode">
-          <el-input v-model="form.applyCode" placeholder="请输入申请号" />
+          <el-input v-model="form.applyCode" placeholder="请输入申请号"/>
         </el-form-item>
         <el-form-item label="公开号:" prop="openCode">
-          <el-input v-model="form.openCode" placeholder="请输入公开号" />
+          <el-input v-model="form.openCode" placeholder="请输入公开号"/>
         </el-form-item>
         <el-row>
           <el-col :span="12">
@@ -202,7 +208,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="IPC分类号:" prop="ipcCode">
-              <el-input v-model="form.ipcCode" placeholder="请输入IPC分类号" />
+              <el-input v-model="form.ipcCode" placeholder="请输入IPC分类号"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -247,15 +253,16 @@ import {
   updateCasPatent,
   deleteCasPatentByIds,
 } from "@/api/admin/expert/patent";
-import { cloneDeep } from "lodash";
+import {cloneDeep} from "lodash";
-import { getInfo } from "@/api/admin/expert/account";
+import {getInfo} from "@/api/admin/expert/account";
 import dayjs from "dayjs";
-import { ElMessage, ElMessageBox } from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
-import { patentOptions } from "@/utils/parameter";
+import {patentOptions} from "@/utils/parameter";
-import { useRouter } from "vue-router";
+import {useRouter} from "vue-router";
+
 const router = useRouter();
 
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 
 const dataList = ref([]);
 const open = ref(false);
@@ -272,19 +279,19 @@ const data = reactive({
     inventor: undefined,
   },
   rules: {
-    applyName: [{ required: true, message: "申请人不能为空", trigger: "blur" }],
+    applyName: [{required: true, message: "申请人不能为空", trigger: "blur"}],
     applyAddress: [
-      { required: true, message: "申请人地址不能为空", trigger: "blur" },
+      {required: true, message: "申请人地址不能为空", trigger: "blur"},
     ],
-    openCode: [{ required: true, message: "公开号不能为空", trigger: "blur" }],
+    openCode: [{required: true, message: "公开号不能为空", trigger: "blur"}],
-    openAt: [{ required: true, message: "公开日不能为空", trigger: "blur" }],
+    openAt: [{required: true, message: "公开日不能为空", trigger: "blur"}],
-    inventor: [{ required: true, message: "发明人不能为空", trigger: "blur" }],
+    inventor: [{required: true, message: "发明人不能为空", trigger: "blur"}],
-    title: [{ required: true, message: "专利名称不能为空", trigger: "blur" }],
+    title: [{required: true, message: "专利名称不能为空", trigger: "blur"}],
-    applyCode: [{ required: true, message: "申请号不能为空", trigger: "blur" }],
+    applyCode: [{required: true, message: "申请号不能为空", trigger: "blur"}],
-    applyAt: [{ required: true, message: "申请日期不能为空", trigger: "blur" }],
+    applyAt: [{required: true, message: "申请日期不能为空", trigger: "blur"}],
-    kind: [{ required: true, message: "请选择专利类型", trigger: "change" }],
+    kind: [{required: true, message: "请选择专利类型", trigger: "change"}],
     ipcCode: [
-      { required: true, message: "IPC分类号不能为空", trigger: "blur" },
+      {required: true, message: "IPC分类号不能为空", trigger: "blur"},
     ],
     status: [
       {
@@ -293,14 +300,14 @@ const data = reactive({
         trigger: "change",
       },
     ],
-    description: [{ required: true, message: "摘要不能为空", trigger: "blur" }],
+    description: [{required: true, message: "摘要不能为空", trigger: "blur"}],
     principalClaim: [
-      { required: true, message: "主权项不能为空", trigger: "blur" },
+      {required: true, message: "主权项不能为空", trigger: "blur"},
     ],
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 const queryRef = ref();
 const patentRef = ref();
@@ -309,26 +316,29 @@ const expertId = ref(undefined);
 /** 查询数据列表 */
 const getList = async () => {
   loading.value = true;
-  const { data } = await getInfo();
+  const {data} = await getInfo();
   form.value.expertId = data.casExpert.id;
   const id = data.casExpert.id;
   expertId.value = data.casExpert.id;
   expertPatentList(id, queryParams.value).then((resp) => {
     dataList.value = resp.rows;
     total.value = resp.total;
+  }).finally(() => {
     loading.value = false;
-  });
+  })
 };
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
 };
+
 /** 重置按钮操作 */
 function resetQuery() {
   queryRef.value.resetFields();
   handleQuery();
 }
+
 /** 删除按钮操作 */
 function handleDelete(id) {
   ElMessageBox.confirm('是否确认删除数据编号为"' + id + '"的专利项?')
@@ -363,6 +373,7 @@ function reset() {
   };
   proxy.resetForm("patentRef");
 }
+
 /** 添加数据 */
 const handleAdd = () => {
   reset();
@@ -384,17 +395,18 @@ const handleUpdate = (row) => {
 const submitForm = async () => {
   await patentRef.value.validate();
   if (form.value.id != undefined) {
-    await updateCasPatent({ ...form.value, expertId: expertId.value });
+    await updateCasPatent({...form.value, expertId: expertId.value});
     ElMessage.success("修改成功");
     open.value = false;
     getList();
   } else {
-    await insertCasPatent({ ...form.value, expertId: expertId.value });
+    await insertCasPatent({...form.value, expertId: expertId.value});
     ElMessage.success("新增成功");
     open.value = false;
     getList();
   }
 };
+
 /** 取消按钮 */
 function cancel() {
   open.value = false;