Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

TreeWish

2023-03-03 fe9668d344175c5be2832b0f1063d85d9736a1d3

Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

 src/assets/img/colors.png

 src/components/mapsdk.vue

@@ -327,31 +327,47 @@

          </div> -->
          <div class="lengendBox">
            <div class="lengendSpan">
              <div style="left:10px">0°</div>
              <div style="align-self: flex-end;left:10px; position: absolute;
          bottom: 8%; ">70°</div>

            <div>
              <img
                class="lengendImg"
                src="../assets/img/colors.png"
              />
            </div>
            <div
              class="lengend_color"
              style="height:205px; width:30px "
            ></div>
            <div class="lengendSpan">
              <div>0°</div>
              <div>17.5°</div>
              <div>35°</div>
              <div>52.5°</div>
              <div>70°</div>
            </div>

          </div>
        </el-card>
      </div>
      <div class="propertiesPop" v-if="$store.state.propertiesFlag == '1'">
      <div
        class="propertiesPop"
        v-if="$store.state.propertiesFlag == '1'"
      >
        <el-card class="box-card">
          <div slot="header">
            <span>{{$store.state.propertiesName}}</span>
            <div style="float: right; cursor: pointer">
              <i
                  class="el-icon-close"
                  @click="closeBufferBox(6)"
                class="el-icon-close"
                @click="closeBufferBox(6)"
              ></i>
            </div>
          </div>
          <div class="pointInfoBoxContext" style="height:250px;overflow-y: auto">
            <div style="line-height: 20px" v-for="(value, key) in $store.state.propertiesInfo" :key="key">
          <div
            class="pointInfoBoxContext"
            style="height:250px;overflow-y: auto"
          >
            <div
              style="line-height: 20px"
              v-for="(value, key) in $store.state.propertiesInfo"
              :key="key"
            >
              <span style="font-size: 14px;font-weight: bold;margin-right: 5px">{{key}}:</span>
              <span>{{value}}</span>
            </div>
@@ -1103,14 +1119,14 @@
      right: 8%;
      bottom: 1%;
    }
    .propertiesPop{
    .propertiesPop {
      width: 350px;
      height: 370px;
      z-index: 40;
      position: absolute;
      right: 8%;
      bottom: 1%;
      /deep/ .el-card__header{
      /deep/ .el-card__header {
        padding: 10px 20px;
      }
      /deep/ .el-card__body {
@@ -1158,32 +1174,29 @@
      position: absolute;
      z-index: 40;
    }
    .lengend {
      width: 80px;

    .lengend {
      width: 300px;
      z-index: 40;
      position: absolute;
      right: 8%;
      bottom: 1%;
      right: 1%;
      bottom: 13%;
      transform: rotate(90deg);
      .lengendBox {
        width: 100%;
        height: 100%;
        display: flex;
        .lengendSpan {
          flex-direction: column;
          align-items: center;
          display: flex;
          justify-content: space-between;
          margin-top: 10px;
          div {
            transform: rotate(-90deg);
          }
        }
        .lengend_color {
          background-image: linear-gradient(
            #0055ff,
            #2448da,
            #483cb6,
            #6d3091,
            #91246d,
            #b61848,
            #da0c24
          );
        .lengendImg {
          -ms-transform: rotate(180deg); /* IE 9 */
          -webkit-transform: rotate(180deg); /* Safari and Chrome */
          transform: rotate(180deg);
          width: 100%;
          height: 30px;
        }
      }
    }

 src/views/AuthorizationManagement/menuRoleAuthorization.vue

@@ -178,6 +178,7 @@
    <el-dialog
      :title="$t('operatManage.UserRoleAuthorizationObj.Added')"
      :visible.sync="dialogTableVisible"
      :before-close="handleClose"
    >
      <el-table
        :data="gridData"
@@ -209,7 +210,7 @@
        </el-pagination>
      </div>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" @click="dialogTableVisible = false">{{
        <el-button size="small" @click="handleClose">{{
          $t("dataManage.dictionaryManageObj.cancel")
        }}</el-button>
        <el-button size="small" type="primary" @click="addConfirm">{{
@@ -504,6 +505,13 @@
          break;
      }
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogTableVisible = false
        })
        .catch((_) => { });
    },
  },
  created() {
    var val = this.$store.state.currentPerms;

 src/views/AuthorizationManagement/roleMenuAuthorization.vue

@@ -193,6 +193,7 @@
    <el-dialog
      :title="$t('operatManage.UserRoleAuthorizationObj.Added')"
      :visible.sync="dialogTableVisible"
      :before-close="handleClose"
    >
      <el-table
        :data="gridData"
@@ -235,7 +236,7 @@
      >
        <el-button
          size="small"
          @click="dialogTableVisible = false"
          @click="handleClose"
        >{{
          $t('dataManage.dictionaryManageObj.cancel')
        }}</el-button>
@@ -531,6 +532,13 @@
          break;
      }
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogTableVisible = false
        })
        .catch((_) => { });
    },
  },
  created() {
    var val = this.$store.state.currentPerms;

 src/views/AuthorizationManagement/userRoleAuthorization.vue

@@ -170,6 +170,7 @@
    <el-dialog
      :title="$t('operatManage.UserRoleAuthorizationObj.Added')"
      :visible.sync="dialogTableVisible"
      :before-close="handleClose"
    >
      <el-table
        :data="gridData"
@@ -201,7 +202,7 @@
        </el-pagination>
      </div>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" @click="dialogTableVisible = false">{{
        <el-button size="small" @click="handleClose">{{
          $t("dataManage.dictionaryManageObj.cancel")
        }}</el-button>
        <el-button size="small" type="primary" @click="addConfirm">{{
@@ -566,6 +567,13 @@
          break;
      }
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogTableVisible = false
        })
        .catch((_) => { });
    },
  },
  created() {
    var val = this.$store.state.currentPerms;

 src/views/datamanage/catalogueManage.vue

@@ -566,7 +566,7 @@
      });
    },
    handleClose() {
      this.$confirm("确认关闭？")
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.resetForm();
        })

 src/views/datamanage/dictionaryManage.vue

