瀏覽代碼

站点修复

ming 3 年之前
父節點
當前提交
c785e8f60c
共有 23 個文件被更改,包括 44 次插入2885 次删除
  1. 0 136
      .history/src/views/powerQuality/harmonicReport/index_20211018102819.vue
  2. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019171953.vue
  3. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172001.vue
  4. 0 145
      .history/src/views/powerQuality/harmonicReport/index_20211019172101.vue
  5. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172129.vue
  6. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172146.vue
  7. 0 132
      .history/src/views/powerQuality/harmonicReport/index_20211019172152.vue
  8. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172205.vue
  9. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172222.vue
  10. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172253.vue
  11. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172311.vue
  12. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172412.vue
  13. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172719.vue
  14. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172746.vue
  15. 0 144
      .history/src/views/powerQuality/harmonicReport/index_20211019172846.vue
  16. 0 145
      .history/src/views/powerQuality/harmonicReport/index_20211020172021.vue
  17. 0 145
      .history/src/views/powerQuality/harmonicReport/index_20211020172034.vue
  18. 0 148
      .history/src/views/powerQuality/harmonicReport/index_20211020172109.vue
  19. 0 147
      .history/src/views/powerQuality/harmonicReport/index_20211020172215.vue
  20. 0 149
      .history/src/views/powerQuality/harmonicReport/index_20211020173607.vue
  21. 26 1
      src/views/powerQuality/unbalanceAnalysis/index.vue
  22. 6 6
      src/views/siteManage/addSiteCom.vue
  23. 12 3
      src/views/siteManage/index.vue

+ 0 - 136
.history/src/views/powerQuality/harmonicReport/index_20211018102819.vue

