|
@@ -11,7 +11,7 @@ import { Check } from '@element-plus/icons-vue'
|
|
|
import { number } from 'echarts';
|
|
|
import { ElMessage } from 'element-plus';
|
|
|
import { useRouter, useRoute } from 'vue-router';
|
|
|
-import { getScaleApi, queryScaleDetailApi, saveScaleApi } from '@/api/plan';
|
|
|
+import { getCurrentTimeApi, getScaleApi, queryScaleDetailApi, saveScaleApi } from '@/api/plan';
|
|
|
import { userInfoStore } from '@/stores'
|
|
|
//调用子组件的ref
|
|
|
// 加一个锁表示不能重复点击
|
|
@@ -192,8 +192,9 @@ const subScaleData = async (data: any, flag: string) => {
|
|
|
|
|
|
//开始处理数据
|
|
|
// productData()
|
|
|
+ let time = '' + startTime.value
|
|
|
let params = {
|
|
|
- beginTime: startTime.value,
|
|
|
+ beginTime: time,
|
|
|
orgName: userInfo.userInfo.orgName,
|
|
|
orgNo: userInfo.userInfo.orgNo,
|
|
|
planId: planId.value,
|
|
@@ -211,7 +212,7 @@ const subScaleData = async (data: any, flag: string) => {
|
|
|
//2.接下来查看需要看总共几个需要做的附加题---将未完成的题目---合并到一块---到时候
|
|
|
//3.判断做完的有且有多少个题目-----未做完的量表有多少个题目
|
|
|
|
|
|
-
|
|
|
+ getStartTime()
|
|
|
isLock.value = false
|
|
|
|
|
|
//判断当前 flag 是可选的三个吗
|
|
@@ -430,9 +431,11 @@ onMounted(() => {
|
|
|
|
|
|
})
|
|
|
//获取当前时间
|
|
|
-const getStartTime = () => {
|
|
|
- let date = new Date()
|
|
|
- startTime.value = format(date, "yyyy-MM-dd HH:mm:ss");
|
|
|
+const getStartTime = async () => {
|
|
|
+ let res: any = await getCurrentTimeApi();
|
|
|
+ // let date = new Date()
|
|
|
+ startTime.value = res.data;
|
|
|
+ // startTime.value = format(date, "yyyy-MM-dd HH:mm:ss");
|
|
|
}
|
|
|
|
|
|
//根据flag 获取当前的题目
|
|
@@ -626,6 +629,8 @@ onUnmounted(() => {
|
|
|
|
|
|
.xlts_img {
|
|
|
margin-right: 60px;
|
|
|
+ width: 40px;
|
|
|
+ height: 30px;
|
|
|
// width: 100px;
|
|
|
}
|
|
|
|