需求修改完成

WX

2023-08-30 4c846958fd4046b7a125224c759ae7ae0af673fa

需求修改完成

 src/assets/js/Map/index.js

@@ -44,6 +44,7 @@
        this.addMouseLeftClickEvents();

        sgworld.setDefaultCallback((type, data) => {
          // console.log(data);
          if (data) {
            if (data.message) {
              if (data.message == "StartLoad") {

 src/assets/js/menuTool.js

@@ -60,15 +60,15 @@
        break;
      case "d22": //西部风场模拟
        this.createFC("fc", "", {
          start: 0,
          end: 30,
          start: 20,
          end: 25,
          Classify: "West",
        });
        break;
      case "d23": //东部风场模拟
        this.createFC("fc", "", {
          start: 0,
          end: 30,
          start: 13,
          end: 19,
          Classify: "East",
        });
        break;
@@ -147,6 +147,7 @@
        this.closePoi();
        this.delFC();
        this.delLine();
        this.closeSYWG();
        break;
      case "d1": //
        this.closePoi();
@@ -328,9 +329,9 @@
      sgworld.Core.postMessage(
        `Type=shunxuwinds;Bool=true;Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
      );
      console.log(
        `Type=shunxuwinds;Bool=true;Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
      );
      // console.log(
      //   `Type=shunxuwinds;Bool=true;Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
      // );
    } else if (type == "sj") {
      let arr = date.split(/\s+/);

@@ -341,9 +342,9 @@
      sgworld.Core.postMessage(
        `Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour};Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
      );
      console.log(
        `Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour};Density=${FC.Density};Speed=${FC.Speed};`
      );
      // console.log(
      //   `Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour};Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
      // );
    }
  },
  //风场删除

 src/components/BGDC.vue

@@ -293,7 +293,7 @@
        selectform.value1[0] + ":00:00" + "-" + selectform.value1[1] + ":00:00";
      let begin = selectform.value1[0].replace(" ", "-");
      let end = selectform.value1[1].replace(" ", "-");
      console.log(begin, end);
      // console.log(begin, end);
      //获取实时预警数据
      // const dt = await getRunWarning();
      // //获取实时报警数据

 src/components/dateTimePicker.vue

@@ -88,15 +88,15 @@
    const store = useStore();

    let selectform = reactive({
      value: "",
      value: null,
      fetch: "",
      start: 0,
      end: 30,
      end: 0,
    });
    let btnState = false;
    let CS = {
      start: 0,
      end: 30,
      end: 0,
      Classify: "",
    };
    const selectBtn = () => {
@@ -130,6 +130,13 @@
        }

        emit("changeTime", { data: newTimeStr, week: week });
        CS.start = selectform.start;
        CS.end = selectform.end;
        CS.Classify = selectform.fetch;
        if (selectform.start > selectform.end) {
          CS.start = selectform.end;
          CS.end = selectform.start;
        }
        if (props.tpData == "d21") {
          menuTool.createFC("sj", newTimeStr);
        } else if (props.tpData == "d22") {
@@ -144,7 +151,6 @@
      }
    };
    function FQselectBtn() {
      selectform.value = "";
      CS.start = selectform.start;
      CS.end = selectform.end;
      CS.Classify = selectform.fetch;
@@ -154,13 +160,53 @@
      }
      if (props.tpData == "d22") {
        CS.Classify = "West";
        menuTool.createFC("fc", "", CS);
      } else if (props.tpData == "d23") {
        CS.Classify = "East";
      }
      if (btnState) {
        menuTool.createFC("sj", selectform.value, CS);
      } else {
        menuTool.createFC("fc", "", CS);
      }
    }
    function changeTime() {}
    watch(
      () => selectform.value,
      (nVal, oVal) => {
        if (nVal == null) {
          btnState = false;
        } else {
          btnState = true;
        }
      },

      { deep: true }
    );
    watch(
      () => props.tpData,
      (nVal, oVal) => {
        if (nVal == "d22") {
          selectform.start = 20;
          selectform.end = 25;
          selectform.value = null;
        } else if (nVal == "d23") {
          selectform.start = 13;
          selectform.end = 19;
          selectform.value = null;
        }
      },

      { deep: true }
    );
    onMounted(() => {
      if (props.tpData == "d22") {
        selectform.start = 20;
        selectform.end = 25;
      } else if (props.tpData == "d23") {
        selectform.start = 13;
        selectform.end = 19;
      }
    });
    return {
      selectBtn,
      changeTime,

 src/components/reportList.vue

@@ -105,7 +105,7 @@
      data.total = Math.ceil(dt.count / listData.pageSize);
      data.tableData = dt.result;

      console.log(dt);
      // console.log(dt);
    };
    const download = async (res) => {
      let downloadObj = {

 src/components/xgzs/weekzdmax.vue

@@ -38,7 +38,7 @@
    async getWaringList() {
      let dt = await getweekTop();
      if (dt.code === 200 && dt.result.length > 0) {
        console.log(dt);
        // console.log(dt);
        const sotrArr = dt.result.sort((a, b) => b - a);
        let result = sotrArr.slice(0, 10);
        const data = result.map((item) => {

 src/views/index.vue

@@ -35,7 +35,7 @@
              v-if="showFk"
              @FKclose="FKclose"
            ></SYFK>
            <YCWG v-show="checkMenuFlag == 'b2'"></YCWG>
            <YCWG v-if="checkMenuFlag == 'b2'"></YCWG>
            <div class="chart_box" v-if="chart_isshow">
              <div class="popout_title">曲线统计图</div>
              <div class="close" @click="popoutClose('QX')"></div>