@@ -1,136 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-            </el-date-picker>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-              >按日</el-button
-            >
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-              >按月</el-button
-            >
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-      >曲线</el-button
-    >
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-      >表格</el-button
-    >
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com  v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from "./curveCom";
-import tableCom from "./tableCom";
-
-export default {
-  name: "VariableList",
-   components: {
-   curveCom,
-   tableCom
-  },
-
-  data() {
-    return {
-      num: 0,
-      num2: 0,
-      value4: "请选择",
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: "one",
-      input: "",
-      region: "",
-    };
-  },
-  methods: {
-   
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019171953.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-            </el-date-picker>
-
-            <el-radio-group v-model="radio1">
-      <el-radio-button label="New York"></el-radio-button>
-      <el-radio-button label="Washington"></el-radio-button>
-      <el-radio-button label="Los Angeles"></el-radio-button>
-      <el-radio-button label="Chicago"></el-radio-button>
-    </el-radio-group>
-    
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-              >按日</el-button
-            >
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-              >按月</el-button
-            >
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-      >曲线</el-button
-    >
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-      >表格</el-button
-    >
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com  v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from "./curveCom";
-import tableCom from "./tableCom";
-
-export default {
-  name: "VariableList",
-   components: {
-   curveCom,
-   tableCom
-  },
-
-  data() {
-    return {
-      num: 0,
-      num2: 0,
-      value4: "请选择",
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: "one",
-      input: "",
-      region: "",
-    };
-  },
-  methods: {
-   
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172001.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-            </el-date-picker>
-
-            <el-radio-group v-model="listTabPosition">
-      <el-radio-button label="New York"></el-radio-button>
-      <el-radio-button label="Washington"></el-radio-button>
-      <el-radio-button label="Los Angeles"></el-radio-button>
-      <el-radio-button label="Chicago"></el-radio-button>
-    </el-radio-group>
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-              >按日</el-button
-            >
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-              >按月</el-button
-            >
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-      >曲线</el-button
-    >
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-      >表格</el-button
-    >
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com  v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from "./curveCom";
-import tableCom from "./tableCom";
-
-export default {
-  name: "VariableList",
-   components: {
-   curveCom,
-   tableCom
-  },
-
-  data() {
-    return {
-      num: 0,
-      num2: 0,
-      value4: "请选择",
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: "one",
-      input: "",
-      region: "",
-    };
-  },
-  methods: {
-   
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 145
.history/src/views/powerQuality/harmonicReport/index_20211019172101.vue

@@ -1,145 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-            </el-date-picker>
-
-            <el-radio-group v-model="listTabPosition">
-      <el-radio-button label="New York"></el-radio-button>
-      <el-radio-button label="Washington"></el-radio-button>
-      <el-radio-button label="Los Angeles"></el-radio-button>
-      <el-radio-button label="Chicago"></el-radio-button>
-    </el-radio-group>
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-              >按日</el-button
-            >
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-              >按月</el-button
-            >
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-      >曲线</el-button
-    >
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-      >表格</el-button
-    >
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com  v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from "./curveCom";
-import tableCom from "./tableCom";
-
-export default {
-  name: "VariableList",
-   components: {
-   curveCom,
-   tableCom
-  },
-
-  data() {
-    return {
-      listTabPosition:'byMonth',
-      num: 0,
-      num2: 0,
-      value4: "请选择",
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: "one",
-      input: "",
-      region: "",
-    };
-  },
-  methods: {
-   
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172129.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-            </el-date-picker>
-
-            <el-radio-group v-model="listTabPosition">
-      <el-radio-button label="byDay">按日</el-radio-button>
-      <el-radio-button label="byMonth">按月</el-radio-button>
-     
-    </el-radio-group>
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-              >按日</el-button
-            >
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-              >按月</el-button
-            >
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-      >曲线</el-button
-    >
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-      >表格</el-button
-    >
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com  v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from "./curveCom";
-import tableCom from "./tableCom";
-
-export default {
-  name: "VariableList",
-   components: {
-   curveCom,
-   tableCom
-  },
-
-  data() {
-    return {
-      listTabPosition:'byMonth',
-      num: 0,
-      num2: 0,
-      value4: "请选择",
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: "one",
-      input: "",
-      region: "",
-    };
-  },
-  methods: {
-   
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172146.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-            </el-date-picker>
-
-            <el-radio-group v-model="listTabPosition">
-      <el-radio-button label="byDay">按日</el-radio-button>
-      <el-radio-button label="byMonth">按月</el-radio-button>
-     
-    </el-radio-group>
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-              >按日</el-button
-            >
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-              >按月</el-button
-            >
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-      >曲线</el-button
-    >
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-      >表格</el-button
-    >
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com  v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from "./curveCom";
-import tableCom from "./tableCom";
-
-export default {
-  name: "VariableList",
-   components: {
-   curveCom,
-   tableCom
-  },
-
-  data() {
-    return {
-      listTabPosition:'byDay',
-      num: 0,
-      num2: 0,
-      value4: "请选择",
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: "one",
-      input: "",
-      region: "",
-    };
-  },
-  methods: {
-   
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 132
.history/src/views/powerQuality/harmonicReport/index_20211019172152.vue

@@ -1,132 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-            </el-date-picker>
-
-            <el-radio-group v-model="listTabPosition">
-      <el-radio-button label="byDay">按日</el-radio-button>
-      <el-radio-button label="byMonth">按月</el-radio-button>
-     
-    </el-radio-group>
-
-          
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-      >曲线</el-button
-    >
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-      >表格</el-button
-    >
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com  v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from "./curveCom";
-import tableCom from "./tableCom";
-
-export default {
-  name: "VariableList",
-   components: {
-   curveCom,
-   tableCom
-  },
-
-  data() {
-    return {
-      listTabPosition:'byDay',
-      num: 0,
-      num2: 0,
-      value4: "请选择",
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: "one",
-      input: "",
-      region: "",
-    };
-  },
-  methods: {
-   
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172205.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group>
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172222.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group>
-
-            <!-- <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button> -->
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172253.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172311.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group>
-
-            <!-- <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button> -->
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172412.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172719.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-             type="month"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172746.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-            type="dates"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 144
.history/src/views/powerQuality/harmonicReport/index_20211019172846.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-            :type="this.num==0?'dates':'month'"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 145
.history/src/views/powerQuality/harmonicReport/index_20211020172021.vue

@@ -1,145 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-            :type="this.num==0?'dates':'month'"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-     <curve-com v-if="num2 == 1"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 145
.history/src/views/powerQuality/harmonicReport/index_20211020172034.vue

@@ -1,145 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-            :type="this.num==0?'dates':'month'"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <curve-com v-if="num2 == 0"></curve-com>
-     <curve-com v-if="num2 == 0"></curve-com>
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 148
.history/src/views/powerQuality/harmonicReport/index_20211020172109.vue

@@ -1,148 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-            :type="this.num==0?'dates':'month'"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <div  v-if="num2 == 0">
-       <curve-com></curve-com>
-        <curve-com></curve-com>
-    </div>
-   
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 147
.history/src/views/powerQuality/harmonicReport/index_20211020172215.vue

@@ -1,147 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-            :type="this.num==0?'dates':'month'"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <div  v-if="num2 == 0">
-        <curve-com></curve-com>
-    </div>
-   
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {},
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 149
.history/src/views/powerQuality/harmonicReport/index_20211020173607.vue

@@ -1,149 +0,0 @@
-<template>
-  <div class="app-container harmonicReport">
-    <!-- 筛选start -->
-    <div class="filter-container">
-      <div class="left">
-        <div>
-          <div class="filter-item">
-            选择站点:
-            <el-select
-              v-model="region"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="站点一" value="1"></el-option>
-              <el-option label="站点二" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            回路:
-            <el-select
-              v-model="circuit"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="回路1" value="1"></el-option>
-              <el-option label="回路2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            测量类型:
-            <el-select
-              v-model="measurType"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="类型1" value="1"></el-option>
-              <el-option label="类型2" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            谐波次数:
-            <el-select
-              v-model="number"
-              placeholder="请选择"
-              style="width: 150px"
-            >
-              <el-option label="已执行" value="1"></el-option>
-              <el-option label="未执行" value="2"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item">
-            时间:
-            <el-date-picker
-              v-model="value4"
-            :type="this.num==0?'dates':'month'"
-              placeholder="请选择"
-              style="width: 150px"
-            ></el-date-picker>
-
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
-
-            <el-button
-              class="search-button timeTab"
-              @click="num = 0"
-              :type="num == 0 ? 'primary' : ''"
-            >
-              按日
-            </el-button>
-            <el-button
-              class="search-button timeTab"
-              @click="num = 1"
-              :type="num == 1 ? 'primary' : ''"
-              style="margin-left: 0 !important"
-            >
-              按月
-            </el-button>
-          </div>
-
-          <el-button type="primary" class="search-button">搜索</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 0"
-      :type="num2 == 0 ? 'primary' : ''"
-    >
-      曲线
-    </el-button>
-    <el-button
-      class="search-button timeTab"
-      @click="num2 = 1"
-      :type="num2 == 1 ? 'primary' : ''"
-      style="margin-left: 0 !important"
-    >
-      表格
-    </el-button>
-    <div  v-if="num2 == 0">
-        <curve-com></curve-com>
-    </div>
-   
-    <table-com v-if="num2 == 1"></table-com>
-  </div>
-</template>
-
-<script>
-import curveCom from './curveCom'
-import tableCom from './tableCom'
-
-export default {
-  name: 'VariableList',
-  components: {
-    curveCom,
-    tableCom,
-  },
-
-  data() {
-    return {
-      listTabPosition: 'byDay',
-      num: 0,
-      num2: 0,
-      value4: '请选择',
-      number: 1,
-      measurType: 1,
-      select: 1,
-      currentPage4: 4,
-      showDialog: false,
-      tabPosition: 'one',
-      input: '',
-      region: '',
-    }
-  },
-  methods: {
-    
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 26 - 1
src/views/powerQuality/unbalanceAnalysis/index.vue

@@ -102,7 +102,32 @@ export default defineComponent({
     // const deviceCode = ref('')
     const deviceCode = ref('DA00021026')
     const deviceList = ref([])
-    const echartsData = ref([])
+    const echartsData = ref([{
+        cos: 1,
+        dataTime: '2021-11-10 10:10:00',
+        elBalun: 1,
+        ia: 6.24,
+        ib: 0,
+        ic: 6.11,
+        score: 0,
+        ua: 10174,
+        ub: 0,
+        uc: 10172.5,
+        vtBalun: 1,
+      },
+      {
+        cos: 1,
+        dataTime: '2021-11-10 10:10:00',
+        elBalun: 1,
+        ia: 6.24,
+        ib: 0,
+        ic: 6.11,
+        score: 0,
+        ua: 10174,
+        ub: 0,
+        uc: 10172.5,
+        vtBalun: 1,
+      },])
     const voltageChartData = ref({})
 
     const dateTime = ref([new Date(2021, 10, 10, 10, 10), new Date()])

+ 6 - 6
src/views/siteManage/addSiteCom.vue

@@ -3,7 +3,7 @@
       :title="dialogTitle"
        v-model="dialogVisible"
      
-      @close="closeDialog(0)"
+      @close="closeDialog2(0)"
          @open="open"
           width="500px"
     >
@@ -42,7 +42,7 @@ import { ElMessage } from 'element-plus'
 
 export default defineComponent({
   name: 'AddSiteCom',
-  emits: ['closeDialog'],
+  emits: ['closeDialog2'],
   props: {
     flag: Boolean,
     dialogTitle: String,
@@ -66,8 +66,8 @@ export default defineComponent({
     }
 
     // 关闭弹框
-    const closeDialog = () => {
-      context.emit('closeDialog')
+    const closeDialog2 = () => {
+      context.emit('closeDialog2')
       //  context.emit('treeLevel', 3)
       // dialogVisible.value = false
     }
@@ -99,7 +99,7 @@ export default defineComponent({
             // 无选择模板
             alert('无选择模板')
           }
-          closeDialog()
+          closeDialog2()
         } else {
           console.log('error submit!!')
           return false
@@ -125,7 +125,7 @@ export default defineComponent({
 
 
     return {
-      closeDialog,
+      closeDialog2,
       dialogVisible,
       listData,
 

+ 12 - 3
src/views/siteManage/index.vue

@@ -137,7 +137,7 @@
       <add-site-com
         :dialogTitle="dialogTitle"
         :itemInfo="tableItem"
-        @closeDialog="closeDialog"
+        @closeDialog2="closeDialog2"
         :flag="showDialog2"
       ></add-site-com>
       <!-- 新建站点end -->
@@ -185,7 +185,7 @@ export default defineComponent({
     const groupingId = ref(1)
     const siteId = ref(368)
     const label = ref('')
-    const activeName = ref('third')
+    const activeName = ref('first')
     const filterText = ref('')
     const data = ref([
       {
@@ -305,6 +305,15 @@ export default defineComponent({
       treeLevel.value = 3
     }
 
+    // 关闭操作
+    const closeDialog2 = () => {
+     showDialog.value = false
+      showDialog2.value = false
+      flag2.value = true
+      treeLevel.value = 3
+    }
+
+
     //新建分组
     const tableItem = reactive([])
     const addGroup = () => {
@@ -381,7 +390,6 @@ export default defineComponent({
       siteId,
       label,
       flag2,
-
       showTree,
       tree,
 
@@ -396,6 +404,7 @@ export default defineComponent({
       filterNode,
       handleNodeClick,
       closeDialog,
+      closeDialog2,
       addGroup,
       addSite,
       remove,