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

This commit is contained in:
yuping
2023-03-08 12:43:57 +08:00
2 changed files with 11 additions and 2 deletions

View File

@@ -192,7 +192,7 @@ function reset() {
const goResearchmanage = () => {
// router.push({ path: "/researchmanage" });
window.open(process.env.VUE_APP_BASE + "/researchmanage");
window.open(process.env.VUE_APP_BASE + "/researchmanage?openCreate=true");
};
</script>
<style lang="scss">

View File

@@ -156,7 +156,7 @@
</div>
</template>
<script setup>
import {ref} from "vue";
import {ref,onMounted} from "vue";
import {createResearch, deleteResearch, editAssessmentName, editReleaseStatus,} from "@/api/indexResearch";
import {checkPer} from "@/utils/utils";
import {Form, message} from "ant-design-vue";
@@ -275,6 +275,15 @@ const formData = ref({
validated: 0,
});
onMounted(() => {
// 是否需要触发新建弹框
let str = location.href;
let isOpen = str.includes("openCreate=true");
if(isOpen){
newNext.value = true;
}
});
const newNext = ref(false);
const dateTime = ref([]);
const nameRef = ref();