yangjun
/
dbsd_kczx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2024-10-17 11:00:48 +08:00
parent 0d42134f8c
commit a7c11a3ec6
7 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Form/src/jeecg/components/JEditor2.vue
View File

@ -1,5 +1,5 @@
<template>
<Tinymce v-bind="bindProps" @change="onChange" />
<Tinymce v-bind="bindProps" @change="onChange" style="margin-top: 40px;" />
</template>
<script lang="ts">

14
src/components/Tinymce/src/Editor2.vue
View File

@ -1,20 +1,12 @@
<template>
<div :class="prefixCls" :style="{ width: containerWidth }">
<ImgUpload
:fullscreen="fullscreen"
@uploading="handleImageUploading"
@done="handleDone"
v-if="showImageUpload"
v-show="editorRef"
:disabled="disabled"
/>
<textarea :id="tinymceId" ref="elRef" :style="{ visibility: 'hidden' }" v-if="!initOptions.inline"></textarea>
<slot v-else></slot>
</div>
</template>
<script lang="ts">
import type { Editor, RawEditorSettings } from 'tinymce2';
import type { Editor, RawEditorSettings } from 'tinymce';
import tinymce from 'tinymce/tinymce';
import { defineComponent, computed, nextTick, ref, unref, watch, onDeactivated, onBeforeUnmount } from 'vue';
import ImgUpload from './ImgUpload.vue';
@ -39,11 +31,11 @@
toolbar: {
type: [Array as PropType<string[]>, String],
default: toolbar,
default: simpleToolbar,
},
plugins: {
type: Array as PropType<string[]>,
default: plugins,
default: simplePlugins,
},
menubar: {
type: [Object, String],

2
src/components/Tinymce/src/tinymce.ts
View File

@ -27,7 +27,7 @@ export const plugins = [
// 'fullscreen code preview | undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight|subscript superscript blockquote| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | insertfile image media pageembed link anchor codesample insertdatetime hr| a11ycheck ltr rtl';
export const toolbar =
'bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | insertfile image media pageembed link anchor codesample insertdatetime hr| a11ycheck ltr rtl';
'bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify ';
// fullscreen code preview | undo redo |
export const simplePlugins = ['lists image link media table textcolor wordcount contextmenu fullscreen'];

7
src/components/Tinymce/src/tinymce2.ts
View File

@ -26,11 +26,12 @@ export const plugins = [
// export const toolbar =
// 'fullscreen code preview | undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight|subscript superscript blockquote| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | insertfile image media pageembed link anchor codesample insertdatetime hr| a11ycheck ltr rtl';
export const toolbar =
'';
export const toolbar =
'bold italic underline strikethrough | insertfile image media pageembed link | alignleft aligncenter alignright alignjustify | outdent indent lineheight| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | anchor codesample insertdatetime hr| a11ycheck ltr rtl';
// fullscreen code preview | undo redo |
export const simplePlugins = ['lists image link media table textcolor wordcount contextmenu fullscreen'];
export const simplePlugins = ['lists insertfile image link table textcolor wordcount contextmenu fullscreen'];
export const simpleToolbar = [
'lists link unlink image media table removeformat fullscreen',

2
src/views/kc/wjxCswj/WjxCywjV2Dtjg.vue
View File

@ -50,7 +50,7 @@
>
<a-col :span="8" style="color: #f56c6c; display: flex; flex-direction: column; text-align: left; font-size: 12px"
><span style="font-weight: bold; font-size: 20px; margin-left: 5px">{{ item.dcrs }}</span
>{{ item.wjType != '8' ? '未批阅人数' : '答错人数' }}</a-col
>{{ item.wjType != '8' ? '答错人数' : '未批阅人数' }}</a-col
>
</a-row>
</template>

8
src/views/kc/wjxWjxx/components/ZgtpfForm.vue
View File

@ -62,15 +62,15 @@
@change="emitChange(item)"
/>
</div>
<div style="text-align: center; margin-top: 20px">
<a-button type="primary" @click="submitForm">保存</a-button>
<a-button type="primary" @click="submitNextForm" style="margin-left: 10px">保存并下一个</a-button>
</div>
</a-col>
</a-row>
</a-card>
</div>
</div>
<div style="text-align: center; margin-top: 20px">
<a-button type="primary" @click="submitForm">保存</a-button>
<a-button type="primary" @click="submitNextForm" style="margin-left: 10px">保存并下一个</a-button>
</div>
</a-col>
</a-row>
</a-spin>

6
src/views/site/common/video/videojs/viewPage.vue
View File

@ -231,6 +231,8 @@ function handleBaocuo(item) {
const listTkjlApi = (params) => defHttp.get({ url: '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId', params });
function funpingjia(record) {
console.log('11111--------->',record)
console.log('222--------->',record.szkc)
var item = { ketangbiaoid: record.id };
let userid = getUserId();
listTkjlApi({ userid: userid, ketangbiaoid: item.ketangbiaoid }).then((res) => {
@ -250,11 +252,11 @@ function funpingjia(record) {
});
} else {
// tingKeZuJiAddModal.value.view(item);
tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })
tingKeZuJiAddModal.value.view({ ketangbiaoid: route.query.ktId,szkc:record.szkc })
}
} else {
// tingKeZuJiAddModal.value.view(item);
tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })
tingKeZuJiAddModal.value.view({ ketangbiaoid: route.query.ktId,szkc:record.szkc })
}
});
}