@@ -319,6 +319,7 @@
      top="2vh"
      :title="$t('dataManage.dictionaryManageObj.revamp')"
      :visible.sync="dialogFormVisible"
      :before-close="handleClose"
    >
      <div style="height: 500px; overflow: auto">
        <el-form
@@ -426,7 +427,7 @@
        <el-button
          type="info"
          size="small"
          @click="dialogFormVisible = false"
          @click="handleClose"
        >{{ $t("dataManage.dictionaryManageObj.cancel") }}</el-button>
        <el-button
          class="primary"
@@ -441,6 +442,7 @@
      :title="$t('dataManage.dictionaryManageObj.add')"
      top="2vh"
      :visible.sync="InsertFormdialog"
      :before-close="handleCloseadd"
    >
      <div style="height: 500px; overflow: auto">
        <el-form
@@ -548,7 +550,7 @@
        <el-button
          type="info"
          size="small"
          @click="InsertFormdialog = false"
          @click="handleCloseadd"
        >{{
          $t("dataManage.dictionaryManageObj.cancel")
        }}</el-button>
@@ -822,6 +824,20 @@
      this.activeName = result[0].tab;
      this.startQueryNameData();
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogFormVisible = false
        })
        .catch((_) => { });
    },
    handleCloseadd() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false
        })
        .catch((_) => { });
    },
  },
};
</script>

 src/views/datamanage/styleManage.vue

