SanHQin пре 1 недеља
родитељ
комит
bfb15ca173

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.379faa5383b4896a656d08199686812a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.14d370fd6a32cd0c3c73.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.c7a38fd794e93d1de287553debc8b32d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.abe089be1d1f52eee3a2.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/css/app.c7a38fd794e93d1de287553debc8b32d.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/css/app.c7a38fd794e93d1de287553debc8b32d.css.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/app.abe089be1d1f52eee3a2.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/app.abe089be1d1f52eee3a2.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 4 - 4
src/components/pages/liyuan/page/teadTest.vue

@@ -61,14 +61,14 @@
                                 <div class="utime">
                                     <span>{{ test.utime }}</span>
                                 </div>
-                                <div class="mask" v-if="!test.isReview">
-                                    <div @click="doTest(test.courseid, test.id)">
+                                <div class="mask">
+                                    <div @click="doTest(test.courseid, test.id)"  v-if="!test.isReview">
                                         <span>编辑</span>
                                     </div>
-                                    <div @click="deleteTest(test.id)" class="delete">
+                                    <div @click="deleteTest(test.id)" class="delete"  v-if="!test.isReview">
                                         <span>删除</span>
                                     </div>
-                                    <div @click="changeName(test.courseid,test.id)">
+                                    <div @click="changeName(test.courseid,test.id)" v-if="!test.isReview">
                                         <span>重命名</span>
                                     </div>
                                 </div>

+ 7 - 7
src/components/pages/test/check/index.vue

@@ -1579,7 +1579,7 @@
                   <el-button
                     @click="editTest(scope.row)"
                     type="primary"
-                    v-if="((examineData && examineData.type == 1) || !examineData) && review !='1'"
+                    v-if="((examineData && examineData.type == 1) || !examineData) && review !='1' && scope.row.isReview!=1"
                     size="small"
                     >编辑</el-button
                   >
@@ -1600,7 +1600,7 @@
                     @click="deleteTest(scope.row.id)"
                     type="primary"
                     size="small"
-                    v-if="((examineData && examineData.type == 1) || !examineData) && review !='1'"
+                    v-if="((examineData && examineData.type == 1) || !examineData) && review !='1' && scope.row.isReview!=1"
                     >删除</el-button
                   >
                 </template>
