手动合并两个分支

src/views/dataAdmin/assembly/index.vue

@@ -196,7 +196,7 @@ export default defineComponent({
 
     //编辑
     function handleEdit(record: Recordable) {
-      console.log('编辑:', record);
+      console.log("编辑:", record);
       openModal(true, {
         record,
         isUpdate: true,

src/views/dataAdmin/assembly/map.data.ts

@@ -163,11 +163,11 @@ export const columns: BasicColumn[] = [
     width: 110,
     slots: { customRender: 'status' },
   },
-  // {
-  //     title: '审核人',
-  //     dataIndex: 'checkname',
-  //     width: 100,
-  //   },
+{
+    title: '审核人',
+    dataIndex: 'checkname',
+    width: 100,
+  },
   {
     title: '审核时间',
     dataIndex: 'checktime',

src/views/dataAdmin/dataAdmin/sceneResourceUpload/index.vue

@@ -112,6 +112,14 @@
         </Tag> -->
         {{ record.nodename }}
       </template>
+      <template #nodename="{ record }">
+        <!-- <Tag>
+          {{
+            record.nodename == '归档' ? '已完成' : record.nodename
+          }}
+        </Tag> -->
+        {{ record.nodename }}
+      </template>
       <template #checkname="{ record }">
         <!-- <Tag>
           {{ record.nodename == '归档' ? '已完成' : record.checkname === '' ? record.publisher : record.checkname }}