提交 a64747cf authored 作者: 王鹏飞's avatar 王鹏飞

chore: update

上级 5dabc6d8
...@@ -9,4 +9,4 @@ VITE_EXAM_SHOW_URL=https://exam-show.zijing.chat ...@@ -9,4 +9,4 @@ VITE_EXAM_SHOW_URL=https://exam-show.zijing.chat
VITE_SWSJFXS_LOGIN_URL=http://172.16.3.203:1001/swsjfxs/login/index VITE_SWSJFXS_LOGIN_URL=http://172.16.3.203:1001/swsjfxs/login/index
VITE_SYS_FLAG=chat VITE_SYS_FLAG=chat
VITE_STATIC_URL=https://saas-lab-api VITE_STATIC_URL=https://saas-lab-api
VITE_SAAS_BI_URL=https://saas-bi.ezijing.com/data/dashboard VITE_SAAS_BI_URL=http://172.16.3.203:1014/data/dashboard
...@@ -264,19 +264,8 @@ function handleEmpty(name: string) { ...@@ -264,19 +264,8 @@ function handleEmpty(name: string) {
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<<<<<<< HEAD
<el-tabs type="border-card" :key="form.experiment_id" v-model="tabActive">
<el-tab-pane label="实验试题" name="qa" lazy>
<Question :experiment_id="form.experiment_id"></Question>
</el-tab-pane>
<el-tab-pane label="理论考试" name="exam" lazy>
<Exam :experiment_id="form.experiment_id" v-model="examURL"></Exam>
</el-tab-pane>
<el-tab-pane label="实验信息" lazy>
=======
<el-tabs type="border-card" v-model="tabActive" v-if="experimentInfo"> <el-tabs type="border-card" v-model="tabActive" v-if="experimentInfo">
<el-tab-pane label="实验信息" name="info"> <el-tab-pane label="实验信息" name="info">
>>>>>>> master
<Info :data="experimentInfo"></Info> <Info :data="experimentInfo"></Info>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="案例原文" name="case" v-if="!empty.includes('case')"> <el-tab-pane label="案例原文" name="case" v-if="!empty.includes('case')">
...@@ -335,15 +324,10 @@ function handleEmpty(name: string) { ...@@ -335,15 +324,10 @@ function handleEmpty(name: string) {
<div> <div>
<!-- <el-button type="primary" v-if="appConfig.system == 'default'"> <!-- <el-button type="primary" v-if="appConfig.system == 'default'">
<router-link to="/ai" target="_blank">AI数据分析</router-link> <router-link to="/ai" target="_blank">AI数据分析</router-link>
<<<<<<< HEAD </el-button>-->
</el-button> -->
<el-button type="primary" :disabled="disabled" :loading="screenshotLoading" @click="handleCapture">截图</el-button>
=======
</el-button>
<el-button type="primary" :disabled="disabled" :loading="screenshotLoading" @click="handleCapture" <el-button type="primary" :disabled="disabled" :loading="screenshotLoading" @click="handleCapture"
>截图</el-button >截图</el-button
> >
>>>>>>> master
<el-button type="primary" :disabled="disabled" @click="prepareDialogVisible = true">实验准备</el-button> <el-button type="primary" :disabled="disabled" @click="prepareDialogVisible = true">实验准备</el-button>
<el-button type="primary" :disabled="disabled" @click="resultDialogVisible = true">实验结果</el-button> <el-button type="primary" :disabled="disabled" @click="resultDialogVisible = true">实验结果</el-button>
<el-button <el-button
......
...@@ -12,7 +12,7 @@ interface State { ...@@ -12,7 +12,7 @@ interface State {
const studentMenus: IMenuItem[] = [ const studentMenus: IMenuItem[] = [
{ name: '首页', path: '/' }, { name: '首页', path: '/' },
{ name: '我的实验', path: '/student/lab' }, { name: '我的实验', path: '/student/lab' },
{ name: '理论学习', path: import.meta.env.VITE_SAAS_LEARN_URL }, // { name: '理论学习', path: import.meta.env.VITE_SAAS_LEARN_URL },
// { name: '我的大赛', path: '/student/contest' }, // { name: '我的大赛', path: '/student/contest' },
// { name: '大赛成绩查询', path: '/student/contest/score' } // { name: '大赛成绩查询', path: '/student/contest/score' }
] ]
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论