202305091112

src/views/data/edit/index.vue

@@ -153,8 +153,10 @@ const queryData = reactive({
   T_task_id: task.T_task_id,
   T_sn: '',
   T_id: '',
-  Time_start: '2023-02-06 21:00',
-  Time_end: '2023-02-06 21:10',
+  // Time_start: '2023-02-06 21:00',
+  // Time_end: '2023-02-06 21:10',
+  Time_start: '',
+  Time_end: '',
   page: 1,
   page_z: 9999999,
 });
@@ -307,6 +309,7 @@ const time = ref('');
 const selectedValue = ref([]);
 // 选项组的值改变时的回调
 const handleCheckValues = async (values, meta) => {
+  console.log('单选',values, meta)
   selectedValue.value = values;
   const classInfo = classList.value.find((item) => item.T_id === meta.value);
   queryData.T_id = classInfo.T_id;

src/views/report/audit/TabFour.vue

@@ -14,12 +14,7 @@
       type="datetimerange"
       format="yyyy-MM-dd HH:mm"
       :time-picker-props="{ format: 'HH:mm' }"
-      @update:formatted-value="
-        (value) => {
-          queryData.Time_start = value[0];
-          queryData.Time_end = value[1];
-        }
-      "
+      @update:formatted-value="packFun"
       clearable
     />
     <n-button type="primary" @click="extractTask">搜索</n-button>
@@ -37,7 +32,7 @@
 </template>
 
 <script setup>
-import { extractTaskData } from '@/api';
+import { getTaskDataList } from '@/api';
 
 const props = defineProps({
   task: {
@@ -45,12 +40,24 @@ const props = defineProps({
     default: {},
   },
 });
-
+const packFun = (value)=>{
+  if(value){
+    queryData.Time_start = value[0];
+    queryData.Time_end = value[1];
+  }else{
+    queryData.Time_start = null;
+    queryData.Time_end = null;
+  }
+}
 // 查询参数
 const queryData = reactive({
   T_task_id: props.task.T_task_id,
+  T_id:'',
+  T_sn:'',
   Time_start: null,
   Time_end: null,
+  page: 1,
+  page_z: 10
 });
 
 // 列表
@@ -89,8 +96,9 @@ const pagination = reactive({
   pageSize: queryData.page_z,
   itemCount: 0,
   onChange: (page) => {
-    pagination.page = page;
+    pagination.page = page
     queryData.page = page;
+    extractTask()
   },
 });
 
@@ -98,14 +106,10 @@ const pagination = reactive({
 const extractTask = async () => {
   try {
     loading.value = true;
-    const { data: res } = await extractTaskData({
-      T_task_id: queryData.T_task_id,
-      T_id:queryData.T_id,
-      T_sn:queryData.T_sn,
-      Time_start: queryData.Time_start,
-      Time_end: queryData.Time_end,
-    });
-    dataList.value = res.Data || [];
+    const { data: res } = await getTaskDataList(queryData);
+    console.log('数据',res)
+    dataList.value = res.Data.List || [];
+    pagination.itemCount = res.Data.Num
   } catch (error) {
     console.log(error);
   } finally {

src/views/report/create/index.vue

@@ -59,8 +59,7 @@
             />
           </div>
         </template>
-        <div  class=" pis"
-          style="overflow:auto;height:200px;" ref="scrollbarRef"
+        <div  class=" pis" style="overflow:auto;height:200px;" ref="scrollbarRef"
         >
          <div class="flex" v-for="(item, index) of items" :key="index"> <!-- items -->
             <n-badge class="mr-5" type="info" :value="index + 1" />
@@ -187,7 +186,7 @@ const editTaskInfo = async () => {
 
 // 验证报告生成 报告
 const generateReportInfo = async (obj) => {
-  // return
+  console.log('提交',obj)
   const { data: res } = await generateReport({
     T_task_id: task.T_task_id,
     T_VerifyTemplate_id: task.T_VerifyTemplate_id,
@@ -361,8 +360,9 @@ const putTemplateData = async () => {
     
     if (res.Code === 200) {
       const obj = {};
-      console.log('打印arr',arr)
+      
       for (let i of arr) {
+        console.log('打印arr',i)
         if (i.T_label === 3 || i.T_label === 9) {          
           obj[i.T_name] = i.T_value!=null?i.T_value.join('|'):'';
         } else if (i.T_label === 12 ) {
@@ -381,11 +381,16 @@ const putTemplateData = async () => {
             console.log('打印arr22222',obj[i.T_name])
           }
         } else if (i.T_label === 13) {    
-          if(i.T_value[0]!=null && i.T_value[1]!=null){
+          console.log('等于时间',i.T_value[0]!=null , i.T_value[1]!=null)
+          if(i.T_value[0]!=null && i.T_value[1]!=null){//两个都有值
+            obj[i.T_name] = `${i.T_value[0].join('|')+'/'+i.T_value[1]}`;
+          }else if(i.T_value[0]!=null && i.T_value[1]==null){//选择了时间-没文本
+            obj[i.T_name] = `${i.T_value[0].join('|')+'/'}`;
+          }else if(i.T_value[0]==null && i.T_value[1]!=null){
+            obj[i.T_name] = `${'/'+i.T_value[1]}`;
+          }else{//都没选
             obj[i.T_name] = ''
-          }else{
-            obj[i.T_name] = `${i.T_value[0]==null?'':i.T_value[0].join('|')+'/'+i.T_value[1]==null?'':i.T_value[1]}`;
-          }      
+          }
         } else {
           obj[i.T_name] = i.T_value;
         }

src/views/scheme/index.vue

@@ -48,22 +48,18 @@
                   ? 'success'
                   : 'error'
               "
-              type="dashboard"
+              type="line"
               gap-position="bottom"
               :percentage="keyInfo.Schedule"
             />
           </div>
-        </template>
-        <n-scrollbar
-          style="max-height: 300px"
-          trigger="none"
-          ref="scrollbarRef"
-        >
-          <div class="flex" v-for="(item, index) of items" :key="index">
+        </template> 
+        <div  class=" pis" style="overflow:auto;height:200px;" ref="scrollbarRef" >
+         <div class="flex" v-for="(item, index) of items" :key="index"> <!-- items -->
             <n-badge class="mr-5" type="info" :value="index + 1" />
             <span>{{ item }}</span>
           </div>
-        </n-scrollbar>
+        </div>
       </n-card>
     </template>
     <template #action>
@@ -201,10 +197,16 @@ const generateSchemeInfo = async (obj) => {
 
 let timer = 0;
 const keyInfo = ref({});
+
 const items = computed(() => {
-  return keyInfo.value.Item
-    ? keyInfo.value.Item.split('\n').filter((item) => item)
-    : [];
+  if(keyInfo.value.Item){
+    nextTick(()=>{
+      scrollbarRef.value.scrollTop = scrollbarRef.value.scrollHeight
+    })
+    return keyInfo.value.Item.split('\n').filter((item) => item) 
+  }else{
+    return [];
+  }
 });
 // 验证报告生成 获取生成结果
 const generateKeyInfo = async (key) => {