20230716

src/views/data/edit/ImportVue.vue

@@ -32,7 +32,7 @@ import { addTaskDatas } from '@/api';
 import { read, utils } from 'xlsx';
 import { useDateFormat } from '@vueuse/core';
 import { ref, watch } from 'vue';
-
+const emit = defineEmits(['importFiles']);
 const props = defineProps({
   task: {
     required: true,
@@ -68,6 +68,7 @@ const handleChange = async ({ file }) => {
   });
   const workSheet = workBook.Sheets[workBook.SheetNames[0]];
   dataList.value = utils.sheet_to_json(workSheet);
+  console.log('导入',dataList.value)
   dataList.value.forEach((item) => {
     item['记录时间'] = useDateFormat(
       item['记录时间'],
@@ -114,6 +115,7 @@ const submitCallback = async () => {
       sum.value += Number(resIt.data.Data)
       if(sum.value==dataList.value.length){
         message.success('数据导入完成')
+        emit('importFiles');
         // disableds.value = false
       }
     }

src/views/data/edit/editLeak.vue

@@ -6,7 +6,7 @@
 <script setup>
 import { TaskRepairSen } from '@/api';
 
-import { reactive } from 'vue'
+import { reactive} from 'vue'
 import { useMessage, useDialog } from 'naive-ui';
 import { TimeDate } from '@/plugin/timeFun.js'
 const message = useMessage();
@@ -26,7 +26,6 @@ const props = defineProps({
   }
 })
 
-
 const data = reactive({
   T_saveT: 60,
   T_task_id: '',
@@ -50,10 +49,10 @@ const showImportModal = () => {
     data.T_task_id = props.queryObj.T_task_id
     model.StartTime = new Date(props.pickleveTime[0]).getTime()
     model.EndTime = new Date(props.pickleveTime[1]).getTime()
-
+   
     dialog.warning({
       title: '提示',
-      content: `确定对${props.queryObj.Time_start}至${props.queryObj.Time_end}进行数据补漏吗？`,
+      content: `确定对${TimeDate(model.StartTime)}至${TimeDate(model.EndTime)}进行数据补漏吗？`,
       positiveText: '立即补漏',
       negativeText: '取消',
       onPositiveClick: () => {

src/views/data/edit/index.vue

@@ -71,12 +71,14 @@
           <n-space justify="space-between">
             <n-input-group>
               <n-date-picker format="yyyy-MM-dd HH:mm" v-model:value="pickTimes.pickleveTime" :time-picker-props="{ format: 'HH:mm' }" @focus="focusFun(2)" @blur="blurFun"
-              @update:formatted-value="setTimeFuns"  type="datetimerange" />
+              @update:formatted-value="setTimeFuns"  type="datetimerange" clearable/>
+
+              
               <n-button type="primary" @click=" renderFun(2) ">渲染</n-button>
             </n-input-group>
             <n-space>
               <ExportVue :queryObj=" queryData " :pickleveTime=" pickTimes.pickleveTime " :checkData=" checkValues " />
-              <ImportVue :task=" task " />
+              <ImportVue @importFiles="importFile" :task="task"/>
               <ImportPlatform :task=" task " />
               <AddVue :class-list=" classList" @addFuns="addFuns" :task=" task " />
               <SetVue />
@@ -205,6 +207,11 @@ const { height } = useWindowSize();
 const formRef = ref(null)
 const message = useMessage();
 
+const importFile = ()=>{
+  checkValues.value = []
+    dataList.value = []
+      getClassList()
+}
 const task = window.sessionStorage.getItem('task')
   ? JSON.parse(window.sessionStorage.getItem('task'))
   : {};
@@ -440,6 +447,7 @@ const convertDataFun = (array) => {
 
     events: {
       click(e) {
+        
         time.value = e.point.x
         if (tabChart.value == '温度') {
           formValue.T_t = e.point.y
@@ -455,7 +463,9 @@ const convertDataFun = (array) => {
         modal.title = tabChart.value == '温度' ? '温度' : '湿度';
         let serName = e.point.series.name
         const b = dataList.value.find(item => item.name == serName)
+        console.log('点击',b,b.data[e.point.index])
         dataInfo.value = b.data[e.point.index];
+        console.log('点击',e)
       }
     }
   }