hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 02:46:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/components/project/ProjectLevel.vue
#	src/views/projectcenter/templateAdd.vue
This commit is contained in:
yuping
2022-12-14 17:04:34 +08:00
parent 6909dedb98 9b426e5695
commit 1ce9bf7c4d
10 changed files with 156 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/drawers/MemberList.vue
View File

@@ -239,14 +239,14 @@ export default {
// align: "center", // align: "center",
// className: "h", // className: "h",
// }, // },
{ // {
title: "进度", // title: "进度",
dataIndex: "progress", // dataIndex: "progress",
key: "progress", // key: "progress",
width: 60, // width: 60,
align: "center", // align: "center",
className: "h", // className: "h",
}, // },
{ {
title: "操作", title: "操作",
dataIndex: "operations", dataIndex: "operations",

58
src/components/project/ProjectClass.vue
View File

@@ -1,42 +1,54 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-14 15:46:36
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-14 15:47:48
* @FilePath: /fe-manage/src/components/project/ProjectClass.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<!-- 评估管理-创建评估页面 --> <!-- 评估管理-创建评估页面 -->
<template> <template>
<a-select <a-select
:getPopupContainer=" :getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="id" v-model:value="id"
placeholder="请选择分类" placeholder="请选择分类"
style="width: 100%" style="width: 100%"
:options="options" :options="options"
allowClear allowClear
@change="change" @change="change"
:disabled="disabled" :disabled="disabled"
> >
</a-select> </a-select>
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue"; import { computed, defineEmits, defineProps } from "vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
const store = useStore(); const store = useStore();
const props = defineProps({ const props = defineProps({
value: String, value: String,
disabled: String disabled: String,
}) });
const emit = defineEmits({}) const emit = defineEmits({});
const options = computed(() => store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))) const options = computed(() =>
store.state.projectClass.map((e) => ({
value: parseInt(e.dictCode),
label: e.dictName,
}))
);
const id = computed(() => { const id = computed(() => {
return props.value return props.value;
}) });
function change(key, obj) { function change(key, obj) {
emit('update:name', obj[0]) emit("update:name", obj[0]);
emit('update:value', key) emit("update:value", key);
} }
</script> </script>

59
src/components/project/ProjectLevel.vue
View File

@@ -1,27 +1,34 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-14 15:46:36
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-14 15:47:21
* @FilePath: /fe-manage/src/components/project/ProjectLevel.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template> <template>
<template v-if="tag"> <template v-if="tag">
<div>{{ options?.find(e => e.value == id)?.label || '' }}</div> <div>{{ options?.find((e) => e.value == id)?.label || "" }}</div>
</template> </template>
<template v-else> <template v-else>
<a-select <a-select
:getPopupContainer=" :getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="id" v-model:value="id"
:options="options" :options="options"
style="width: 100%" style="width: 100%"
placeholder="请选择项目级别" placeholder="请选择项目级别"
@change="change" @change="change"
:disabled="disabled" :disabled="disabled"
/> />
</template> </template>
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, defineProps} from "vue"; import { computed, defineEmits, defineProps } from "vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
const store = useStore(); const store = useStore();
const props = defineProps({ const props = defineProps({
@@ -29,20 +36,24 @@ const props = defineProps({
disabled: String, disabled: String,
tag: { tag: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}) });
const id = computed(() => { const id = computed(() => {
return props.value || null return props.value || null;
}) });
const emit = defineEmits({}) const emit = defineEmits({});
const options = computed(()=>store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName})))
const options = computed(() =>
store.state.projectLevel.map((e) => ({
value: parseInt(e.dictCode),
label: e.dictName,
}))
);
function change(key) { function change(key) {
emit('update:value', key) emit("update:value", key);
} }
</script> </script>

59
src/components/project/TrainClass.vue
View File

@@ -1,27 +1,34 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-14 15:46:36
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-14 15:47:46
* @FilePath: /fe-manage/src/components/project/TrainClass.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template> <template>
<template v-if="tag"> <template v-if="tag">
<div>{{ options.find(e => e.value == id)?.label || '' }}</div> <div>{{ options.find((e) => e.value == id)?.label || "" }}</div>
</template> </template>
<template v-else> <template v-else>
<a-select <a-select
:getPopupContainer=" :getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="id" v-model:value="id"
:options="options" :options="options"
style="width: 100%" style="width: 100%"
placeholder="请选择分类" placeholder="请选择分类"
@change="change" @change="change"
:disabled="disabled" :disabled="disabled"
/> />
</template> </template>
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue"; import { computed, defineEmits, defineProps } from "vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
const store = useStore(); const store = useStore();
@@ -30,20 +37,24 @@ const props = defineProps({
disabled: String, disabled: String,
tag: { tag: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}) });
const id = computed(() => { const id = computed(() => {
return props.value return props.value;
}) });
const emit = defineEmits({}) const emit = defineEmits({});
const options = computed(() => store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))) const options = computed(() =>
store.state.projectSys.map((e) => ({
value: parseInt(e.dictCode),
label: e.dictName,
}))
);
function change(key) { function change(key) {
emit('update:value', key) emit("update:value", key);
} }
</script> </script>

