diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index c52af5b3..a8987e13 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -52,7 +52,7 @@
+
项目说明:
+
+ {{ projectInfo.remark }}
+
+
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 5483e5a0..4cf15db6 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -29,7 +29,11 @@ import {useStore} from "vuex";
const store = useStore();
const props = defineProps({
- value: String
+ value: String,
+ disabled: {
+ type: Boolean,
+ default: false
+ }
})
const emit = defineEmits({})
@@ -38,9 +42,9 @@ const options = computed(() => store.state.orgtreeList)
const id = computed(() => {
return props.value
})
-console.log("store.state.orgtreeList",store.state.orgtreeList);
+
function change(key, obj) {
- console.log(obj[0],key,props.value);
+ console.log(obj[0], key, props.value);
emit('update:name', obj[0])
emit('update:value', key)
}
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 37dd191e..550ee7db 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -105,7 +105,7 @@
@@ -1069,11 +1075,11 @@ import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue";
import AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue";
-import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
+//import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
import AddActive from "../../components/drawers/AddActive.vue";
import AddEval from "../../components/drawers/AddEval.vue";
import AddInvist from "../../components/drawers/AddInvist.vue";
-import AddVote from "../../components/vote/AddVote.vue";
+//import AddVote from "../../components/vote/AddVote.vue";
import { message } from "ant-design-vue";
import * as api from "../../api/indexTemplate";
import draggable from "vuedraggable";
@@ -1131,11 +1137,11 @@ export default {
AddTest,
AddLive,
AddRef,
- AddDiscuss,
+ //AddDiscuss,
AddActive,
AddEval,
AddInvist,
- AddVote,
+ //AddVote,
// UnlockMode,
},
setup() {
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 526840ef..b4186361 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -82,7 +82,7 @@
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
- valueFormat="YYYY-MM-DD HH:mm:ss"
+ valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
/>