Jelajahi Sumber

Merge branch 'develop3.0-tmd' into develop3.0

CrazyIter_Bin 4 tahun lalu
induk
melakukan
9fd6231492

+ 2 - 2
TEAMModelOS/ClientApp/src/css/disabled-iview-form.less

@@ -47,7 +47,7 @@
     .ivu-input-disabled {
         border: none;
         background: none !important;
-        font-size: 16px !important;
+        font-size: 16px;
     }
 
     .ivu-disabled .ivu-selection {
@@ -67,7 +67,7 @@
     }
 }
 
-/*ÐÞ¸Äcursor*/
+/*�޸�cursor*/
 .text-cursor-disabled .ivu-select-disabled .ivu-select-selection, .text-cursor-disabled .ivu-input[disabled], fieldset[disabled] .ivu-input {
     cursor: text;
 }

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/teachContent.js

@@ -20,7 +20,7 @@ export default {
   tips3: 'download file',
   tips4: 'preview file',
   tips5: 'bind knowledge point',
-  tips6: 'edit name',
+  tips6: 'rename',
   tips7: 'delete file',
   tips8: 'your browser does not support video tags. ',
   trops1: 'confirm deletion',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/teachContent.js

@@ -20,7 +20,7 @@ export default {
   tips3: '下载文件',
   tips4: '预览文件',
   tips5: '绑定知识点',
-  tips6: '编辑名称',
+  tips6: '重命名',
   tips7: '删除文件',
   tips8: '您的浏览器不支持 video 标签。',
   props1: '确认删除',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/teachContent.js

@@ -20,7 +20,7 @@ export default {
   tips3: '下載檔案',
   tips4: '預覽檔案',
   tips5: '綁定知識點',
-  tips6: '編輯名稱',
+  tips6: '重命名',
   tips7: '刪除檔',
   tips8: '您的瀏覽器不支持video標籤。',
   props1: '確認删除',

+ 8 - 8
TEAMModelOS/ClientApp/src/view/learnactivity/PaperScore.vue

@@ -56,19 +56,19 @@
                             <InputNumber v-model="studentAnswer.scores[getScoreIndex(typeIndex,index)]" size="small" :formatter="value => value < 0 ? '' : `${value}分`" :parser="value => value.replace('分', '')" :min="0" :max="item.score" placeholder="0分" class="score-input" />
                             <!-- 快速打分 满分 零分 -->
                             <div style="display:flex;justify-content: space-evenly;margin-top:5px;">
-                                <span class="fast-score-tag" title="满分" @click="fastSetScore((typeIndex + index),item.score)">
+                                <span class="fast-score-tag" title="满分" @click="fastSetScore((getScoreIndex(typeIndex,index)),item.score)">
                                     <!-- 题目分数 -->{{item.score}}
                                 </span>
-                                <span class="fast-score-tag" title="零分" @click="fastSetScore((typeIndex + index),0)" style="background:#ed4014">
+                                <span class="fast-score-tag" title="零分" @click="fastSetScore((getScoreIndex(typeIndex,index)),0)" style="background:#ed4014">
                                     0
                                 </span>
                             </div>
                             <!-- 加分 减分 -->
                             <div style="display:flex;justify-content: space-evenly;margin-top:5px;">
-                                <span class="fast-score-tag" @click="scoreUp((typeIndex + index),item.score)">
+                                <span class="fast-score-tag" @click="scoreUp((getScoreIndex(typeIndex,index)),item.score)">
                                     <Icon type="md-add" />
                                 </span>
-                                <span class="fast-score-tag" @click="scoreDown(typeIndex + index)" style="background:#ed4014">
+                                <span class="fast-score-tag" @click="scoreDown(getScoreIndex(typeIndex,index))" style="background:#ed4014">
                                     <Icon type="md-remove" />
                                 </span>
                             </div>
@@ -180,19 +180,19 @@
                                 <InputNumber v-model="studentAnswer.scores[getScoreIndex(typeIndex,index,childIndex)]" size="small" :formatter="value => value < 0 ? '' : `${value}分`" :parser="value => value.replace('分', '')" :min="0" :max="childItem.score" placeholder="0分" class="score-input" />
                                 <!-- 快速打分 满分 零分 -->
                                 <div style="display:flex;justify-content: space-evenly;margin-top:5px;">
-                                    <span class="fast-score-tag" title="满分" @click="fastSetScore((typeIndex + index + childIndex),childItem.score)">
+                                    <span class="fast-score-tag" title="满分" @click="fastSetScore((getScoreIndex(typeIndex,index,childIndex)),childItem.score)">
                                         <!-- 题目分数 -->{{childItem.score}}
                                     </span>
-                                    <span class="fast-score-tag" title="零分" @click="fastSetScore((typeIndex + index + childIndex),0)" style="background:#ed4014">
+                                    <span class="fast-score-tag" title="零分" @click="fastSetScore((getScoreIndex(typeIndex,index,childIndex)),0)" style="background:#ed4014">
                                         0
                                     </span>
                                 </div>
                                 <!-- 加分 减分 -->
                                 <div style="display:flex;justify-content: space-evenly;margin-top:5px;">
-                                    <span class="fast-score-tag" @click="scoreUp((typeIndex + index + childIndex),item.score)">
+                                    <span class="fast-score-tag" @click="scoreUp((getScoreIndex(typeIndex,index,childIndex)),item.score)">
                                         <Icon type="md-add" />
                                     </span>
-                                    <span class="fast-score-tag" @click="scoreDown(typeIndex + index + childIndex)" style="background:#ed4014">
+                                    <span class="fast-score-tag" @click="scoreDown(getScoreIndex(typeIndex,index,childIndex))" style="background:#ed4014">
                                         <Icon type="md-remove" />
                                     </span>
                                 </div>

+ 2 - 0
TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/AchievementAnalysis/EntryTables.vue

@@ -76,6 +76,8 @@
                         ],
                         filterMultiple: false,
                         filterRemote(value, row) {
+							console.log(this.getAnalysisJson)
+							console.log(value)
                             if (value === 1) {
                                 this.entryTableData = this.entryTableData.filter(item => item.score > this.getAnalysisJson.ipoint)
                             } else if (value === 2) {

+ 13 - 7
TEAMModelOS/ClientApp/src/view/teachcontent/index.less

@@ -2,8 +2,8 @@
 @second-bgColor: #1b1b1b;
 @third-bgColor: #222222;
 @borderColor: #424242;
-@primary-textColor: #fff; //文本主颜
-@second-textColor: #a5a5a5; //文本副级颜
+@primary-textColor: #fff; //锟侥憋拷锟斤拷锟斤拷
+@second-textColor: #a5a5a5; //锟侥憋拷锟斤拷锟斤拷锟斤拷
 @primary-fontSize: 14px;
 @second-fontSize: 15px;
 
@@ -254,17 +254,17 @@
             overflow-y: auto;
             background-image: linear-gradient(to bottom right, #282828, #505050);
 
-            &::-webkit-scrollbar { /*滚动条整体样式*/
-                width: 10px; /*高宽分别对应横竖滚动条的尺寸*/
+            &::-webkit-scrollbar { /*锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷式*/
+                width: 10px; /*�߿��ֱ��Ӧ�����������ijߴ�*/
                 height: 1px;
             }
 
-            &::-webkit-scrollbar-thumb { /*滚动条里面小方块*/
+            &::-webkit-scrollbar-thumb { /*锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷小锟斤拷锟斤拷*/
                 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
                 background: rgb(124,124,124);
             }
 
-            &::-webkit-scrollbar-track { /*滚动条里面轨道*/
+            &::-webkit-scrollbar-track { /*锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷*/
                 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
                 background: rgba(68,68,68,.5);
             }
@@ -432,7 +432,7 @@
 
 .file-icon {
     display: inline-block;
-
+    // vertical-align: sub;
     img {
         display: inline-block;
         margin-right: 10px;
@@ -504,3 +504,9 @@
 .binding-point{
     color:white;
 }
+
+.rename-action-icon{
+    display: inline-block;
+    margin-left: 10px;
+    cursor: pointer;
+}

+ 33 - 6
TEAMModelOS/ClientApp/src/view/teachcontent/index.vue

@@ -112,7 +112,7 @@
                                 </div>
                             </template>
                             <template slot-scope="{ row, index }" slot="name">
-                                <div>
+                                <div class="dark-iview-input disabled-iview-input teach-file-name">
                                     <div class="file-icon">
                                         <img v-if="row.extension == 'PPT' || row.extension == 'PPTX'" src="../../assets/icon/ppt50.png" width="15" />
                                         <img v-else-if="row.extension == 'DOC' || row.extension == 'DOCX'" src="../../assets/icon/word50.png" width="15" />
@@ -124,7 +124,10 @@
                                         <img v-else-if="row.type == 'res'" src="../../assets/icon/htex.png" width="15" />
                                         <img v-else src="../../assets/icon/prelearn50.png" width="15" />
                                     </div>
-                                    <span>{{row.name}}</span>
+                                    <span v-show="editIndex !== index">{{row.name}}</span>
+                                    <Input v-model="fileListShow[index].name" v-show="editIndex == index" style="width: 300px;" />
+                                    <Icon type="md-checkmark" v-show="editIndex == index" @click="confirmRename" class="rename-action-icon" />
+                                    <Icon type="md-close" v-show="editIndex == index" @click="cancelRename" class="rename-action-icon" />
                                 </div>
                             </template>
                             <template slot-scope="{ row, index }" slot="knowledges">
@@ -135,6 +138,7 @@
                                     <Icon type="md-download" size="18" color="white" :title="$t('teachContent.tips3')" @click="downloadFile(index)" />
                                     <Icon v-if="activeType !== 'other' " type="md-eye" size="18" color="white" :title="$t('teachContent.tips4')" @click="openPreviewFile(index)" />
                                     <Icon v-if="$access.can('admin.*|content-school-upd') || routerScope == 'private'" type="md-trash" size="18" color="white" :title="$t('teachContent.tips7')" @click="delFile(row,index)" />
+                                    <Icon v-if="$access.can('admin.*|content-school-upd') || routerScope == 'private'" type="md-create" size="18" color="white" :title="$t('teachContent.tips6')" @click="rename(row,index)" />
                                 </div>
                             </template>
                         </Table>
@@ -194,6 +198,7 @@ export default {
     },
     data() {
         return {
+            editIndex: -1,
             modalLoading: false,
             containerClient: undefined,
             waterfallWidth: 1000,
@@ -242,6 +247,22 @@ export default {
         }
     },
     methods: {
+        rename(row, index) {
+            this.editIndex = index
+            this.renameBefore = row.name
+        },
+        cancelRename() {
+            this.$set(this.fileListShow[this.editIndex], 'name', this.renameBefore)
+            // 解决UI不刷新问题
+            let dataTemp = JSON.stringify(this.fileListShow);
+            this.fileListShow = JSON.parse(dataTemp);
+            this.editIndex = -1
+        },
+        confirmRename(){
+            console.log(this.fileListShow[this.editIndex])
+            this.editIndex = -1
+            this.$Message.warning('暂未对接API')
+        },
         parseComplete() {
             this.modalLoading = false
             this.$refs['uploadModal'].buttonLoading = false
@@ -408,7 +429,7 @@ export default {
                     title: this.$t('teachContent.tableC4'),
                     slot: 'size',
                     key: 'size',
-                    width: 150,
+                    width: 100,
                     align: 'center',
                     sortable: true
                 },
@@ -416,13 +437,14 @@ export default {
                     title: this.$t('teachContent.tableC6'),
                     slot: 'createTime',
                     key: 'createTime',
-                    width: 180,
-                    sortable: true
+                    width: 150,
+                    sortable: true,
+                    align: 'center'
                 },
                 {
                     title: this.$t('teachContent.tableC2'),
                     slot: 'action',
-                    width: 210,
+                    width: 160,
                     align: 'center'
                 }
             ]
@@ -1101,4 +1123,9 @@ export default {
 .content-file-list #loadingBox {
     margin-top: 0px !important;
 }
+.teach-file-name .ivu-input[disabled],
+.teach-file-name fieldset[disabled] .ivu-input {
+    color: white;
+    font-size: 14px;
+}
 </style>

+ 1 - 1
TEAMModelOS/ClientApp/src/view/teachermgmt/components/userList/Index.vue

@@ -228,7 +228,7 @@
       <div class="userListContent">
         <Table v-if="isMockReloadAlive" class="scrollstyle" :height="tableHeight" ref="selection" :columns="tableColumns" :data="tableData" @on-selection-change="setTeachers" @on-sort-change="changeSort">
           <template slot-scope="{ row }" slot="picture">
-            <PersonalPhoto :name="row.name" :picture="row.picture" :color="row.nameColor" />
+            <PersonalPhoto :name="row.name" :picture="row.picture" />
           </template>
           <template slot-scope="{ row }" slot="action" v-if="isOpenSpaceAuth == false">
             <icon icon="shield-alt" style="font-size: 14px; color: #fff; margin-right: 20px; cursor: pointer;" @click="showAuth(row)" />