chenminghua 1 년 전
부모
커밋
911f91345f
4개의 변경된 파일81개의 추가작업 그리고 77개의 파일을 삭제
  1. BIN
      node_modules.rar
  2. 6 5
      src/api/config.js
  3. 1 1
      src/pages/dataAnalysis/bladeAnalysis/index.vue
  4. 74 71
      src/pages/dataFilter/prepare/components/search.vue

BIN
node_modules.rar


+ 6 - 5
src/api/config.js

@@ -1,11 +1,12 @@
 
 const config = {
-    // baseURL: 'http://120.46.148.180:9002',
-    // socketURL: 'ws://120.46.148.180:9002'
-    // baseURL: 'http://192.168.1.67:9002',
-    baseURL: 'http://192.168.10.7:9002',
-    socketURL: 'ws://192.168.1.67:9002' 
+    baseURL: 'http://120.46.148.180:9002',
+    socketURL: 'ws://120.46.148.180:9002',
+    // baseURL: 'http://192.168.10.7:9002',
     // socketURL: 'ws://192.168.10.7:9002'
+    // baseURL: 'http://192.168.1.67:9002',
+    // socketURL: 'ws://192.168.1.67:9002' 
+    
 }
 
 export default config;

+ 1 - 1
src/pages/dataAnalysis/bladeAnalysis/index.vue

@@ -1,7 +1,7 @@
 <script setup name="bladeAnalysis">
 import excelCop from '@/components/excel.vue'
 import treeCop from '@/components/tree.vue'
-import barChartCop from './components/barChart.vue'
+// import barChartCop from './components/barChart.vue'
 import SubmitBtn from '../../../components/SubmitBtn.vue'
 // import { ElMessage } from 'element-plus';
 import { onMounted, ref, onActivated, shallowRef, reactive, nextTick } from 'vue'

+ 74 - 71
src/pages/dataFilter/prepare/components/search.vue

