lsc 1 년 전
부모
커밋
c469203fdc

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.61d37ec4cb459e67ad76f396418568d6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.920758910306febc0621.js></script><script type=text/javascript src=./static/js/app.f154c3372f27584ea76a.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.725ec9858001656b5f0129ad9f1b6c60.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.920758910306febc0621.js></script><script type=text/javascript src=./static/js/app.e1953cf2011094b8594d.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.725ec9858001656b5f0129ad9f1b6c60.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.725ec9858001656b5f0129ad9f1b6c60.css.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.e1953cf2011094b8594d.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.e1953cf2011094b8594d.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 1 - 1
src/components/pages/dataBoardNew/project/index.vue

@@ -187,7 +187,7 @@
               <span>{{ worksCount && allCourse ? (worksCount / allCourse).toFixed(0) : 0 }}</span>
             </div>
           </div>
-          <WorkNum v-if="shType" style="height: calc(100% - 105px)" :workNumList="workNumList" @openCours="openCourse"></WorkNum>
+          <WorkNum v-if="shType" style="height: calc(100% - 105px)" :workNumList="workNumList" @openCourse="openCourse"></WorkNum>
           <div class="otherCss">
             <div v-if="!shType">转换为散点图</div>
             <div v-if="shType">转换为堆积柱状图</div>

+ 4 - 2
src/components/pages/test/index.vue

@@ -240,7 +240,9 @@
                                     scope.row.course_teacher.indexOf(userid) !== -1) || role == '1')">编辑</el-button>
                             <el-button @click="checkToTest(scope.row.courseId)" type="text" size="small">查看</el-button>
                             <el-button @click="copyTest(scope.row.courseId)" type="text" size="small">复制</el-button>
-                            <el-button @click="shareTest(scope.row)" type="text" size="small">提醒</el-button>
+                            <el-button @click="shareTest(scope.row)" type="text" size="small" v-if="((scope.row.userid == userid) ||
+                                (scope.row.course_teacher &&
+                                    scope.row.course_teacher.indexOf(userid) !== -1) || role == '1')">提醒</el-button>
                             <el-button @click="deleteCourse(scope.row.courseId)" type="text" size="small"
                                 style="color: #EE3E3E;"
                                 v-if="((scope.row.userid == userid) ||
@@ -581,7 +583,7 @@ export default {
         },
         goToCourse2(item) {
             if (item.worksCount > 0) {
-                this.$confirm("该表单已存在数据,如果修改题目可能会导致数据错乱,是否进入编辑编辑?", "提示", {
+                this.$confirm("该表单已存在数据,如果修改题目可能会清空已提交数据,是否重新编辑?", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning",

+ 15 - 8
src/components/pages/test/shareBox/index.vue

@@ -15,7 +15,7 @@
                     <span>截止时间:</span>
                     <span>{{ testJson.overtime }}</span>
                 </div>
-                <div class="info" v-if="testJson && testJson.juriP">
+                <div class="info" v-if="testJson">
                     <span>未完成人数:</span>
                     <span>{{ noCount }}</span>
                 </div>
@@ -23,9 +23,10 @@
                     <span>已完成人数:</span>
                     <span v-html="testJson.worksPerson"></span>
                 </div>
-                <div class="info" v-if="testJson && testJson.juriP && pname.length">
+                <div class="info" v-if="pname.length">
                     <span>未完成名单:</span>
-                    <span>{{ pname.join(',') }}</span>
+                    <span>{{ pname.length > 10 ? isSuo ? pname.slice(0,10).join(',')+'...' : pname.join(',') : pname.join(',') }}</span>
+                    <span class="more" v-if="pname.length > 10" @click="isSuo = !isSuo">{{ isSuo ? '查看更多' : '收起'}}</span>
                 </div>
             </div>
             <div class="url_box">
@@ -78,7 +79,8 @@ export default {
             copyText: "",
             copyText2: "",
             noCount: 0,
-            pname:[]
+            pname:[],
+            isSuo: true
         };
     },
     methods: {
@@ -130,7 +132,7 @@ export default {
         copy2(){
             let url = "https://beta.cloud.cocorobo.cn/#/testDetail?testid=" + this.testJson.courseId
             this.copyText2 = 
-            `表单名称:${this.testJson.title}\n表单范围:${this.testJson.juriP ? this.testJson.juriP : '所有人'}\n${this.testJson.overtime ? '截止时间:'+this.testJson.overtime +'\n' : ''}${this.testJson.juriP ? '未完成人数:'+this.noCount +'\n' : ''}${this.testJson ? '已完成人数:'+this.testJson.worksPerson +'\n' : ''}${this.testJson.juriP && this.pname.length ? '未完成名单:'+this.pname.join(',') +'\n' : ''}链接提醒:${url}`;
+            `表单名称:${this.testJson.title}\n表单范围:${this.testJson.juriP ? this.testJson.juriP : '所有人'}\n${this.testJson.overtime ? '截止时间:'+this.testJson.overtime +'\n' : ''}${'未完成人数:'+this.noCount +'\n'}${this.testJson ? '已完成人数:'+this.testJson.worksPerson +'\n' : ''}${this.pname.length ? '未完成名单:'+this.pname.join(',') +'\n' : ''}链接提醒:${url}`;
             var clipboard = new Clipboard(".tag-read2");
             clipboard.on("success", (e) => {
                 this.$message.success("复制成功");
@@ -143,9 +145,9 @@ export default {
             });
         },
         getData() {
-            if(!this.testJson.juriP){
-                return;
-            }
+            // if(!this.testJson.juriP){
+            //     return;
+            // }
             let params = {
                 id: this.testJson.courseId,
             };
@@ -175,6 +177,7 @@ export default {
     watch: {
         dialogVisibleShare(newValue, oldValue) {
             if (newValue) {
+                this.isSuo = true
                 this.setQr()
                 this.getData()
                 // console.log(top.origin);
@@ -329,5 +332,9 @@ export default {
     display: flex;
     justify-content: flex-end;
 }
+
+.more{
+    cursor: pointer;
+}
 </style>
   

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.