@@ -1304,19 +1304,27 @@
      }
    },
    insertFromDataClose() {
      this.InsertFormdialog = false;
      this.insertform = {};
      this.insertFileGuid = "";
      this.insertViewGuid = "";
      this.filesReset();
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false;
          this.insertform = {};
          this.insertFileGuid = "";
          this.insertViewGuid = "";
          this.filesReset();
        })
        .catch((_) => { });
    },
    handleClose() {
      this.InsertFormdialog = false;
      this.insertform = {
        fileGuid: null,
        viewGuid: null,
      };
      this.filesReset();
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false;
          this.insertform = {
            fileGuid: null,
            viewGuid: null,
          };
          this.filesReset();
        })
        .catch((_) => { });
    },
    async insertFromData() {
      if (this.insertform.dirid == null || this.insertform.depid == null) {
@@ -1547,9 +1555,13 @@
    },

    removeUpdate() {
      this.upflag = false;
      this.dialogFormVisible = false;
      this.upform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.upflag = false;
          this.dialogFormVisible = false;
          this.upform = {};
        })
        .catch((_) => { });
      // this.filesReset();
    },
    submitForm(formName) {

 src/views/datamanage/versionManage.vue

@@ -195,6 +195,7 @@
    <el-dialog
      :title="$t('dataManage.vmobj.editVersion')"
      :visible.sync="dialogFormVisible"
      :before-close="handleClose"
    >
      <div style="height: 500px; overflow: auto">
        <el-form
@@ -279,6 +280,7 @@
    <el-dialog
      :title="$t('dataManage.vmobj.addVersion')"
      :visible.sync="InsertFormdialog"
      :before-close="handleCloseadd"
    >
      <div style="height: 500px; overflow: auto">
        <el-form
@@ -681,8 +683,14 @@
      }
    },
    editFromDataClose() {
      this.dialogFormVisible = false;
      this.upform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogFormVisible = false
          this.upform = {};
        })
        .catch((_) => { });
      // this.dialogFormVisible = false;
      // this.upform = {};
    },
    async editFromData() {
      if (this.upform.depName == null) {
@@ -709,8 +717,14 @@
      }
    },
    insertFromDataClose() {
      this.InsertFormdialog = false;
      this.insertform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false
          this.insertform = {};
        })
        .catch((_) => { });
      // this.InsertFormdialog = false;
      // this.insertform = {};
    },
    async insertFromData() {

@@ -778,6 +792,20 @@
      this.dialogFormVisible = true;
      this.upform = row;
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogFormVisible = false
        })
        .catch((_) => { });
    },
    handleCloseadd() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false
        })
        .catch((_) => { });
    },
  },
  watch: {
    pathId: {

 src/views/maintenance/blackwhiteList.vue

@@ -310,6 +310,7 @@
    <el-dialog
      :title="$t('common.append')"
      :visible.sync="InsertFormdialog"
      :before-close="handleClose"
    >

      <el-form ref="insertform" :model="insertform" label-position="top">
@@ -358,6 +359,7 @@
      :title="$t('common.update')"
      style="overflow: hidden"
      :visible.sync="updateFormdialog"
      :before-close="handleCloseEdit"
    >
      <el-form ref="editfrom" :model="editfrom" label-position="top">
        <el-form-item :label-width="formLabelWidth" label="IP地址">
@@ -471,10 +473,14 @@
      });
    },
    editFromDataClose() {
      this.updateFormdialog = false;
      this.$nextTick(() => {
        this.editForm = JSON.parse(this.initialForm);
      });
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.updateFormdialog = false;
          this.$nextTick(() => {
            this.editForm = JSON.parse(this.initialForm);
          });
        })
        .catch((_) => { });
    },
    queryBlackInfo() {
      let searchData = {
@@ -602,8 +608,12 @@
      this.InsertFormdialog = true;
    },
    insertFromDataClose() {
      this.InsertFormdialog = false;
      this.insertform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false;
          this.insertform = {};
        })
        .catch((_) => { });
    },
    async insertFromData() {
      var count = await blacklistSelectCount(this.insertform);
@@ -715,6 +725,20 @@
          break;
      }
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false
        })
        .catch((_) => { });
    },
    handleCloseEdit() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.updateFormdialog = false
        })
        .catch((_) => { });
    },
  },
  mounted() {
    window.addEventListener("resize", this.onResize);

 src/views/maintenance/menuSettings.vue

@@ -217,6 +217,7 @@
    <el-dialog
      :title="$t('common.append')"
      :visible.sync="dialogFormVisible"
      :before-close="handleClose"
    >
        <div style="height: 500px; overflow: auto">
      <el-form
@@ -603,11 +604,15 @@
      this.ruleForm.level = data.level + 1;
    },
    resetForm(formName) {
      this.dialogFormVisible = false;
      this.$nextTick(() => {
        this.$refs[formName].resetFields();
        this.ruleForm = {};
      });
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogFormVisible = false;
          this.$nextTick(() => {
            this.$refs[formName].resetFields();
            this.ruleForm = {};
          });
        })
        .catch((_) => { });
    },
    submitForm(formName) {
      this.$nextTick(() => {
@@ -859,6 +864,13 @@
        }
      }
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogFormVisible = false
        })
        .catch((_) => { });
    },
  },
  mounted() {
    this.getMenuTree();

 src/views/maintenance/parameterConfiguration.vue

@@ -207,8 +207,12 @@
      this.upform = row;
    },
    EditFromDataClose() {
      this.EditFormdialog = false;
      this.upform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.EditFormdialog = false;
          this.upform = {};
        })
        .catch((_) => { });
    },
    async EditFromData() {
      if (

 src/views/maintenance/tokentool.vue

@@ -190,6 +190,7 @@
    <el-dialog
      :title="$t('operatManage.tokentoolObj.addToken')"
      :visible.sync="InsertFormdialog"
      :before-close="handleClose"
    >
        <div style="height: 500px; overflow: auto">
      <el-form ref="formData1" :model="insertform" label-position="top">
@@ -258,6 +259,7 @@
    <el-dialog
      :title="$t('operatManage.tokentoolObj.editToken')"
      :visible.sync="EditFormdialog"
      :before-close="handleCloseEdit"
    >
     <div style="height: 500px; overflow: auto">
      <el-form ref="formData1" :model="insertform" label-position="top">
@@ -463,8 +465,12 @@
      // }
    },
    editFromDataClose() {
      this.EditFormdialog = false;
      this.upform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.EditFormdialog = false;
          this.upform = {};
        })
        .catch((_) => { });
    },
    async editFromData() {
      this.upform.type = parseInt(this.upform.edit);
@@ -500,8 +506,12 @@
      this.multipleSelection = val;
    },
    insertFromDataClose() {
      this.InsertFormdialog = false;
      this.insertform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false;
          this.insertform = {};
        })
        .catch((_) => { });
    },
    async insertFromData() {
      if (
@@ -643,6 +653,20 @@
      }
      return moment(parseInt(date)).format("YYYY-MM-DD HH:mm:ss");
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false
        })
        .catch((_) => { });
    },
    handleCloseEdit() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.EditFormdialog = false
        })
        .catch((_) => { });
    },
  },
};
</script>

 src/views/userManage/authorityManage.vue