@@ -91,21 +91,21 @@ const BeginChange1 = (val) => {
 //存储文件变量
 let fileUplod = ref([]);
 function changeUpload(UploadFile, uploadFiles) {
-  fileUplod.value.push(UploadFile) 
- console.log("228", fileUplod.value);
+	fileUplod.value.push(UploadFile) 
+}
 
+const funUpload = () => {
+	dialogFormVisible.value = true
 }
 
 const addok = async (params) => {
 	dialogFormVisible.value = false
-	  let formData =new FormData()
-	  if (fileUplod.value.length>0) {
-                fileUplod.value.forEach(item =>{
-                    formData.append('file', item.raw)
-                })
-            }
-//   formData.append("files",fileUplod.value)
-  console.log(formData);
+	let formData =new FormData()
+	if (fileUplod.value.length>0) {
+		fileUplod.value.forEach(item =>{
+			formData.append('file', item.raw)
+		})
+	}
 	const res = await request({
 		url:`/power/prepare/upload?station=${form.name}&interval=${form.region}&st=${new Date(form.value1).getTime()}&et=${new Date(form.value2).getTime()}`,
 		method:"post",
@@ -115,6 +115,8 @@ const addok = async (params) => {
 		 })
 	if (res.code === 200) {
 		ElMessage.success(res.msg)
+		fileUplod.value = [];
+		location.reload()
 	}
 }
 
@@ -176,70 +178,71 @@ funGetStation()
 				<submit-btn v-prevdbclick:5000="funSubmit" desc="执行"></submit-btn>
 			</el-form-item>
 			<el-form-item class="!mb-0">
-				<el-button type="primary" @click="dialogFormVisible = true">导入</el-button>
+				<el-button type="primary" @click="funUpload">导入</el-button>
 			</el-form-item>
 		</el-form>
 	</div>
 	<div>
-		<el-dialog v-model="dialogFormVisible" title="导入">
-    <el-form :model="form">
-      <el-form-item label="场站" class="!ml-10" >
-        <el-input v-model="form.name" placeholder="请输入场站名" autocomplete="off" style="width:220px" />
-      </el-form-item>
-      <el-form-item label="等间隔"  class="!ml-10">
-        <el-select v-model="form.region" >
-          <el-option label="一秒钟" value="1" />
-          <el-option label="一分钟" value="60" />
-		  <el-option label="十分钟" value="600" />
-		  <el-option label="十五分钟" value="900" />
-        </el-select>
-      </el-form-item>
-	  <el-form-item label="时间" class="!ml-10" >
-          <el-date-picker
-            v-model="form.value1"
-            @change="BeginChange(form.value1)"
-            type="datetime"
-            value-format="YYYY/MM/DD hh:mm:ss"
-            placeholder="选择日期"
-          >
-          </el-date-picker>
-        </el-form-item>
-		 <el-form-item label="时间" class="!ml-10" >
-          <el-date-picker
-            v-model="form.value2"
-            @change="BeginChange1(form.value2)"
-            type="datetime"
-            value-format="YYYY/MM/DD hh:mm:ss"
-            placeholder="选择日期"
-          >
-          </el-date-picker>
-        </el-form-item>
-       
-    </el-form>
-	 
-    <el-upload  
-        class="upload-demo"
-        action="#"
-        :limit="100"
-		accept=".csv"
-        :on-change="changeUpload"
-        name="fileData"
-        :on-exceed="handleExceed"
-        :before-upload="beforeUpload"
-        :auto-upload="false"
-      >
-        <template #trigger >
-          <el-button type="primary" class="ml-10" >选择文件</el-button>
-		    <div slot="tip" class="el-upload__tip">只能上传csv不超过100个文件</div>
-        </template>
-      </el-upload>
-     
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取消</el-button>
-        <el-button type="primary" @click="addok">确认</el-button>
-      </span>
-    </template>
-  </el-dialog>
+		<el-dialog v-model="dialogFormVisible" title="数据导入" width="40%">
+			<el-form :model="form" label-width="80px">
+			<el-form-item label="场站" class="!ml-10">
+				<el-input v-model="form.name" placeholder="请输入场站名" autocomplete="off" style="width:250px" />
+			</el-form-item>
+			<el-form-item label="等间隔"  class="!ml-10">
+				<el-select v-model="form.region" style="width:250px">
+				<el-option label="一秒钟" value="1" />
+				<el-option label="一分钟" value="60" />
+				<el-option label="十分钟" value="600" />
+				<el-option label="十五分钟" value="900" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="开始时间" class="!ml-10">
+				<el-date-picker
+					v-model="form.value1"
+					@change="BeginChange(form.value1)"
+					type="datetime"
+					value-format="YYYY/MM/DD hh:mm:ss"
+					placeholder="选择日期"
+				>
+				</el-date-picker>
+				</el-form-item>
+				<el-form-item label="结束时间" class="!ml-10" >
+				<el-date-picker
+					v-model="form.value2"
+					@change="BeginChange1(form.value2)"
+					type="datetime"
+					value-format="YYYY/MM/DD hh:mm:ss"
+					placeholder="选择日期"
+				>
+				</el-date-picker>
+			</el-form-item>
+			
+		</el-form>
+		
+		<el-upload  
+			class="upload-demo"
+			action="#"
+			:limit="100"
+			multiple
+			accept=".csv"
+			:on-change="changeUpload"
+			ref="fileUpload"
+			name="fileData"
+			:on-exceed="handleExceed"
+			:before-upload="beforeUpload"
+			:auto-upload="false"
+		>
+			<template #trigger >
+			<el-button type="primary" class="ml-10" >选择文件</el-button>
+				<div slot="tip" class="el-upload__tip ml-5">只能上传csv不超过100个文件</div>
+			</template>
+		</el-upload>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="dialogFormVisible = false">取消</el-button>
+				<el-button type="primary" @click="addok">确认</el-button>
+			</span>
+		</template>
+		</el-dialog>
 	</div>
 </template>