更新新绩效系统 - 第一期需求

build/webpack.base.conf.js

@@ -25,7 +25,7 @@ module.exports = {
   resolve: {
     extensions: ['.js', '.vue', '.json'],
     alias: {
-      '@': resolve('src')
+      '@': resolve('src'),
     }
   },
   module: {
@@ -76,7 +76,19 @@ module.exports = {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
-      }
+      },
+      {
+        test: /\.(xlsx|xls)$/, // 匹配 Excel 文件
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]', // 输出文件名
+              outputPath: 'static/excels/', // 输出路径
+            },
+          },
+        ],
+      },
     ]
   },
   plugins: [new VueLoaderPlugin()],

src/newPerformance/components/ExamineContrast.vue

@@ -17,7 +17,7 @@
             </template>
         </div> -->
 
-        <div class="flex-box-ce" style="padding: 0 20px;">
+        <!-- <div class="flex-box-ce" style="padding: 0 20px;">
             <el-button size="mini" @click="openChooseExamineItem()" style="margin-left: auto;">查看更多</el-button>
                     :data="userList" style="width: 100%; " border stripe :header-cell-style="{ background: '#f5f7fa' }"
                     v-loading="loading" :height="500">
@@ -39,7 +39,7 @@
                     <vue2-org-tree :data="treeData" style="margin: 0 auto !important;" />
                 </div>
             </el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
 
         <el-dialog title="请选择需要对比的考核列表" center :visible.sync="dialogVisible" width="600px"
             :before-close="dialogBeforeClose">

src/newPerformance/components/PublicComp/ShowHanderDialog.vue

@@ -233,7 +233,6 @@ export default {
                 flex-direction: column;
                 border: 1px solid #f7f7f7;
                 .value-box {
-<<<<<<< HEAD
                     width: 100%;
                     
                     .base-info {
@@ -262,12 +261,6 @@ export default {
                             }
                         }
                     }
-=======
-                    display: flex;
-                    align-items: center;
-                    justify-content: space-between;
-                    width: 100%;
->>>>>>> c23c758ac5b114f2e4b714b9a5908ff46553bd90
                 }
             }
             

src/newPerformance/components/TemplateDetails/HandleNode.vue

@@ -608,10 +608,6 @@ export default {
                 }
 
             }
-<<<<<<< HEAD
-=======
-            console.log(data)
->>>>>>> c23c758ac5b114f2e4b714b9a5908ff46553bd90
             this.$emit("onConfirm", data);
             this.handleCloseDialog();
         },

src/performance/views/assessManagement/staffAssDet.vue

@@ -629,7 +629,6 @@
 
     <TargetListComp v-if="dialogVisible" :dialogVisible="dialogVisible" :ids="okrs" @close="closeTargetList">
     </TargetListComp>
-    <<<<<<< HEAD=======>>>>>>> c23c758ac5b114f2e4b714b9a5908ff46553bd90
       <!-- 对齐目标 -->
       <TargetSearch :visible.sync="isShowProject" @confirm="confirmProject"></TargetSearch>
   </div>