解决冲突

src/views/compilation/handbook/index.vue

@@ -6,22 +6,12 @@
       <el-form size="small" :inline="true" label-width="200">
         <el-row>
           <el-col :span="5">
-<<<<<<< HEAD
             <el-form-item label="手册名称" style="width: 100%;">
               <el-input v-model="queryParams.name" placeholder="请输入手册名称" clearable />
-=======
-            <el-form-item label="手册名称" style="width: 100%">
-              <el-input
-                v-model="queryParams.name"
-                placeholder="请输入手册名称"
-                clearable
-              />
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="创建时间">
-<<<<<<< HEAD
               <el-date-picker 
                 v-model="queryParams.startTime" 
                 type="date" 
@@ -29,36 +19,13 @@
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 style="width: 100%;">
-=======
-              <el-date-picker
-                v-model="queryParams.startTime"
-                type="date"
-                placeholder="选择日期"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                style="width: 100%"
-              >
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item>
-<<<<<<< HEAD
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-=======
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                
-                @click="handleQuery"
-                >查询</el-button
-              >
-              <el-button icon="el-icon-refresh"  @click="resetQuery"
-                >重置</el-button
-              >
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
             </el-form-item>
           </el-col>
         </el-row>
@@ -85,11 +52,7 @@
         >
       </div>
       <el-table v-loading="loading" :data="postList">
-<<<<<<< HEAD
         <el-table-column type="selection" width="55" align="center" /> -->
-=======
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
         <el-table-column label="序号" align="center">
           <template slot-scope="scope">
             <span>{{ scope.$index + 1 }}</span>
@@ -121,11 +84,7 @@
               >删除</el-button
             >
             <el-button
-<<<<<<< HEAD
               size="mini"
-=======
-              
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
               type="text"
               style="color: #409eff"
               @click="handleExport(scope.row.id)"
@@ -292,7 +251,6 @@
                   label="项目名称"
                   align="center"
                 ></el-table-column>
-<<<<<<< HEAD
                 <el-table-column
                   prop="xzfl"
                   label="现状分类"
@@ -300,14 +258,6 @@
                 >
                   <template slot-scope="scope">
                     <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl"/>
-=======
-                <el-table-column prop="xzfl" label="现状分类" align="center">
-                  <template slot-scope="scope">
-                    <dict-tag
-                      :options="dict.type.xzfl"
-                      :value="scope.row.xzfl"
-                    />
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -453,11 +403,7 @@ export default {
     FileUpload,
   },
   // 声明需要使用的字典
-<<<<<<< HEAD
   dicts: ['xzfl'],