22
src/views/courselibrary/CoursewareManage.vue
View File

@@ -2119,7 +2119,7 @@
item.indexOf("-") !== -1 item.indexOf("-") !== -1
? item.slice( ? item.slice(
item.lastIndexOf("/") + 1, item.lastIndexOf("/") + 1,
item.indexOf("-") item.lastIndexOf("-")
) + item.slice(item.lastIndexOf(".")) ) + item.slice(item.lastIndexOf("."))
: item : item
}} }}
@@ -3274,16 +3274,16 @@ const columns7 = [
return text ? text : "-"; return text ? text : "-";
}, },
}, },
// { // {
// title: "岗位", // title: "岗位",
// width: 300, // width: 300,
// dataIndex: "postion", // dataIndex: "postion",
// key: "3", // key: "3",
// align: "center", // align: "center",
// customRender: ({ text }) => { // customRender: ({ text }) => {
// return text ? text : "-"; // return text ? text : "-";
// }, // },
// }, // },
{ {
title: "Band", title: "Band",
width: 200, width: 200,

10
src/views/courselibrary/components/seeModal.vue
View File

@@ -224,7 +224,7 @@
item.indexOf("-") !== -1 item.indexOf("-") !== -1
? item.slice( ? item.slice(
item.lastIndexOf("/") + 1, item.lastIndexOf("/") + 1,
item.indexOf("-") item.lastIndexOf("-")
) + item.slice(item.lastIndexOf(".")) ) + item.slice(item.lastIndexOf("."))
: item : item
}} }}
@@ -410,8 +410,14 @@ export default defineComponent({
], ],
}, },
], ],
ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
}); });
console.log("detail", props.detail);
// item.slice(
// item.lastIndexOf("/") + 1,
// item.indexOf("-")
// ) + item.slice(item.lastIndexOf("."))
const filterTxt = (txt) => { const filterTxt = (txt) => {
if (txt) { if (txt) {
return txt; return txt;

16
src/views/learningpath/LevelAdd.vue
View File

@@ -1499,14 +1499,14 @@ export default {
align: "center", align: "center",
className: "h", className: "h",
}, },
{ // {
title: "进度", // title: "进度",
dataIndex: "jin", // dataIndex: "jin",
key: "jin", // key: "jin",
width: 110, // width: 110,
align: "center", // align: "center",
className: "h", // className: "h",
}, // },
{ {
title: "开始时间", title: "开始时间",
dataIndex: "time", dataIndex: "time",

16
src/views/learningpath/LevelAddDetail.vue
View File

@@ -1547,14 +1547,14 @@ export default {
align: "center", align: "center",
className: "h", className: "h",
}, },
{ // {
title: "进度", // title: "进度",
dataIndex: "jin", // dataIndex: "jin",
key: "jin", // key: "jin",
width: 110, // width: 110,
align: "center", // align: "center",
className: "h", // className: "h",
}, // },
{ {
title: "开始时间", title: "开始时间",
dataIndex: "time", dataIndex: "time",

2
src/views/projectcenter/ProjectManage.vue
View File

@@ -1328,7 +1328,7 @@ export default {
title: "项目名称", title: "项目名称",
dataIndex: "name", dataIndex: "name",
key: "name", key: "name",
width: 480, width: 380,
// align: "center", // align: "center",
ellipsis: true, ellipsis: true,
// scopedSlots: { customRender: "action" }, //引入的插槽 // scopedSlots: { customRender: "action" }, //引入的插槽

14
src/views/projectcenter/TaskPage.vue
View File

@@ -3165,14 +3165,14 @@ export default {
// align: "center", // align: "center",
// className: "h", // className: "h",
// }, // },
{ // {
title: "进度", // title: "进度",
dataIndex: "progress", // dataIndex: "progress",
key: "progress", // key: "progress",
// width: 30, // width: 30,
align: "center", // align: "center",
className: "h", // className: "h",
}, // },
// { // {
// title: "证书", // title: "证书",
// dataIndex: "diploma", // dataIndex: "diploma",