@@ -2492,9 +2492,9 @@ export default {
            for (let index = 0; index < kpl.length; index++) {
               if (kpl[index].type == 3 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
                 if (kpl[index].json.answer2) {
-                  userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)   
+                  userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
                 }else{
-                  userWork.push(kpl[index].json.title +':'+ '')   
+                  userWork.push(kpl[index].json.title +':'+ '')
                 }
               }
               if (kpl[index].type == 5 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
@@ -2705,9 +2705,9 @@ ${JSON.stringify(forAllList)}
           for (let index = 0; index < kpl.length; index++) {
               if (kpl[index].type == 3 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
                 if (kpl[index].json.answer2) {
-                  userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)   
+                  userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
                 }else{
-                  userWork.push(kpl[index].json.title +':'+ '')   
+                  userWork.push(kpl[index].json.title +':'+ '')
                 }
               }
               if (kpl[index].type == 5 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
@@ -2945,7 +2945,7 @@ ${JSON.stringify(forAllList)}
       // jiu评分
       scoArr = this.scoListCopy.filter(item => !ids1.includes(item.id));
       // console.log('scoArr',JSON.parse(JSON.stringify('scoArr')));
-      
+
 
       scoArr = [...this.scoList,...scoArr]
 

+ 25 - 23
src/components/pages/test/examine/conpoments/personPage.vue

@@ -395,6 +395,7 @@
 
 <script>
 import shareBox from "./shareBox/index";
+import XLSX from 'xlsx-js-style'
 export default {
   directives: {
     stopMousewheel: {
@@ -547,10 +548,12 @@ export default {
     let headers = [
       ['一级指标', '二级指标', '评价方法', '分值', '自评', '自评概述', '认定', '认定概述']
     ];
-     var XLSX = require("xlsx");
+    let info = [['姓名:'+this.digUsername ,'','','','','自评分数:'+this.DigSelfSco,'','认定分数:'+this.computedSco]]
+    //  var XLSX = require("xlsx");
      let data = [
+      ...info,
       ...headers,
-      ...this.PageBaseData.flatMap(parent =>
+      ...this.PageBaseData.flatMap(parent => 
         parent.children.map(child => [
           parent.name, // 一级指标
           child.name,  // 二级指标
@@ -581,19 +584,13 @@ const commonStyle = {
   }
 };
 
-// 定义表头特殊样式
-const headerStyle = {
-  ...commonStyle,
-  fill: { fgColor: { rgb: "FFFF00" } },
-  font: { ...commonStyle.font, bold: true, sz: 14 }
-};
 
 // 应用样式到所有单元格
 for (let r = 0; r < data.length; ++r) {
   for (let c = 0; c < data[r].length; ++c) {
     const cellRef = XLSX.utils.encode_cell({ r, c });
     ws[cellRef] = ws[cellRef] || {};
-    ws[cellRef].s = r === 0 ? headerStyle : commonStyle;
+    ws[cellRef].s =  commonStyle;
   }
 }
 
@@ -611,17 +608,17 @@ ws['!cols'] = [
 
 // 设置行高
 ws['!rows'] = [
-    { hpx: 30 }, // 表头行
+    { hpx: 25 }, // 表头行
     { hpx: 25 }, // 其他行的默认高度
     // 根据需要继续添加行高设置
 ];
-    console.log('kk',data);
+  console.log('kk',data);
     // 合并单元格
   ws['!merges'] = [];
 
 
   // 记录合并单元格的逻辑
-  let startRow = 1; // 数据开始行
+  let startRow = 2; // 数据开始行
   let previousParentName = null;
   let count = 0; // 计数连续相同的一级指标行
 
@@ -644,15 +641,20 @@ ws['!rows'] = [
 
       previousParentName = currentParentName; // 更新前一个一级指标
   }
-
-      // 检查最后一组
-      if (count > 0) {
-          ws['!merges'].push({
-              s: { r: startRow, c: 0 },
-              e: { r: startRow + count, c: 0 }
-          });
-      }
-
+  ws['A1'].s = { alignment: { horizontal: 'left' } }
+  ws['F1'].s = { alignment: { horizontal: 'left' } }
+  ws['H1'].s = { alignment: { horizontal: 'left' } }
+  // 检查最后一组
+  if (count > 0) {
+      ws['!merges'].push({
+          s: { r: startRow, c: 0 },
+          e: { r: startRow + count, c: 0 }
+      });
+  }
+  ws['!merges'].push( { s: { r: 0, c: 0 }, e: { r: 0, c: 4 } },  // 合并姓名部分(A1-E1)
+    { s: { r: 0, c: 5 }, e: { r: 0, c: 6 } },  // 单独保留自评分数(G1)
+    { s: { r: 0, c: 7 }, e: { r: 0, c: 7 } }   // 单独保留认定分数(H1));
+)
 
       XLSX.utils.book_append_sheet(wb, ws, "sheet1"); //把sheet添加到workbook里,第三个参数是sheet名
       XLSX.writeFile(wb, this.digUsername +'-'+ (this.digType == 1 ? '班主任考核' :'专任教师')+".xlsx");
@@ -878,11 +880,11 @@ ws['!rows'] = [
     remindExamine() {
       this.remDig = true;
     },
-
+  
     // 下载excel
     getExcel() {
       var res = this.tableData;
-
+      
       // console.log('导出数据',res);
       //如果value的json字段的key值和想要的headers值不一致时,可做如下更改
       //将和下面的Object.fromEntries结合,将json字段的key值改变为要求的excel的header值

+ 4 - 4
src/components/pages/testPerson/test/test.vue

@@ -76,15 +76,15 @@
                             <div class="utime">
                                 <span>{{ test.utime }}</span>
                             </div>
-                            <div class="mask" v-if="!test.isReview">
-                                <div @click="doTest(test.courseid, test.id)">
+                            <div class="mask">
+                                <div @click="doTest(test.courseid, test.id)"  v-if="!test.isReview">
                                     <span>编辑</span>
                                 </div>
-                                <div @click="deleteTest(test.id)" class="delete">
+                                <div @click="deleteTest(test.id)" class="delete"  v-if="!test.isReview">
                                     <span>删除</span>
                                 </div>
 
-                                <div @click="changeName(test.courseid,test.id)">
+                                <div @click="changeName(test.courseid,test.id)"  v-if="!test.isReview">
                                     <span>重命名</span>
                                 </div>
                                 <!-- <div @click="checkTest(test.courseid, test.id)">

Неке датотеке нису приказане због велике количине промена