-=======
-  dicts: ["xzfl"],
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
   data() {
     return {
       queryParams: {
@@ -612,11 +558,7 @@ export default {
       this.editingHandbook = null;
       this.selectedProjectIds = [];
       this.selectedProjects = [];
-<<<<<<< HEAD
       this.projectParams.pageNum = 1 ;
-=======
-      this.projectParams.pageNum = 1;
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
       this.getProjectList();
     },
     handleAddDialogClose(done) {
@@ -686,11 +628,7 @@ export default {
     handleRowClick(row) {
       this.$refs.projectTable.toggleRowSelection(row);
       const selectedRows = this.$refs.projectTable.selection;
-<<<<<<< HEAD
       const isSelected = selectedRows.some(item => item.id === row.id);
-=======
-      const isSelected = selectedRows.some((item) => item.id === row.id);
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
       if (isSelected) {
         // 如果是选中状态，添加到已选项目中
         if (!this.selectedProjectIds.includes(row.id)) {
@@ -699,17 +637,8 @@ export default {
         }
       } else {
         // 如果是取消选中，从已选项目中移除
-<<<<<<< HEAD
         this.selectedProjectIds = this.selectedProjectIds.filter(id => id !== row.id);
         this.selectedProjects = this.selectedProjects.filter(item => item.id !== row.id);
-=======
-        this.selectedProjectIds = this.selectedProjectIds.filter(
-          (id) => id !== row.id
-        );
-        this.selectedProjects = this.selectedProjects.filter(
-          (item) => item.id !== row.id
-        );
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
       }
     },
 
@@ -743,11 +672,7 @@ export default {
       if (!this.$refs.projectTable) return;
       this.$refs.projectTable.clearSelection();
       if (!this.selectedProjectIds.length) return;
-<<<<<<< HEAD
       
-=======
-
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
       this.projectList.forEach((row) => {
         if (this.selectedProjectIds.includes(row.id)) {
           this.$refs.projectTable.toggleRowSelection(row, true);
@@ -797,16 +722,10 @@ export default {
     },
     // 处理单个项目选择事件
     handleSelect(selection, row) {
-<<<<<<< HEAD
       
       // 检查是选中还是取消选中
       const isSelected = selection.some(item => item.id === row.id);
       
-=======
-      // 检查是选中还是取消选中
-      const isSelected = selection.some((item) => item.id === row.id);
-
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
       if (isSelected) {
         // 如果是选中，添加到已选列表中
         if (!this.selectedProjectIds.includes(row.id)) {
@@ -815,7 +734,6 @@ export default {
         }
       } else {
         // 如果是取消选中，从已选列表中移除
-<<<<<<< HEAD
         this.selectedProjectIds = this.selectedProjectIds.filter(id => id !== row.id);
         this.selectedProjects = this.selectedProjects.filter(item => item.id !== row.id);
       }
@@ -827,43 +745,19 @@ export default {
       // 获取当前页面所有项目ID
       const currentPageIds = this.projectList.map(item => item.id);
       
-=======
-        this.selectedProjectIds = this.selectedProjectIds.filter(
-          (id) => id !== row.id
-        );
-        this.selectedProjects = this.selectedProjects.filter(
-          (item) => item.id !== row.id
-        );
-      }
-    },
-
-    // 处理全选/取消全选事件
-    handleSelectAll(selection) {
-      // 获取当前页面所有项目ID
-      const currentPageIds = this.projectList.map((item) => item.id);
-
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
       // 检查是全选还是取消全选
       if (selection.length === 0) {
         // 取消全选 - 从已选列表中移除当前页所有项目
         this.selectedProjectIds = this.selectedProjectIds.filter(
-<<<<<<< HEAD
           id => !currentPageIds.includes(id)
         );
         this.selectedProjects = this.selectedProjects.filter(
           project => !currentPageIds.includes(project.id)
-=======
-          (id) => !currentPageIds.includes(id)
-        );
-        this.selectedProjects = this.selectedProjects.filter(
-          (project) => !currentPageIds.includes(project.id)
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
         );
       } else {
         // 全选 - 将当前页所有项目添加到已选列表
         // 先移除当前页已有的选择，避免重复
         const projectIdsNotInCurrentPage = this.selectedProjectIds.filter(
-<<<<<<< HEAD
           id => !currentPageIds.includes(id)
         );
         const projectsNotInCurrentPage = this.selectedProjects.filter(
@@ -873,23 +767,6 @@ export default {
         // 合并不在当前页的选择和当前页所有项目
         this.selectedProjectIds = [...projectIdsNotInCurrentPage, ...currentPageIds];
         this.selectedProjects = [...projectsNotInCurrentPage, ...this.projectList];
-=======
-          (id) => !currentPageIds.includes(id)
-        );
-        const projectsNotInCurrentPage = this.selectedProjects.filter(
-          (project) => !currentPageIds.includes(project.id)
-        );
-
-        // 合并不在当前页的选择和当前页所有项目
-        this.selectedProjectIds = [
-          ...projectIdsNotInCurrentPage,
-          ...currentPageIds,
-        ];
-        this.selectedProjects = [
-          ...projectsNotInCurrentPage,
-          ...this.projectList,
-        ];
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
       }
     },
     // 编辑按钮操作
@@ -908,19 +785,11 @@ export default {
             imageUrl: detail.tailingImg,
             subtitle: detail.tail,
           };
-<<<<<<< HEAD
           
           // 先清空选中状态
           this.selectedProjectIds = [];
           this.selectedProjects = [];
           
-=======
-
-          // 先清空选中状态
-          this.selectedProjectIds = [];
-          this.selectedProjects = [];
-
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
           if (detail.xmId) {
             const projectIds = detail.xmId.split(",");
             this.selectedProjectIds = projectIds.map((id) => Number(id));
@@ -928,11 +797,7 @@ export default {
             if (detail.projectName && Array.isArray(detail.projectName)) {
               this.selectedProjects = detail.projectName;
             }
-<<<<<<< HEAD
             this.projectParams.pageNum = 1 ;
-=======
-            this.projectParams.pageNum = 1;
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
             this.getProjectList();
           }
 
@@ -992,11 +857,7 @@ export default {
 .tablebtntwo {
   width: 100%;
   display: flex;
-<<<<<<< HEAD
-  justify-content: right;
-=======
   justify-content: left;
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
   margin: 10px 0 20px;
 }
 
@@ -1268,20 +1129,12 @@ export default {
   transition: all 0.3s;
   margin-right: 30px;
   ::v-deep .el-input {
-<<<<<<< HEAD
     flex: 1!important;
     max-width: 100%!important;
     
   }
   ::v-deep .el-input__inner {
     width: 100%!important;
-=======
-    flex: 1 !important;
-    max-width: 100% !important;
-  }
-  ::v-deep .el-input__inner {
-    width: 100% !important;
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
   }
   &:hover {
     box-shadow: 0 0 0 1px #409eff;
@@ -1348,19 +1201,11 @@ export default {
   background-color: #f8f8f8;
   border-radius: 4px;
   position: relative;
-<<<<<<< HEAD
   transition: all 0.2s;
   
   &:hover {
     background-color: #f0f0f0;
     
-=======
-  // transition: all 0.2s;
-
-  &:hover {
-    background-color: #f0f0f0;
-
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
     .remove-btn {
       opacity: 1;
     }
@@ -1386,19 +1231,11 @@ export default {
   color: #909399;
   padding: 2px;
   margin-left: 8px;
-<<<<<<< HEAD
   
   &:hover {
     color: #F56C6C;
     opacity: 1;
     transform: scale(1.1);
-=======
-
-  &:hover {
-    color: #f56c6c;
-    opacity: 1;
-    // transform: scale(1.1);
->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68
   }
 }