@@ -242,6 +242,7 @@
      :title="$t('userManage.userInfoObj.addPermission')"
      style="overflow: hidden"
      :visible.sync="InsertFormdialog"
      :before-close="handleClose"
    >

      <el-form :model="insertform" label-position="top">
@@ -489,8 +490,12 @@
      this.getRoleTabelData();
    },
    EditFromDataClose() {
      this.EditFormdialog = false;
      this.upform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.EditFormdialog = false;
          this.upform = {};
        })
        .catch((_) => { });
    },
    async EditFromData() {
      const data = await updateAuth(this.upform);
@@ -530,8 +535,12 @@
      this.getRoleTabelData();
    },
    insertFromDataClose() {
      this.InsertFormdialog = false;
      this.insertform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false;
          this.insertform = {};
        })
        .catch((_) => { });
    },
    async insertFromData() {
      const data = await insertAuth(this.insertform);
@@ -577,6 +586,13 @@
      this.dialogTitle = row.name;
      this.isTransfer = true;
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false
        })
        .catch((_) => { });
    },
  },
};
</script>

 src/views/userManage/orgManage.vue

@@ -223,6 +223,7 @@
    <el-dialog
      :title="$t('common.append')"
      :visible.sync="dialogFormVisible"
      :before-close="handleClose"
    >
     <div style="height: 500px; overflow: auto">
      <el-form
@@ -588,11 +589,15 @@
      // console.log(node);
    },
    resetForm(formName) {
      this.dialogFormVisible = false;
      this.$nextTick(() => {
        this.ruleForm = {};
        this.$refs[formName].resetFields();
      });
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogFormVisible = false;
          this.$nextTick(() => {
            this.ruleForm = {};
            this.$refs[formName].resetFields();
          });
        })
        .catch((_) => { });
    },
    submitForm(formName) {
      this.$refs[formName].validate((valid) => {
@@ -850,6 +855,13 @@
        }
      }
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.dialogFormVisible = false
        })
        .catch((_) => { });
    },
  },
  mounted() {
    this.getMenuTree();

 src/views/userManage/roleManage.vue

@@ -274,7 +274,7 @@

    <el-dialog
      :title="$t('userManage.RM.insertRole')"

      :before-close="handleClose"
      style="overflow: hidden"
      :visible.sync="InsertFormdialog"
    >
@@ -385,6 +385,7 @@
    <el-dialog
      :title="$t('userManage.RM.updateRole')"
      :visible.sync="UpdateFormdialog"
      :before-close="handleCloseEdit"
    >
        <div style="height: 500px; overflow: auto">
      <el-form :model="updateform" label-position="top">
@@ -793,8 +794,12 @@
      });
    },
    insertFromClose() {
      this.InsertFormdialog = false;
      this.insertform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false;
          this.insertform = {};
        })
        .catch((_) => { });
    },
    async insertFromData() {
      if (this.insertform.depValue == null) {
@@ -821,8 +826,12 @@
      }
    },
    updateFromClose() {
      this.UpdateFormdialog = false;
      this.updateform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.UpdateFormdialog = false;
          this.updateform = {};
        })
        .catch((_) => { });
    },
    async updateFromData() {
      if (this.updateform.depValue == null) {
@@ -924,6 +933,20 @@
          break;
      }
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false
        })
        .catch((_) => { });
    },
    handleCloseEdit() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.UpdateFormdialog = false
        })
        .catch((_) => { });
    },
  },
  beforeDestroy() {
    this.timer && clearTimeout(this.timer);

 src/views/userManage/templateManage.vue

@@ -179,7 +179,6 @@
      "
      :visible.sync="dialogVisible"
      :before-close="handleClose"
      :show-close="false"
    >
      <div style="height: 500px; overflow: auto">
        <el-form
@@ -493,7 +492,7 @@
        };
      }

      this.$confirm("确认关闭？", blackTheme)
      this.$confirm("关闭后无法保存，是否关闭?", blackTheme)
        .then((_) => {
          this.closeInsertData();
        })

 src/views/userManage/userInfoManage.vue

@@ -926,7 +926,7 @@
    },
    //关闭弹出框
    handleClose(done) {
      this.$confirm("确认关闭？")
      this.$confirm("关闭后无法保存，是否关闭？")
        .then((_) => {
          this.editForm = {
            uid: "",