修改合并代码报错

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

@@ -112,22 +112,6 @@
         </Tag> -->
         {{ record.nodename }}
       </template>
-      <template #nodename="{ record }">
-        <!-- <Tag>
-          {{
-            record.nodename == '归档' ? '已完成' : record.nodename
-          }}
-        </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 }}

src/views/resource/examine/index.vue

@@ -64,11 +64,11 @@
             }}
           </a-tag>
         </template>
-        <template #ISPASS="{ record }">
+        <!-- <template #ISPASS="{ record }">
           {{
             record.ISPASS == '1' ? '同意' : record.ISPASS == '0' ? '不同意' : ''
           }}
-        </template>
+        </template> -->
       </BasicTable>
       <check v-if="ischect" @register="registerModal" @success="handleSuccess" />
       <map-resource-upload v-if="!ischect && current === 'MR'" @register="registerModal"