'日总发电量计算'

src/api/config.js

@@ -1,7 +1,6 @@
 
-
 const config = {
-    baseURL: 'http://192.168.1.67:8021',
+    baseURL: 'http://192.168.10.24:8021',
     // baseURL: 'http://192.168.10.24:8021',
     baseURL1: 'http://192.168.1.67:8133',
 }

src/pages/dataAnalysis/combine/index.vue

@@ -96,12 +96,25 @@ const handleCurrentChange = (val) => {
   nbsubmit()
 }
 
-const nbhh = async () => {
-  const res = await request.get("/meter/infoall");
+const Change1 = async () => {
+  const res = await request.get(`/meter/infoall?stationId=${goodval.value}`);
   console.log(res);
   ChangZhan.value = res.data.fdc;
+  fenval.value='all'
+   mingval.value='all'
+  
+};
+// 拿场站
+const good = ref([]);
+const goodval = ref();
+const nbhh = async () => {
+  const res = await request.get("/meter/allStation");
+  console.log(res);
+  good.value = res.data
+  // console.log('0',ChangZhan.good);
   // value1.value = ChangZhan.value[0].nemCode;
 };
+   
 
 const getTime1=(val)=> {
       //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
@@ -143,11 +156,28 @@ onMounted(() => {
     <div
       class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-      <el-form-item label="场站" class="!mb-0">
+       <el-form-item label="场站类型" class="!mb-0">
+        <el-select
+          v-model="goodval"
+          class="w-[150px]"
+          @change="Change1(goodval)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in good"
+            :key="item.nemCode"
+            :value="item.nemCode"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场站" class="!mb-0 ml-3">
         <el-select
           v-model="value1"
           class="w-[150px]"
           @change="ChangZhanChange(value1)"
+          clearable
           placeholder="请选择"
           popper-class="select"
         >

src/pages/dataAnalysis/lineAnalysis/index.vue

@@ -72,12 +72,25 @@ const handleCurrentChange = (val) => {
   nbsubmit()
 }
 
-const nbhh = async () => {
-  const res = await request.get("/meter/infoall");
+const Change1 = async () => {
+  const res = await request.get(`/meter/infoall?stationId=${goodval.value}`);
   console.log(res);
   ChangZhan.value = res.data.fdc;
+  fenval.value='all'
+   mingval.value='all'
+  
+};
+// 拿场站
+const good = ref([]);
+const goodval = ref();
+const nbhh = async () => {
+  const res = await request.get("/meter/allStation");
+  console.log(res);
+  good.value = res.data
+  // console.log('0',ChangZhan.good);
   // value1.value = ChangZhan.value[0].nemCode;
 };
+   
 const getTime1=(val)=> {
       //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
       var date = new Date();
@@ -116,11 +129,28 @@ onMounted(() => {
     <div
       class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-      <el-form-item label="场站" class="!mb-0">
+       <el-form-item label="场站类型" class="!mb-0">
+        <el-select
+          v-model="goodval"
+          class="w-[150px]"
+          @change="Change1(goodval)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in good"
+            :key="item.nemCode"
+            :value="item.nemCode"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场站" class="!mb-0 ml-3">
         <el-select
           v-model="value1"
           class="w-[150px]"
           @change="ChangZhanChange(value1)"
+          clearable
           placeholder="请选择"
           popper-class="select"
         >

src/pages/dataAnalysis/rateAnalysis/index.vue

@@ -95,12 +95,25 @@ const handleCurrentChange = (val) => {
   nbsubmit()
 }
 
-const nbhh = async () => {
-  const res = await request.get("/meter/infoall");
+const Change1 = async () => {
+  const res = await request.get(`/meter/infoall?stationId=${goodval.value}`);
   console.log(res);
   ChangZhan.value = res.data.fdc;
+  fenval.value='all'
+   mingval.value='all'
+  
+};
+// 拿场站
+const good = ref([]);
+const goodval = ref();
+const nbhh = async () => {
+  const res = await request.get("/meter/allStation");
+  console.log(res);
+  good.value = res.data
+  // console.log('0',ChangZhan.good);
   // value1.value = ChangZhan.value[0].nemCode;
 };
+  
 const getTime1=(val)=> {
       //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
       var date = new Date();
@@ -142,11 +155,28 @@ onMounted(() => {
     <div
       class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-      <el-form-item label="场站" class="!mb-0">
+        <el-form-item label="场站类型" class="!mb-0">
+        <el-select
+          v-model="goodval"
+          class="w-[150px]"
+          @change="Change1(goodval)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in good"
+            :key="item.nemCode"
+            :value="item.nemCode"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场站" class="!mb-0 ml-3">
         <el-select
           v-model="value1"
           class="w-[150px]"
           @change="ChangZhanChange(value1)"
+          clearable
           placeholder="请选择"
           popper-class="select"
         >

src/pages/dataFilter/lightPrepare/index.vue

@@ -28,7 +28,7 @@ const nbsubmit = async () => {
   console.log("gb", lbval.value);
   // console.log('shijan',timedata);
   const res = await request.get(
-    `/meterinfo/calculating?windId=${value1.value}${lbval.value==='all'?'':'&meterType='+lbval.value}${fenval.value==='all'?'':'&meterClass='+fenval.value}${mingval.value==='all'?'':'&name='+mingval.value}&startTime=${new Date(timedata.value[0]).getTime()}&endTime=${ new Date(timedata.value[1]).getTime()}&page=${currentPage4.value}&perPage=${pageSize4.value}`
+    `/meterinfo/calculating?stationId=${goodval.value}&windId=${value1.value}${lbval.value==='all'?'':'&meterType='+lbval.value}${fenval.value==='all'?'':'&meterClass='+fenval.value}${mingval.value==='all'?'':'&name='+mingval.value}&startTime=${new Date(timedata.value[0]).getTime()}&endTime=${ new Date(timedata.value[1]).getTime()}&page=${currentPage4.value}&perPage=${pageSize4.value}`
   );
   console.log("66", res);
   res.data.calculating.forEach((ele)=>{
@@ -94,14 +94,27 @@ const handleCurrentChange = (val) => {
   nbsubmit();
 };
 
+
+const Change1 = async () => {
+  const res = await request.get(`/meter/infoall?stationId=${goodval.value}`);
+  console.log(res);
+  ChangZhan.value = res.data.fdc;
+  fenval.value='all'
+   mingval.value='all'
+  
+};
 // 拿场站
+const good = ref([]);
+const goodval = ref();
 const nbhh = async () => {
-  const res = await request.get("/meter/infoall");
+  const res = await request.get("/meter/allStation");
   console.log(res);
-  ChangZhan.value = res.data.fdc;
+  good.value = res.data
+  // console.log('0',ChangZhan.good);
   // value1.value = ChangZhan.value[0].nemCode;
 };
 
+
 /**mounted */
 onMounted(() => {
   tableHeight.value = window.innerHeight - 260 + "px";
@@ -121,11 +134,28 @@ onMounted(() => {
     <div
       class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-      <el-form-item label="场站" class="!mb-0">
+     <el-form-item label="场站类型" class="!mb-0">
+        <el-select
+          v-model="goodval"
+          class="w-[150px]"
+          @change="Change1(goodval)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in good"
+            :key="item.nemCode"
+            :value="item.nemCode"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场站" class="!mb-0 ml-3">
         <el-select
           v-model="value1"
           class="w-[150px]"
           @change="ChangZhanChange(value1)"
+          clearable
           placeholder="请选择"
           popper-class="select"
         >

src/pages/dataFilter/prepare/index.vue

@@ -83,13 +83,27 @@ const handleCurrentChange = (val) => {
   currentPage4.value=val
   nbsubmit()
 }
-const nbhh = async () => {
-  const res = await request.get("/meter/infoall");
+
+const Change1 = async () => {
+  const res = await request.get(`/meter/infoall?stationId=${goodval.value}`);
   console.log(res);
   ChangZhan.value = res.data.fdc;
+  fenval.value='all'
+   mingval.value='all'
+  
+};
+// 拿场站
+const good = ref([]);
+const goodval = ref();
+const nbhh = async () => {
+  const res = await request.get("/meter/allStation");
+  console.log(res);
+  good.value = res.data
+  // console.log('0',ChangZhan.good);
   // value1.value = ChangZhan.value[0].nemCode;
 };
 
+
 /**mounted */
 onMounted(() => {
   tableHeight.value = window.innerHeight - 260 + "px";
@@ -109,11 +123,28 @@ onMounted(() => {
     <div
       class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-      <el-form-item label="场站" class="!mb-0">
+    <el-form-item label="场站类型" class="!mb-0">
+        <el-select
+          v-model="goodval"
+          class="w-[150px]"
+          @change="Change1(goodval)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in good"
+            :key="item.nemCode"
+            :value="item.nemCode"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场站" class="!mb-0 ml-3">
         <el-select
           v-model="value1"
           class="w-[150px]"
           @change="ChangZhanChange(value1)"
+          clearable
           placeholder="请选择"
           popper-class="select"
         >
@@ -240,6 +271,12 @@ onMounted(() => {
               align="right"
               width="200"
             />
+             <el-table-column
+              prop="nemCode"
+              label="编码"
+              align="center"
+              width="350"
+            />
           </el-table>
         </el-scrollbar>
       </div>

src/pages/dataFilter/process/index.vue

@@ -61,12 +61,25 @@ const handleCurrentChange = (val) => {
 }
 
 // 拿场站
-const nbhh = async () => {
-  const res = await request.get("/meter/infoall");
+const Change1 = async () => {
+  const res = await request.get(`/meter/infoall?stationId=${goodval.value}`);
   console.log(res);
   ChangZhan.value = res.data.fdc;
+  fenval.value='all'
+   mingval.value='all'
+  
+};
+// 拿场站
+const good = ref([]);
+const goodval = ref();
+const nbhh = async () => {
+  const res = await request.get("/meter/allStation");
+  console.log(res);
+  good.value = res.data
+  // console.log('0',ChangZhan.good);
   // value1.value = ChangZhan.value[0].nemCode;
 };
+   
 
 
 
@@ -89,11 +102,28 @@ onMounted(() => {
     <div
       class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-      <el-form-item label="场站" class="!mb-0">
+       <el-form-item label="场站类型" class="!mb-0">
+        <el-select
+          v-model="goodval"
+          class="w-[150px]"
+          @change="Change1(goodval)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in good"
+            :key="item.nemCode"
+            :value="item.nemCode"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场站" class="!mb-0 ml-3">
         <el-select
           v-model="value1"
           class="w-[150px]"
           @change="ChangZhanChange(value1)"
+          clearable
           placeholder="请选择"
           popper-class="select"
         >

src/pages/lightAnalysis/glAnalysis/index.vue

@@ -96,12 +96,25 @@ const handleCurrentChange = (val) => {
   nbsubmit()
 }
 
-const nbhh = async () => {
-  const res = await request.get("/meter/infoall");
+const Change1 = async () => {
+  const res = await request.get(`/meter/infoall?stationId=${goodval.value}`);
   console.log(res);
   ChangZhan.value = res.data.fdc;
+  fenval.value='all'
+   mingval.value='all'
+  
+};
+// 拿场站
+const good = ref([]);
+const goodval = ref();
+const nbhh = async () => {
+  const res = await request.get("/meter/allStation");
+  console.log(res);
+  good.value = res.data
+  // console.log('0',ChangZhan.good);
   // value1.value = ChangZhan.value[0].nemCode;
 };
+    
 
 const getTime1=(val)=> {
       //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
@@ -143,11 +156,28 @@ onMounted(() => {
     <div
       class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-      <el-form-item label="场站" class="!mb-0">
+      <el-form-item label="场站类型" class="!mb-0">
+        <el-select
+          v-model="goodval"
+          class="w-[150px]"
+          @change="Change1(goodval)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in good"
+            :key="item.nemCode"
+            :value="item.nemCode"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场站" class="!mb-0 ml-3">
         <el-select
           v-model="value1"
           class="w-[150px]"
           @change="ChangZhanChange(value1)"
+          clearable
           placeholder="请选择"
           popper-class="select"
         >

src/pages/lightAnalysis/glHotAnalysis/index.vue

@@ -95,12 +95,25 @@ const handleCurrentChange = (val) => {
   nbsubmit()
 }
 
-const nbhh = async () => {
-  const res = await request.get("/meter/infoall");
+const Change1 = async () => {
+  const res = await request.get(`/meter/infoall?stationId=${goodval.value}`);
   console.log(res);
   ChangZhan.value = res.data.fdc;
+  fenval.value='all'
+   mingval.value='all'
+  
+};
+// 拿场站
+const good = ref([]);
+const goodval = ref();
+const nbhh = async () => {
+  const res = await request.get("/meter/allStation");
+  console.log(res);
+  good.value = res.data
+  // console.log('0',ChangZhan.good);
   // value1.value = ChangZhan.value[0].nemCode;
 };
+
 const getTime1=(val)=> {
       //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
       var date = new Date();
@@ -142,11 +155,28 @@ onMounted(() => {
     <div
       class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-      <el-form-item label="场站" class="!mb-0">
+       <el-form-item label="场站类型" class="!mb-0">
+        <el-select
+          v-model="goodval"
+          class="w-[150px]"
+          @change="Change1(goodval)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in good"
+            :key="item.nemCode"
+            :value="item.nemCode"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场站" class="!mb-0 ml-3"> 
         <el-select
           v-model="value1"
           class="w-[150px]"
           @change="ChangZhanChange(value1)"
+          clearable
           placeholder="请选择"
           popper-class="select"
         >

src/pages/lightAnalysis/look/index.vue

@@ -32,6 +32,7 @@ console.log(val);
 const tableData=ref()
 
 const nbsubmit = async () => {
+
   const res = await request.get(
     `/meterinfo/equipmentYear?windId=${value1.value}${lbval.value==='all'?"":"&id="+lbval.value}&startTime=${new Date(val1.value).getTime()}&endTime=${ new Date(value2.value).getTime()}&page=${currentPage4.value}&perPage=${pageSize4.value}`,
   );
@@ -71,12 +72,25 @@ const handleCurrentChange = (val) => {
   nbsubmit()
 }
 
-const nbhh = async () => {
-  const res = await request.get("/meter/infoall");
+const Change1 = async () => {
+  const res = await request.get(`/meter/infoall?stationId=${goodval.value}`);
   console.log(res);
   ChangZhan.value = res.data.fdc;
+  fenval.value='all'
+   mingval.value='all'
+  
+};
+// 拿场站
+const good = ref([]);
+const goodval = ref();
+const nbhh = async () => {
+  const res = await request.get("/meter/allStation");
+  console.log(res);
+  good.value = res.data
+  // console.log('0',ChangZhan.good);
   // value1.value = ChangZhan.value[0].nemCode;
 };
+
 const getTime1=(val)=> {
       //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
       var date = new Date();
@@ -116,11 +130,28 @@ onMounted(() => {
     <div
       class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-      <el-form-item label="场站" class="!mb-0">
+       <el-form-item label="场站类型" class="!mb-0">
+        <el-select
+          v-model="goodval"
+          class="w-[150px]"
+          @change="Change1(goodval)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in good"
+            :key="item.nemCode"
+            :value="item.nemCode"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场站" class="!mb-0 ml-3">
         <el-select
           v-model="value1"
           class="w-[150px]"
           @change="ChangZhanChange(value1)"
+          clearable
           placeholder="请选择"
           popper-class="select"
         >