版本更新

Surpriseplus

2023-02-18 cbbbc6bd2d854270b9342ce2ff2a3432aaca22cf

版本更新

 src/api/api.js

@@ -701,7 +701,7 @@

//资料馆=>分页查询元数据
export function dataLib_selectByPageForMeta(params) {
  return request.get('/dataLib/selectByPageForMeta', { params: params });
  return request.get('/dataLib/selectMetasForPage', { params: params });
}
//资料馆=>分页查询
export function dataLib_selectDownloadFile(params) {
@@ -937,7 +937,7 @@

//项目管理查询目录
export function project_selectDirAll(params) {
  return request.get('/project/selectDirRoot', { params: params });
  return request.get('/project/selectProject', { params: params });
}
//项目管理=》根据目录ID查询
export function project_selectByDirid(params) {

 src/assets/img/lg_03.png

 src/assets/lang/en.js

@@ -97,8 +97,10 @@
      selectMetadata: 'Select Metadata',
      entryName: 'Entry Name',
      selectWBSData: 'Select WBS Data',

      coordinateSystem: 'Coordinate System'
      coordinateSystem: 'Coordinate System',
      fileExtension:"File extension",
      inspectionItems:"Inspection items",
      code:'Code'
    },

    metadataManage: 'metadataManage',
@@ -509,6 +511,8 @@
    type2: 'Thematic map',
    type3: 'Metadata',
    type4: 'Business data',
    type5: 'Pipeline analysis',
    type6: 'Statistical report',
  },
  dataApply: {
    type1: 'Cancel',

 src/assets/lang/zh.js

@@ -94,11 +94,11 @@
      selectData: '选择数据',
      selectMetadata: '选择元数据',
      entryName: '项目名称',


      selectWBSData: '选择WBS数据',

      coordinateSystem: '坐标系'
      coordinateSystem: '坐标系',
      fileExtension:"文件扩展名",
      inspectionItems:"检查项",
      code:'编码'
    },
    metadataManage: '元数据管理',
    dataLoading: '数据入库',
@@ -525,6 +525,8 @@
    type2: '专题图',
    type3: '元数据',
    type4: '业务数据',
    type5: '管道分析',
    type6: '统计报告',
  },
  loglog: {
    serialnumber: '序号',

 src/components/MapView/mapMenuPop.vue

@@ -359,7 +359,7 @@
        this.ruleForm.wkt = decr(this.listdata.wkt)
        this.ruleForm.tabs = this.option;
        this.dialogInsertVisible = true;
      }
      }download

    },
    async signGetPublicKey() {
@@ -405,7 +405,7 @@
          std1.push(this.option[i].entity)
        }
        var obj = {
          ids: this.insertOption.ids,
          depcodes: this.insertOption.ids,
          pwd: encr(this.codeForm.password),
          tabs: std,
          entities: std1,
@@ -474,6 +474,7 @@
        }
        this.$store.state.queryInfo = [];
        if (this.$store.state.primitLayer != null) {
            sgworld.Viewer.entities.remove(this.$store.state.primitLayer);
          sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
          this.$store.state.primitLayer = null;
        }
@@ -669,19 +670,20 @@
      }
    },
    primitivesAddLayer(res) {
      debugger

      switch (res.type) {
        case "Point":
          var val = Cesium.Cartesian3.fromDegrees(
            res.coordinates[0],
            res.coordinates[1],
            200

          );
          var point = Viewer.entities.add({
            position: val,
            billboard: {
              // 图像地址，URI或Canvas的属性
              image: SmartEarthRootUrl + "Workers/image/mark.png",
              heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
              // 大小是否以米为单位
              sizeInMeters: false,
              // 相对于坐标的垂直位置
@@ -694,6 +696,7 @@
              show: true
            }
          });
          point.billboard.disableDepthTestDistance = Number.POSITIVE_INFINITY; 
          this.$store.state.queryInfo.push(point)
          break;
        case "LineString":

 src/components/MapView/mapSpacePop.vue

@@ -45,12 +45,14 @@
          ></el-input>
        </el-form-item>
        <el-form-item>
          <el-button size="small"
          <el-button
            size="small"
            plain
            @click="setSpaceTableLayer"
          >查询</el-button>
          <el-button
            plain size="small"
            plain
            size="small"
            @click="restSpacePopLayer"
          >重置</el-button>
        </el-form-item>
@@ -140,6 +142,11 @@
      attributeData: [],
      optionx: [],
      options: [],
      conditions: [
        ['<>', 'like'],
        ['>=', '>', ' =', '<=', '<', '<>'],
        ['>=', '<='],
      ],
      options1: [
        {
          value: '=',
@@ -220,15 +227,35 @@
      this.showSpacePopLayer();
    },
    changeValue(value) {

      var obj = {};
      obj = this.optionx.find(function (item) {
        return item.value === value;
        return item.field === value;
      });
      if (obj.type == 'serial' || obj.type == 'int') {
        this.options = this.options2;
      // debugger
      // if (obj.type == 'serial' || obj.type == 'int') {
      //   this.options = this.options2;
      // } else {
      //   this.options = this.options1;
      // }
      this.options = [];

      var std = [];

      if (obj.type == "text" || obj.type == "blob") {
        std = this.conditions[0];
      } else if (obj.type == "date" || obj.type == "datetime") {
        std = this.conditions[2];
      } else {
        this.options = this.options1;
        std = this.conditions[1];
      }
      for (var i in std) {
        this.options.push({
          label: std[i],
          value: std[i],
        });
      }

      this.formInline.region = this.options[0].value;
    },
    setListDataStart() {
@@ -240,11 +267,22 @@
    showSpacePopLayer() {
      let val_date = this.optionx[0];
      this.formInline.name = val_date.field;
      if (val_date.type == 'serial' || val_date.type == 'int') {
        this.options = this.options2;
      this.options = [];
      var std = [];
      if (val_date.type == "text" || val_date.type == "blob") {
        std = this.conditions[0];
      } else if (val_date.type == "date" || val_date.type == "datetime") {
        std = this.conditions[2];
      } else {
        this.options = this.options1;
        std = this.conditions[1];
      }
      for (var i in std) {
        this.options.push({
          label: std[i],
          value: std[i],
        });
      }

      this.formInline.region = this.options[0].value;
      this.getSpaceTableLayer();
    },
@@ -336,6 +374,7 @@
      var val1 = decr(data.result);
      if (val1) {
        if (this.$store.state.primitLayer != null) {
          sgworld.Viewer.entities.remove(this.$store.state.primitLayer);
          sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
          this.$store.state.primitLayer = null;
        }
@@ -352,37 +391,63 @@
      this.getSpaceTableLayer();
    },
    setMapLoaction(res) {
          if (this.$store.state.primitLayer != null) {
          sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
          this.$store.state.primitLayer = null;
        }
      if (this.$store.state.primitLayer != null) {
        sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
        // this.$store.state.primitLayer = null;
        sgworld.Viewer.entities.remove(this.$store.state.primitLayer);
        this.$store.state.primitLayer = null;
      }
      var coord = res.coordinates;
      if (res.type == 'Point') {
        this.$store.state.primitLayer = sgworld.Creator.CreateLabel(
          { X: coord[0], Y: coord[1], Altitude: 2000 },
          '',
          SmartEarthRootUrl + 'Workers/image/mark.png',
          {
            disableDepthTestDistance: Infinity,
            scale: 0.8,
          },
          0,
          '巡检点'
        var val = Cesium.Cartesian3.fromDegrees(
          res.coordinates[0],
          res.coordinates[1],

        );
        sgworld.Navigate.flyToObj(this.$store.state.primitLayer.item);
      } else if (res.type == 'MultiPolygon') {
        this.$store.state.primitLayer = Viewer.entities.add({
          position: val,
          billboard: {
            // 图像地址，URI或Canvas的属性
            image: SmartEarthRootUrl + "Workers/image/mark.png",
            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
            // 大小是否以米为单位
            sizeInMeters: false,
            // 相对于坐标的垂直位置
            verticalOrigin: Cesium.VerticalOrigin.CENTER,
            // 相对于坐标的水平位置
            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
            // 应用于图像的统一比例。比例大于会1.0放大标签，而比例小于会1.0缩小标签。
            scale: 1.0,
            // 是否显示
            show: true
          }
        });
        this.$store.state.primitLayer.billboard.disableDepthTestDistance = Number.POSITIVE_INFINITY;

        sgworld.Navigate.flyToObj(this.$store.state.primitLayer)

      } else if (res.type == 'MultiPolygon' || res.type == 'LineString') {
        var val = res.coordinates[0][0];
        var std = [];
        for (var i in val) {

          std.push({ x: val[i][0], y: val[i][1], z: 1000 })
          std.push({ x: val[i][0], y: val[i][1] })
        }
        this.$store.state.primitLayer = sgworld.Creator.createPolygon(std, {
          fillColor: '#ffff00',
          outlineColor: '#fff',
          outlineWidth: 2
        }, 1, 0, "面");
        sgworld.Navigate.flyToObj(this.$store.state.primitLayer.item);
        this.$store.state.primitLayer = Viewer.entities.add({
          polyline: {
            positions: Cesium.Cartesian3.fromDegreesArray(std),
            width: 5,
            material: new Cesium.Color(1.0, 0.0, 0.0, 0.3),
            clampToGround: true,
          }
        })

        // this.$store.state.primitLayer = sgworld.Creator.createPolygon(std, {
        //   fillColor: '#ffff00',
        //   outlineColor: '#fff',
        //   outlineWidth: 2
        // }, 1, 0, "面");
        sgworld.Navigate.flyToObj(this.$store.state.primitLayer);
      } else if (res.type == 'MultiLineString') {
        var line = res.coordinates[0];
        var std = [];
@@ -390,7 +455,7 @@

          std.push({ x: line[i][0], y: line[i][1], z: 1000 })
        }
       this.$store.state.primitLayer = sgworld.Creator.createPolyline(std, "#ffff00", 1, 0, "线");
        this.$store.state.primitLayer = sgworld.Creator.createPolyline(std, "#ffff00", 1, 0, "线");
        sgworld.Navigate.flyToObj(this.$store.state.primitLayer.item);
      }
    },
@@ -412,19 +477,16 @@
  }
  .rightTitle {
    padding: 5px;
    

    width: 100%;
    .boxClose {
      float: right;
      margin-right: 20px;
    
    }
  }
  .bottomPage {
    position: absolute;
    bottom: 1%;
  }
  
  
}
</style>

 src/components/MapView/mapSpaceTop.vue

@@ -2,6 +2,20 @@
  <div class="spaceBox">
    <el-select
      v-model="menuTopFrom.queryLayer"
      @change="menuTreeCheck"
      placeholder="请选择..."
      filterable
    >
      <el-option
        v-for="item in layerData"
        :key="item.entity"
        :label="item.tabDesc"
        :value="item.entity"
      >
      </el-option>
    </el-select>
    <!-- <el-select
      v-model="menuTopFrom.queryLayer"
      placeholder="请选择..."
    >
      <el-option
@@ -37,14 +51,14 @@
          >重置</el-button>
        </div>
      </el-option>
    </el-select>
    </el-select> -->
    <queryinfo ref="queryinfo" />
  </div>
</template>

<script>
import queryinfo from "../../views/Tools/queryinfo.vue"
import { inquiry_SelectTabs } from '../../api/api.js';
import { inquiry_SelectTabs, dataLib_selectTabs } from '../../api/api.js';
export default {
  components: { queryinfo },
  data() {
@@ -62,7 +76,7 @@
        },
        {
          id: 2,
          label: '基础数据',
          label: '业务数据',
          tabDesc: '业务数据',
          value: 'BS',
          children: [],
@@ -80,29 +94,40 @@
  },
  methods: {
    async getAllTable() {
      const data = await inquiry_SelectTabs();
      // const data = await inquiry_SelectTabs();
      const data = await dataLib_selectTabs({
        pageIndex: 1,
        pageSize: 500
      })
      if (data.code != 200) {
        this.$message.error('列表调用失败');
      }
      var option = data.result;

      for (var i in option) {
        var val_Data = option[i];
        val_Data.id = '1' + i;
        val_Data.label = val_Data.tabDesc ;
        if (option[i].ns == 'bd') {
          this.layerData[0].children.push(val_Data);
        } else {
          this.layerData[1].children.push(val_Data);
      this.layerData = option.filter((res) => {
        if (res.rows != 0) {
          return res;
        }
      }
      })
     

      // for (var i in option) {
      //   // console.log(option[i].tableType)
      //   var val_Data = option[i];
      //   val_Data.id = '1' + i;
      //   val_Data.label = val_Data.tabDesc;
      //   if (option[i].ns == 'bd') {
      //     this.layerData[0].children.push(val_Data);
      //   } else {
      //     this.layerData[1].children.push(val_Data);
      //   }
      // }
    },
    getCheckedNodes() {
      this.$store.state.mapSpaceQueryLayer = this.mapSpaceQueryLayer;
      // this.$store.state.mapPopBoolean = true;
      this.$store.state.mapPopBoxFlag = '2';
      // this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close();
      this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.open("空间查询", null, {
      this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close();
      this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.open("属性", null, {
        close: () => {

          if (this.$store.state.primitLayer != null) {
@@ -120,17 +145,11 @@
      this.menuTopFrom.queryLayer = null;
      this.$refs.treeForm.setCheckedKeys([]);
    },
    menuTreeCheck(node, list) {
      if (list.checkedNodes.length > 0) {
        this.menuTopFrom.queryLayer = node.tabDesc;
        this.mapSpaceQueryLayer = node.entity;
        if (list.checkedKeys.length == 2) {
          //单选实现
          this.$refs.treeForm.setCheckedKeys([node.id]);
        }
      } else {
        this.menuid = null;
      }
    menuTreeCheck(value) {

      this.mapSpaceQueryLayer = value;

      this.getCheckedNodes();
    },
  },
};
@@ -146,5 +165,4 @@
}
</style>
<style lang="less" scoped>
 
</style>

 src/components/login.vue

@@ -25,14 +25,14 @@
        v-bind:src="reportUrl"
      ></iframe>
    </div>
 <div class="title_img">
    <div class="title_img">
      <img
        src="../assets/img/loginLogo.png"
        src="../assets/img/lg_03.png"
        alt=""
      />
    </div>
    <div class="login">
     

      <div class="login_title">
        <span>用户登录</span>
      </div>
@@ -82,6 +82,7 @@
              ></el-input>
            </el-form-item>
          </el-col>
 

          <el-col
            :span="6"
@@ -274,7 +275,12 @@

    },
    startURL() {
      this.reportUrl = window.location.origin + '/mapscreen/index.html';
   var url = window.location.href;
      var testurl = '';
      if (url.indexOf('web') != -1) {
        testurl = '/web';
      }
      this.reportUrl = window.location.origin + testurl + '/mapscreen/index.html';
    }
  },
  created() {
@@ -304,12 +310,12 @@
    left: 1%;
    position: absolute;
  }
 
}
.title_img {
  position: absolute;
  left: 10%;
  top:8%;
  left: 17%;
  top: 8%;
  width: 20%;
  /* transform: translateX(-50%); */
}
.title_img img {
@@ -331,7 +337,7 @@
  left: 75%;
  top: 45%;
  transform: translate(-50%, -40%);
  background: rgba(255, 255, 255, 0.6);
  background: rgba(255, 255, 255, 0.8);
  border-radius: 8px;
}


 src/views/Archive/index.vue

@@ -153,7 +153,7 @@
                @change="handleChange1"
                :props="{
              label: 'name',
              value: 'id',
              value: 'code',
              children: 'children',
              checkStrictly: true,
              emitPath: false,
@@ -171,7 +171,7 @@
              <el-button
                icon="el-icon-search"
                @click="searchDataLibSelectTabs"
                size="mini"
                size="small"
              >{{
              $t('common.iquery')
            }}</el-button>
@@ -179,7 +179,7 @@
                icon="el-icon-refresh"
                @click="restDataLibSelectTabs"
                type="info"
                size="mini"
                size="small"
              >{{
              $t('common.reset')
            }}</el-button>
@@ -187,7 +187,7 @@
            <el-form-item>
              <el-button
                @click="getSpaceMapVisibale"
                size="mini"
                size="small"
              >{{
              $t('synthesis.rangequery')
            }}</el-button>
@@ -195,7 +195,7 @@
            <el-form-item>
              <el-button
                @click="getdownloadList"
                size="mini"
                size="small"
              >{{
              $t('synthesis.DownloadList')
            }}</el-button>
@@ -205,14 +205,14 @@
        <div v-if="isMenuActive">
          <ul>
            <li
              v-for="(item, index) in dataType"
              v-for="(item, index) in dataTypeList"
              :key="index"
            >
              <div
                class="menu_div"
                @click="getShowTable(item)"
              >
                {{ item.tabDesc }}
                {{ item.tabDesc }} <span style="margin-left:20px">{{item.rows}}条</span>
              </div>
            </li>
          </ul>
@@ -939,6 +939,7 @@
      }
    };
    return {
      dataTypeList: [],
      loading: false,
      downloadLogVisible: false,
      downloadListVisible: false,
@@ -1010,9 +1011,9 @@
      listData: {
        pageIndex: 1,
        pageSize: 10,
        depid: null,
        dirid: null,
        name: null
        depcode: null,
        dirs: null,
        tab: null
      },
      count: 0,
      count1: 0,
@@ -1042,6 +1043,10 @@
        pageSize: 10,
        count: 0,
        name: null,
      },
      queryList: {
        showList1: '',
        showList2: ''
      }
    };
  },
@@ -1198,6 +1203,20 @@
          }
        }
      }
      var std = "";
      for (var i in this.checkedEntryName) {
        for (var j in this.showList1) {
          if (this.showList1[j].name == this.checkedEntryName[i]) {
            if (std.length != 0) {
              std += ","
            }
            std += this.showList1[j].id
          }
        }
      }
      this.queryList.showList2 = std;

      this.getQueryShowListData();
    },
    handleCheckedDataTypeChange(res) {
      if (this.checkedDataType.indexOf(res.name) != -1) {
@@ -1210,16 +1229,80 @@
          }
        }
      }

      var std = "";
      for (var i in this.checkedDataType) {
        for (var j in this.showList) {
          if (this.showList[j].name == this.checkedDataType[i]) {
            if (std.length != 0) {
              std += ","
            }
            std += this.showList[j].id
          }
        }
      }
      this.queryList.showList1 = std;
      this.getQueryShowListData();
    },
    changeListDataType(res) {
      if (this.isShowFirstCheck == false) {
        this.dataTypeName = res.name;
        this.queryList.showList1 = res.id;
        this.getQueryShowListData();
      }
    },

    getQueryShowListData() {
      var a1 = "";
      if (this.queryList.showList1 != "" && this.queryList.showList1 != null) {
        a1 = this.queryList.showList1;
      }
      if (this.queryList.showList2 != "" && this.queryList.showList2 != null) {
        if (a1.length != 0) {
          a1 += ","
        }
        a1 += this.queryList.showList2;
      }
      this.listData.dirs = a1;
      this.listData.pageIndex = 1;
      this.listData.pageSize = 10;
      if (this.isMenuActive == true) {
        this.getDataLibSelectTabs()
      } else {
        this.queryInfo();
      }


    },

    restDataLibSelectTabs() {
      this.formInline.tab = ""
      this.queryList = {
        showList1: null,
        showList2: null,
      }
      this.formInline.depid = this.companyOption1[0].code;
      this.listData.depcode = this.companyOption1[0].code;
      this.checkedDataType = []
      this.dataTypeName = '不限';
      this.dataTypeName = null;
      this.checkedDataType = ['不限'];
      this.isShowFirstCheck = false
      this.checkedDataType = []
      this.dataTypeName = '不限';
      this.queryList.showList1 = null;
      this.isShowSecondCheck = false;
      this.checkedEntryName = []
      this.EntryName = '不限';
      this.queryList.showList2 = null;
      this.getQueryShowListData();
    },


    changeListEntryName(res) {
      if (this.isShowSecondCheck == false) {
        this.EntryName = res.name;
        this.queryList.showList2 = res.id;
        this.getQueryShowListData();
      }
    },
    getSpaceMapVisibale() {
@@ -1247,6 +1330,17 @@
      this.$store.state.download = false;
      this.$store.state.mapPopBoolean = false;
      this.$store.state.mapPopBoxFlag = null;
      sgworld.Creator.SimpleGraphic.clear();
      if (this.entityaLayers.length != 0) {
        for (var i in this.entityaLayers) {
          sgworld.Viewer.entities.remove(this.entityaLayers[i]);
        }
        this.entityaLayers = [];
      }




    },
    moreEvent(res) {
      switch (res) {
@@ -1265,9 +1359,13 @@
          if (this.isShowFirstCheck == false) {
            this.checkedDataType = []
            this.dataTypeName = '不限';
            this.queryList.showList1 = null;
            this.getQueryShowListData();
          } else {
            this.dataTypeName = null;
            this.checkedDataType = ['不限']
            this.checkedDataType = ['不限'];
            this.queryList.showList1 = null;
            this.getQueryShowListData();
          }

          break;
@@ -1276,9 +1374,13 @@
          if (this.isShowSecondCheck == false) {
            this.checkedEntryName = []
            this.EntryName = '不限';
            this.queryList.showList2 = null;
            this.getQueryShowListData();
          } else {
            this.EntryName = null;
            this.checkedEntryName = ['不限']
            this.queryList.showList2 = null;
            this.getQueryShowListData();
          }
          break;
      }
@@ -1288,27 +1390,12 @@
      this.formInline.tab = ""
      switch (res) {
        case 1:
          this.listData = {
            pageIndex: 1,
            pageSize: 10,

          }
          this.getDataLibSelectTabs();
          this.isMenuActive = true;

          this.getQueryShowListData();
          break;
        case 2:
          this.listData = {
            pageIndex: 1,
            pageSize: 10,
            depid: null,
            dirid: null,
            name: null,
            verid: null
          }

          this.isMenuActive = false;
          this.getMetaData();
          this.getQueryShowListData();
          break;
      }
    },
@@ -1329,9 +1416,12 @@
        this.$message.error('单位列表获取失败');
        return;
      }
      this.formInline.depid = 1;
      // this.formInline.depid = 1;
      this.companyOption1 = this.treeData(res.result);
      // this.getMetaData();
      this.formInline.depid = this.companyOption1[0].code;
      this.listData.depcode = this.companyOption1[0].code;

      this.getQueryShowListData();
    },

    // 查询
@@ -1468,8 +1558,7 @@
      this.codeForm.repassword = '';
    },
    getMetaData() {
      this.listData.dirid = this.formInline.dirid
      this.listData.depid = this.formInline.depid;

      dataLib_selectByPageForMeta(this.listData).then((res) => {

        this.tableData1 = res.result;
@@ -1484,10 +1573,9 @@
      this.getMetaData();
    },
    handleChange1(value) {
      this.listData.pageSize = 10;
      this.listData.pageIndex = 1;
      this.formInline.depid = value;
      this.getMetaData();
      this.listData.depcode = value;
      this.getQueryShowListData();
    },
    //树列表生成
    treeData(source) {
@@ -1506,13 +1594,7 @@
        this.queryInfo();
      }
    },
    restDataLibSelectTabs() {
      this.formInline.tab = ""
      this.listData.pageIndex = 1;
      this.listData.pageSize = 10
      this.searchDataLibSelectTabs();

    },
    async getDataLibSelectTabs() {
      this.listData.tab = this.formInline.tab
      const data = await dataLib_selectTabs(this.listData);
@@ -1520,13 +1602,13 @@
        this.$message.error('列表调用失败');
        return;
      }

      this.count = data.count;
      this.dataType = data.result;

      this.dataTypeList = data.result;
    },
    showDetail1(row) {

      this.showinfoBox1 = true;

      this.itemdetail1 = row;
    },
    // 关闭查看
@@ -1724,7 +1806,8 @@
      } else {
        this.listTypeData.filter = null;
      }

      this.listTypeData.depcode = this.listData.depcode;
      this.listTypeData.dirs = this.listData.dirs
      const data = await dataLib_selectByPage(this.listTypeData);
      if (data.code != 200) {
        this.$message.error('调用列表失败,请联系工作人员!');
@@ -2193,5 +2276,8 @@
  /deeep/.el-form-item {
    margin-bottom: 0px;
  }
   /deeep/ .el-dialog__wrapper{
    z-index: 999;
  }
}
</style>

 src/views/Synthesis/LeftMenu.vue

@@ -411,13 +411,6 @@
    //二級菜单点击切换
    setChangeTwoMenu(res) {



      //关闭打开的信息窗体



      this.showTwoMenuFlag = res.id;
      this.$store.state.mapMenuBoolean = false;
      this.$store.state.mapMenuBoxFlag = null;
      this.$store.state.mapPopBoolean = false;
@@ -427,8 +420,10 @@
        window.model.deleteObject();
        window.model = null;
      }

      if (this.isMenuFlag != val) {
      if (this.isMenuFlag == "d") {
        this.clearAllAnalsy();
      }
      if (this.isMenuFlag != res.id) {
        sgworld.Creator.SimpleGraphic.clear();
        this.isMenuFlag = val;
        if (this.entityaLayers.length != 0) {
@@ -442,11 +437,12 @@
        }
        this.$store.state.queryInfo = [];
        if (this.$store.state.primitLayer != null) {
          sgworld.Viewer.entities.remove(this.$store.state.primitLayer);
          sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
          this.$store.state.primitLayer = null;
        }
      }

      this.showTwoMenuFlag = res.id;

      switch (val) {
        case 'a': //图层管理
@@ -1086,6 +1082,23 @@
          break;
      }
    },
    clearAllAnalsy() {
      // switch (this.showTwoMenuFlag) {
      //   case 'd1':
      //     that.isolineFlag = false;
      //     elevationTool.tf = that.isolineFlag;
      //     elevationTool.render();
      //     break;
      //   case 'd2':
      //     that.isslopeFlag = false;
      //     elevationTool.type = 'none';
      //     elevationTool.render();
      //     break;
      // }
    },



    setAnalsy(res) {
      //this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close("queryinfo");
      var that = this;

 src/views/Tools/LayerTree.vue

@@ -49,14 +49,14 @@
      v-show="menuVisible"
    >
      <div @click="addSameLevelNode()">
        <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;同级增加
        <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;添加图层组
      </div>
      <div
        class="add"
        @click="addChildNode()"
        v-show="firstLevel"
      >
        <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;子级增加
        <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;添加图层
      </div>
      <div
        class="delete"

 src/views/Tools/queryinfo.vue

@@ -61,15 +61,17 @@
    // 关闭弹窗
    close(id) {
      let index = this.PopupData.findIndex((item) => {
          console.log(item);
        console.log(item);
        return item.id === id;
      });
      let data = this.PopupData.splice(index, 1)[0];
      // data.close && data.close();
	 
	  
	  
	  
      if(this.$store.state.primitLayer != null){
sgworld.Viewer.entities.remove(this.$store.state.primitLayer);
      sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
      this.$store.state.primitLayer = null
      }
      
    },
    // 打开弹窗
    open(title, value, style = {}) {

 src/views/datamanage/SpatialData.vue

@@ -50,6 +50,15 @@
              $t('synthesis.rangequery')
            }}</el-button>
          </el-form-item>
            <el-form-item style="float: right">
              <el-button
                @click="resetForm"
                type="info"
                size="small"
                icon="el-icon-refresh"
              >{{$t('common.reset')}}</el-button>

            </el-form-item>
          <el-form-item style="float: right">
            <el-button
              @click="submitForm"

 src/views/datamanage/catalogueManage.vue

@@ -47,7 +47,7 @@
                    :file-list="fileList"
                  >
                    <el-button
                    type="success"
                      type="success"
                      icon="el-icon-plus"
                      size="small"
                    >上传文件</el-button>
@@ -121,7 +121,10 @@
            :label="$t('dataManage.dataUpObj.directoryName')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="itemdetail.name" style="max-width: 400px;"/>
            <el-input
              v-model="itemdetail.name"
              style="max-width: 400px;"
            />
          </el-form-item>
          <el-form-item
            :label="$t('dataManage.dataUpObj.catalogDescription')"
@@ -129,6 +132,40 @@
          >
            <el-input
              v-model="itemdetail.descr"
              type="textarea"
              resize="none"
              style="height: 100%; overflow: auto;max-width: 400px;"
            />
          </el-form-item>
          <el-form-item
            :label="$t('dataManage.dataUpObj.fileExtension')"
            :label-width="formLabelWidth"
          >
            <el-input
              v-model="itemdetail.exts"
              type="textarea"
              resize="none"
              style="height: 100%; overflow: auto;max-width: 400px;"
            />
          </el-form-item>
          <el-form-item
            :label="$t('dataManage.dataUpObj.inspectionItems')"
            :label-width="formLabelWidth"
          >
            <el-input
              v-model="itemdetail.checks"
              type="textarea"
              resize="none"
              style="height: 100%; overflow: auto;max-width: 400px;"
            />
          </el-form-item>
          <el-form-item
            :label="$t('dataManage.dataUpObj.code')"
            :label-width="formLabelWidth"
          >
            <el-input
              v-model="itemdetail.code"
              disabled
              type="textarea"
              resize="none"
              style="height: 100%; overflow: auto;max-width: 400px;"
@@ -208,6 +245,40 @@
            v-model="ruleForm.descr"
            autocomplete="off"
          ></el-input>
        </el-form-item>
        <el-form-item
          :label="$t('dataManage.dataUpObj.fileExtension')"
          :label-width="formLabelWidth"
        >
          <el-input
            v-model="ruleForm.exts"
            type="textarea"
            resize="none"
            style="height: 100%; overflow: auto; "
          />
        </el-form-item>
        <el-form-item
          :label="$t('dataManage.dataUpObj.inspectionItems')"
          :label-width="formLabelWidth"
        >
          <el-input
            v-model="ruleForm.checks"
            type="textarea"
            resize="none"
            style="height: 100%; overflow: auto; "
          />
        </el-form-item>
        <el-form-item
          :label="$t('dataManage.dataUpObj.code')"
          :label-width="formLabelWidth"
        >
          <el-input
            v-model="ruleForm.code"
            disabled
            type="textarea"
            resize="none"
            style="height: 100%; overflow: auto; "
          />
        </el-form-item>
        <el-form-item
          :label="$t('dataManage.dataUpObj.catalogRemarks')"
@@ -539,17 +610,17 @@
    },
    setDelNode() {
      this.$confirm('此操作将永久删除该目录, 是否继续?', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          this.remove(this.newNode, this.itemdetail)
        }).catch(() => {
          this.$message({
            type: 'info',
            message: '已取消删除'
          });          
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        this.remove(this.newNode, this.itemdetail)
      }).catch(() => {
        this.$message({
          type: 'info',
          message: '已取消删除'
        });
      });
    },
    setNewNode(res) {
      var id, lever, orderNum;

 src/views/datamanage/dictionaryManage.vue

@@ -110,11 +110,7 @@
            prop="tab"
            :label="$t('dataManage.dictionaryManageObj.rangeAssociationTable')"
          />
          <el-table-column
            min-width="100"
            prop="bak"
            :label="$t('dataManage.dictionaryManageObj.remark')"
          />
    
          <el-table-column
            min-width="100"
            prop="createTime"
@@ -126,7 +122,12 @@
            prop="createUser"
            :label="$t('dataManage.dictionaryManageObj.createPersonnel')"
          />
          <el-table-column
                <el-table-column
            min-width="100"
            prop="bak"
            :label="$t('dataManage.dictionaryManageObj.remark')"
          />
          <!-- <el-table-column
            min-width="100"
            prop="updateTime"
            :label="$t('dataManage.dictionaryManageObj.updateTime')"
@@ -136,7 +137,7 @@
            min-width="100"
            prop="updateUser"
            :label="$t('dataManage.dictionaryManageObj.updatePersonnel')"
          />
          /> -->

          <el-table-column
            min-width="100"

 src/views/datamanage/metadataManage.vue

@@ -17,7 +17,7 @@
            v-model="queryForm.depName"
          >
            <el-option
              :value="queryForm.depid"
              :value="queryForm.depcode"
              :label="queryForm.depName"
              style=" height:auto"
            >
@@ -50,7 +50,7 @@
            v-model="queryForm.dirName"
          >
            <el-option
              :value="queryForm.dirid"
              :value="queryForm.dircode"
              :label="queryForm.dirName"
              style=" height:auto"
            >
@@ -158,7 +158,10 @@
            size="small"
          >{{ $t('common.iquery') }}</el-button>
        </el-form-item>
        <el-form-item v-if="btnStatus.delete" style="float:right">
        <el-form-item
          v-if="btnStatus.delete"
          style="float:right"
        >
          <el-button
            type="danger"
            size="small"
@@ -166,7 +169,10 @@
            icon="el-icon-delete"
          >{{ $t('common.delete') }}</el-button>
        </el-form-item>
        <el-form-item v-if="btnStatus.download" style="float:right">
        <el-form-item
          v-if="btnStatus.download"
          style="float:right"
        >
          <el-button
            @click="downFormData"
            icon="el-icon-download"
@@ -283,10 +289,10 @@
      </div>
    </div>
    <div
      class="infoBox"
      class="infoBox box_div"
      v-show="showinfoBox"
    >
      <el-card class="box-card">
 
        <div
          slot="header"
          class="clearfix"
@@ -299,6 +305,7 @@
            <i class="el-icon-close"></i>
          </div>
        </div>
          <el-divider></el-divider>
        <div
          class="contentBox"
          style="padding:1%"
@@ -351,7 +358,7 @@
            }}
          </p>
        </div>
      </el-card>
 
    </div>
    <el-dialog
      width="80vh"
@@ -816,7 +823,7 @@
        return;
      }
      this.companyOption1 = this.treeData(res.result);
      this.queryForm.depid = this.companyOption1[0].id
      this.queryForm.depcode = this.companyOption1[0].code
      this.queryForm.depName = this.companyOption1[0].name
      this.getQueryDirTree();

@@ -829,7 +836,8 @@
        return;
      }
      this.companyOption = this.treeData(res.result);
      this.queryForm.dirid = this.companyOption[0].id
      this.queryForm.dirid = this.companyOption[0].id;
      this.queryForm.dircode = this.companyOption[0].code
      this.queryForm.dirName = this.companyOption[0].name
      this.getQueryVerList();
    },
@@ -853,6 +861,7 @@
    handleChange(data, node, nodeData) {
      this.listData.pageSize = 10;
      this.listData.pageIndex = 1;
      this.queryForm.dircode = data.code;
      this.queryForm.dirid = data.id;
      this.queryForm.dirName = data.name
      this.getQueryVerList()
@@ -860,19 +869,21 @@
    handleChange1(data, node, nodeData) {
      this.listData.pageSize = 10;
      this.listData.pageIndex = 1;
      this.queryForm.depid = data.id;
      this.queryForm.depcode = data.code;
      this.queryForm.depName = data.name
      this.getMetaData();
    },
    handleChange2(data, node, nodeData) {

      this.editForm.depid = data.id;
      this.editForm.depcode = data.code;
      this.editForm.depName = data.name

    },
    handleChange3(data, node, nodeData) {

      this.editForm.dirid = data.id;
      this.editForm.dircode = data.code;
      this.editForm.dirName = data.name

    },
@@ -942,7 +953,7 @@
      }
      this.optionCount = this.treeData(res.result);
      this.dirComPanyOption = this.treeData(res.result);
      this.listData.dirid = this.optionCount[0].id;
      this.listData.depcode = this.optionCount[0].code;

    },
    handleNodeClick(data) {
@@ -996,8 +1007,8 @@
    // },
    // 请求数据内容
    getMetaData() {
      this.listData.depid = this.queryForm.depid;
      this.listData.dirid = this.queryForm.dirid;
      this.listData.depcode = this.queryForm.depcode;
      this.listData.dircode = this.queryForm.dircode;

      this.listData.verid = this.queryForm.verid;
      // this.listData.dirid = 57
@@ -1023,6 +1034,8 @@
      this.listData.name = null;
      this.queryForm.dirid = this.companyOption[0].id;
      this.queryForm.depid = this.companyOption1[0].id;
      this.queryForm.dircode = this.companyOption[0].code;
      this.queryForm.depcode = this.companyOption1[0].code;
      this.queryForm.dirName = this.companyOption[0].name;
      this.queryForm.depName = this.companyOption1[0].name;
      this.getQueryVerList();
@@ -1041,7 +1054,7 @@
    sendAdd(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          console.log(this.editForm);
       
          this.fullscreenLoading = true;
          insertMeta(this.editForm)
            .then((res) => {

 src/views/datamanage/projectManage.vue

@@ -21,7 +21,7 @@
      </div>
      <div class="verSion_rightContent subpage_Div">
        <el-form
        style="    height: 44px;
          style="    height: 44px;
    padding: 1%;
    display: flex;
    flex-direction: row-reverse;
@@ -405,7 +405,8 @@
    //目录树点击事件
    handleNodeClick(data) {
      //获取目录ID
      this.dirId = data.id;
      // this.dirId = data.id;
      this.dirId = data.code
      this.getSelectProject();
    },


 src/views/exportMap/index.vue

@@ -534,7 +534,7 @@
      var token = "?token=" + getToken()
      var a = document.createElement("a") // 创建一个a标签元素
      a.style.display = "none" // 设置元素不可见
      a.href = BASE_URL + "/mark/downloadFile" + token + "&guid=" + guid
      a.href = BASE_URL + "/export/downloadFile" + token + "&guid=" + guid

      document.body.appendChild(a) // 加入
      a.click() // 触发点击,下载

 src/views/maintenance/downlog.vue

@@ -1,14 +1,19 @@
<template>
  <div class="logLog_box">
    <My-bread
      :list="[
    <My-bread :list="[
        `${$t('operatManage.operatManage')}`,
        `${$t('operatManage.DownloadLog')}`,
      ]"
    ></My-bread>
      ]"></My-bread>
    <el-divider />
    <div class="inquire subpage_Div" ref="container">
      <el-form :inline="true" ref="sizeForm" :model="sizeForm">
    <div
      class="inquire subpage_Div"
      ref="container"
    >
      <el-form
        :inline="true"
        ref="sizeForm"
        :model="sizeForm"
      >
        <div class="flex_box">
          <div style="margin-right: auto">
            <el-form-item
@@ -31,10 +36,30 @@
                v-model="sizeForm.type"
                :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
              >
                <el-option :label="$t('downlog.type1')" value="1" />
                <el-option :label="$t('downlog.type2')" value="2" />
                <el-option :label="$t('downlog.type3')" value="3" />
                <el-option :label="$t('downlog.type4')" value="4" />
                <el-option
                  :label="$t('downlog.type1')"
                  value="1"
                />
                <el-option
                  :label="$t('downlog.type2')"
                  value="2"
                />
                <el-option
                  :label="$t('downlog.type3')"
                  value="3"
                />
                <el-option
                  :label="$t('downlog.type4')"
                  value="4"
                />
                  <el-option
                  :label="$t('downlog.type5')"
                  value="5"
                />
                  <el-option
                  :label="$t('downlog.type6')"
                  value="6"
                />
              </el-select>
            </el-form-item>
            <el-form-item
@@ -73,21 +98,22 @@
                icon="el-icon-search"
                size="small"
                type="primary"
                >{{ $t("operatManage.operationLogObj.inquire") }}</el-button
              >
              >{{ $t("operatManage.operationLogObj.inquire") }}</el-button>
              <el-button
                @click="resAllTable"
                icon="el-icon-delete"
                type="info"
                size="small"
                >{{ $t("operatManage.operationLogObj.empty") }}</el-button
              >
              >{{ $t("operatManage.operationLogObj.empty") }}</el-button>
            </el-form-item>
          </div>
        </div>
      </el-form>
    </div>
    <div class="table_box subpage_Div" :style="styleVar">
    <div
      class="table_box subpage_Div"
      :style="styleVar"
    >
      <el-table
        :data="tableData"
        style="width: 100%"
@@ -134,7 +160,10 @@
          :formatter="formatData"
        />
      </el-table>
      <div style="margin-top: 25px" class="pagination_box">
      <div
        style="margin-top: 25px"
        class="pagination_box"
      >
        <el-pagination
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"
@@ -225,11 +254,17 @@
          return "专题图";
          break;
        case 3:
          return "元数据";
          return "源数据";
          break;
        case 4:
          return "业务数据";
          break;
        case 5:
          return "管道分析";
          break;
        case 6:
          return "统计报告";
          break;
        default:
          return "未知数据";
          break;

 src/views/maintenance/userManagement.vue

@@ -1,22 +1,30 @@
<template>
  <div class="userInfo_box">
    <My-bread
      :list="[
    <My-bread :list="[
        `${$t('operatManage.operatManage')}`,
        `${$t('userManage.userManage')}`,
      ]"
    ></My-bread>
      ]"></My-bread>
    <el-divider />

    <div class="inquire subpage_Div" ref="container">
      <el-form ref="queryForm" :model="queryForm" :inline="true">
    <div
      class="inquire subpage_Div"
      ref="container"
    >
      <el-form
        ref="queryForm"
        :model="queryForm"
        :inline="true"
      >
        <div class="flex_box">
          <div style="margin-right: auto">
            <el-form-item
              prop="uname"
              :label="$t('userManage.userInfoObj.uname')"
            >
              <el-input v-model="queryForm.uname" style="width: 200px" />
              <el-input
                v-model="queryForm.uname"
                style="width: 200px"
              />
            </el-form-item>
            <el-form-item
              prop="depid"
@@ -47,6 +55,16 @@
          <div>
            <el-form-item>
              <el-button
                type="primary"
                size="small"
                @click="queryInfo('queryForm')"
                icon="el-icon-search"
              >
                {{ $t("operatManage.ELM.search") }}
              </el-button>
            </el-form-item>
            <el-form-item>
              <el-button
                type="info"
                size="small"
                @click="resetInfo('queryForm')"
@@ -62,7 +80,7 @@
                @click="editPwd"
                type="warning"
                icon="el-icon-unlock"
                >{{ $t("common.changepassWord") }}
              >{{ $t("common.changepassWord") }}
              </el-button>
            </el-form-item>
            <el-form-item>
@@ -91,15 +109,22 @@
        </div>
      </el-form>
    </div>
    <div class="table_box" :style="styleVar">
    <div
      class="table_box"
      :style="styleVar"
    >
      <el-table
        ref="filterTable"
        :data="tableData"
        style="width: 100%"
        class="table_height"
        height="calc(100% - 57px)"
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55" />
        <el-table-column
          type="selection"
          width="55"
        />
        <el-table-column
          align="center"
          type="index"
@@ -180,11 +205,23 @@
          :label="$t('userManage.userInfoObj.status')"
        >
          <template slot-scope="scope">
            <el-tag v-if="scope.row.status == 0" type="success">正常</el-tag>
            <el-tag v-if="scope.row.status == 1" type="info">禁用</el-tag>
            <el-tag v-if="scope.row.status == 2" type="warning">删除</el-tag>
            <el-tag
              v-if="scope.row.status == 0"
              type="success"
            >正常</el-tag>
            <el-tag
              v-if="scope.row.status == 1"
              type="info"
            >禁用</el-tag>
            <el-tag
              v-if="scope.row.status == 2"
              type="warning"
            >删除</el-tag>
            <el-tag v-if="scope.row.status == 3">申请</el-tag>
            <el-tag v-if="scope.row.status == 4" type="danger">拒批</el-tag>
            <el-tag
              v-if="scope.row.status == 4"
              type="danger"
            >拒批</el-tag>
          </template>
        </el-table-column>
        <!-- <el-table-column
@@ -204,12 +241,14 @@
              plain
              @click="editInfo(scope.row)"
              size="small"
              >{{ $t("common.update") }}</el-button
            >
            >{{ $t("common.update") }}</el-button>
          </template>
        </el-table-column>
      </el-table>
      <div style="margin-top: 25px" class="pagination_box">
      <div
        style="margin-top: 25px"
        class="pagination_box"
      >
        <el-pagination
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"
@@ -247,8 +286,14 @@
            v-if="behavior == '新增用户'"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.uid" autocomplete="off"></el-input>
            <div class="isNewUser" v-if="isNewUser">
            <el-input
              v-model="editForm.uid"
              autocomplete="off"
            ></el-input>
            <div
              class="isNewUser"
              v-if="isNewUser"
            >
              <img src="../../assets/img/success.png" />
              {{ $t("userManage.userInfoObj.uid") }}
            </div>
@@ -308,7 +353,10 @@
            :label="$t('userManage.userInfoObj.username')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.uname" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.uname"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="sex"
@@ -335,7 +383,10 @@
            :label="$t('userManage.userInfoObj.nativePlace')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.natives" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.natives"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="depid"
@@ -386,7 +437,10 @@
            :label="$t('userManage.userInfoObj.identityCard')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.idcard" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.idcard"
              autocomplete="off"
            ></el-input>
          </el-form-item>
        </div>
        <div style="width: 45%">
@@ -395,35 +449,50 @@
            :label="$t('userManage.userInfoObj.job')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.job" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.job"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="edu"
            :label="$t('userManage.userInfoObj.edu')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.edu" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.edu"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="addr"
            :label="$t('userManage.userInfoObj.addr')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.addr" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.addr"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="email"
            :label="$t('userManage.userInfoObj.email')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.email" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.email"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="contact"
            :label="$t('userManage.userInfoObj.contact')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.contact" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.contact"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="status"
@@ -450,12 +519,23 @@
            :label="$t('userManage.userInfoObj.remarks')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.bak" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.bak"
              autocomplete="off"
            ></el-input>
          </el-form-item>
        </div>
      </el-form>
      <div v-if="behavior == '修改信息'" slot="footer" class="dialog-footer">
        <el-button size="small" type="info" @click="cancelEdit()">{{
      <div
        v-if="behavior == '修改信息'"
        slot="footer"
        class="dialog-footer"
      >
        <el-button
          size="small"
          type="info"
          @click="cancelEdit()"
        >{{
          $t("common.reset")
        }}</el-button>
        <el-button
@@ -463,11 +543,18 @@
          type="primary"
          @click="sendEdit('editForm')"
          v-loading.fullscreen.lock="fullscreenLoading"
          >{{ $t("common.submit") }}</el-button
        >
        >{{ $t("common.submit") }}</el-button>
      </div>
      <div v-else slot="footer" class="dialog-footer">
        <el-button size="small" type="info" @click="cancelAdd('editForm')">{{
      <div
        v-else
        slot="footer"
        class="dialog-footer"
      >
        <el-button
          size="small"
          type="info"
          @click="cancelAdd('editForm')"
        >{{
          $t("common.reset")
        }}</el-button>
        <el-button
@@ -475,8 +562,7 @@
          type="primary"
          @click="sendAdd('editForm')"
          v-loading.fullscreen.lock="fullscreenLoading"
          >{{ $t("common.submit") }}</el-button
        >
        >{{ $t("common.submit") }}</el-button>
      </div>
    </el-dialog>
    <el-dialog
@@ -486,7 +572,11 @@
      :visible.sync="resetPwd"
      :before-close="handleClose"
    >
      <el-form :model="pwdForm" ref="pwdForm" :rules="rules">
      <el-form
        :model="pwdForm"
        ref="pwdForm"
        :rules="rules"
      >
        <el-form-item
          prop="adminPwd"
          :label="$t('common.AdminPassword')"
@@ -524,8 +614,15 @@
          ></el-input>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" type="info" @click="cancelReset - 'pwdForm'">{{
      <div
        slot="footer"
        class="dialog-footer"
      >
        <el-button
          size="small"
          type="info"
          @click="cancelReset - 'pwdForm'"
        >{{
          $t("common.reset")
        }}</el-button>
        <el-button
@@ -533,8 +630,7 @@
          type="primary"
          @click="sendReset('pwdForm')"
          v-loading.fullscreen.lock="fullscreenLoading"
          >{{ $t("common.submit") }}</el-button
        >
        >{{ $t("common.submit") }}</el-button>
      </div>
    </el-dialog>
  </div>
@@ -825,6 +921,9 @@
          if (res.code == 200) {
            this.depList = this.treeData(res.result);
            this.treeOptions = this.treeData(res.result);
            this.queryForm.depName = this.depList[0].name;
            this.queryInfo.depid = this.depList[0].id;
            this.queryInfo();
          } else {
            this.$notify.error({
              title: res.code,
@@ -832,7 +931,7 @@
            });
          }
        })
        .catch((res) => {});
        .catch((res) => { });

      queryPageUser({
        pageIndex: 1,
@@ -849,7 +948,7 @@
            });
          }
        })
        .catch((res) => {});
        .catch((res) => { });
    },
    treeData(source) {
      let cloneData = JSON.parse(JSON.stringify(source)); // 对源数据深度克隆
@@ -888,6 +987,9 @@
    //重置按钮
    resetInfo(formName) {
      this.$refs[formName].resetFields();
      this.queryForm.depName = this.depList[0].name;
      this.queryInfo.depid = this.depList[0].id;
      this.queryInfo();
    },
    //新增按钮
    showAddDialog() {
@@ -985,12 +1087,12 @@
    //重置密码
    editPwd() {

 

      var std = [];
      for (var i in this.multipleSelection) {
        std.push(this.multipleSelection[i].id);
      }
 

      if (std.length == 0) {
        alert("请先选择用户");
        return;
@@ -1061,6 +1163,7 @@
    handeditChange(data, node, nodeData) {
      this.$set(this.editForm, "depid", data.id);
      this.$set(this.editForm, "depName", data.name);
      this.$set(this.editForm, "depcode", data.code);
      this.$refs.editcaderHandle.dropDownVisible = false;
    },
    //关闭弹出框
@@ -1102,7 +1205,7 @@

          done();
        })
        .catch((_) => {});
        .catch((_) => { });
    },
    //提交编辑
    sendEdit(formName) {

 src/views/userManage/orgManage.vue

@@ -109,6 +109,7 @@
              :label-width="formLabelWidth"
            >
              <el-input
               disabled
                v-model="itemdetail.code"
                autocomplete="off"
                style="max-width: 400px;"
@@ -119,6 +120,7 @@
              :label-width="formLabelWidth"
            >
              <el-input
             
                v-model="itemdetail.uncode"
                autocomplete="off"
                style="max-width: 400px;"

 src/views/userManage/roleManage.vue

@@ -1,18 +1,29 @@
<template>
  <div class="logLog_box">
    <My-bread
      :list="[
    <My-bread :list="[
        `${$t('operatManage.operatManage')}`,
        `${$t('userManage.roleManage')}`,
      ]"
    ></My-bread>
      ]"></My-bread>
    <el-divider />
    <div class="inquire subpage_Div"  ref="container">
      <el-form ref="ruleForm" :model="roleForm" :inline="true">
    <div
      class="inquire subpage_Div"
      ref="container"
    >
      <el-form
        ref="ruleForm"
        :model="roleForm"
        :inline="true"
      >
        <div class="flex_box">
          <div style="margin-right: auto">
            <el-form-item :label="$t('userManage.RM.roleName')" prop="username">
              <el-input v-model="roleForm.username" style="width: 200px" />
            <el-form-item
              :label="$t('userManage.RM.roleName')"
              prop="username"
            >
              <el-input
                v-model="roleForm.username"
                style="width: 200px"
              />
            </el-form-item>
            <el-form-item
              :label="$t('userManage.RM.ownedSystem')"
@@ -47,21 +58,22 @@
          </div>
          <div>
            <el-form-item>
              <el-button type="info" size="small" @click="resetForm('ruleForm')"
                ><i class="el-icon-delete"></i>&nbsp;{{
              <el-button
                type="info"
                size="small"
                @click="resetForm('ruleForm')"
              ><i class="el-icon-delete"></i>&nbsp;{{
                  $t("userManage.RM.reset")
                }}</el-button
              >
                }}</el-button>
            </el-form-item>
            <el-form-item>
              <el-button
                size="small"
                type="primary"
                @click="onSubmit('ruleForm')"
                ><i class="el-icon-search"></i> &nbsp;{{
              ><i class="el-icon-search"></i> &nbsp;{{
                  $t("userManage.RM.query")
                }}</el-button
              >
                }}</el-button>
            </el-form-item>
            <el-form-item>
              <el-button
@@ -69,10 +81,9 @@
                size="small"
                @click="handleDelete()"
                v-if="menuStatus.delete"
                ><i class="el-icon-delete"></i>&nbsp;{{
              ><i class="el-icon-delete"></i>&nbsp;{{
                  $t("common.delete")
                }}</el-button
              >
                }}</el-button>
            </el-form-item>
            <el-form-item>
              <el-button
@@ -80,10 +91,9 @@
                size="small"
                @click="setInsertFormdialog"
                v-if="menuStatus.insert"
                ><i class="el-icon-circle-plus-outline"></i> &nbsp;{{
              ><i class="el-icon-circle-plus-outline"></i> &nbsp;{{
                  $t("userManage.RM.add")
                }}</el-button
              >
                }}</el-button>
            </el-form-item>
          </div>
        </div>
@@ -135,21 +145,31 @@
        </el-form-item> -->
      </el-form>
    </div>
    <div class="table_box subpage_Div" :style="styleVar">
    <div
      class="table_box subpage_Div"
      :style="styleVar"
    >
      <el-table
        :data="tableData"
        style="width: 100%"
        height="calc(100% - 57px)"
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55" />
        <el-table-column
          type="selection"
          width="55"
        />
        <el-table-column
          align="center"
          type="index"
          :label="$t('userManage.RM.index')"
          width="70px"
        />
        <el-table-column align="center" prop="id" v-if="false" />
        <el-table-column
          align="center"
          prop="id"
          v-if="false"
        />
        <el-table-column
          align="center"
          prop="name"
@@ -216,17 +236,18 @@
              type="warning"
              @click="handleEdit(scope.$index, scope.row)"
              size="small"
              >{{ $t("common.update") }}</el-button
            >
            >{{ $t("common.update") }}</el-button>
            <el-button
              @click="showDetail(scope.$index, scope.row)"
              size="small"
              >{{ $t("common.see") }}</el-button
            >
            >{{ $t("common.see") }}</el-button>
          </template>
        </el-table-column>
      </el-table>
      <div style="margin-top: 25px" class="pagination_box">
      <div
        style="margin-top: 25px"
        class="pagination_box"
      >
        <el-pagination
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"
@@ -310,8 +331,14 @@
          :label="$t('userManage.RM.isAdmin')"
          :label-width="formLabelWidth"
        >
          <el-radio v-model="insertform.isAdmin" label="1">是</el-radio>
          <el-radio v-model="insertform.isAdmin" label="0">否</el-radio>
          <el-radio
            v-model="insertform.isAdmin"
            label="1"
          >是</el-radio>
          <el-radio
            v-model="insertform.isAdmin"
            label="0"
          >否</el-radio>
        </el-form-item>
        <el-form-item
          :label="$t('userManage.RM.remarks')"
@@ -324,11 +351,21 @@
          ></el-input>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" @click="insertFromClose">{{
      <div
        slot="footer"
        class="dialog-footer"
      >
        <el-button
          size="small"
          @click="insertFromClose"
        >{{
          $t("common.close")
        }}</el-button>
        <el-button type="primary" size="small" @click="insertFromData">{{
        <el-button
          type="primary"
          size="small"
          @click="insertFromData"
        >{{
          $t("common.confirm")
        }}</el-button>
      </div>
@@ -345,7 +382,10 @@
          :label="$t('userManage.RM.roleName')"
          :label-width="formLabelWidth"
        >
          <el-input v-model="updateform.name" autocomplete="off"></el-input>
          <el-input
            v-model="updateform.name"
            autocomplete="off"
          ></el-input>
        </el-form-item>

        <el-form-item
@@ -390,49 +430,87 @@
          :label="$t('userManage.RM.isAdmin')"
          :label-width="formLabelWidth"
        >
          <el-radio v-model="updateform.isAdmin" label="1">是</el-radio>
          <el-radio v-model="updateform.isAdmin" label="0">否</el-radio>
          <el-radio
            v-model="updateform.isAdmin"
            label="1"
          >是</el-radio>
          <el-radio
            v-model="updateform.isAdmin"
            label="0"
          >否</el-radio>
        </el-form-item>
        <el-form-item
          :label="$t('userManage.RM.describe')"
          :label-width="formLabelWidth"
        >
          <el-input v-model="updateform.descr" autocomplete="off"></el-input>
          <el-input
            v-model="updateform.descr"
            autocomplete="off"
          ></el-input>
        </el-form-item>
        <el-form-item
          :label="$t('userManage.RM.remarks')"
          :label-width="formLabelWidth"
        >
          <el-input v-model="updateform.bak" autocomplete="off"></el-input>
          <el-input
            v-model="updateform.bak"
            autocomplete="off"
          ></el-input>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" @click="updateFromClose">{{
      <div
        slot="footer"
        class="dialog-footer"
      >
        <el-button
          size="small"
          @click="updateFromClose"
        >{{
          $t("common.close")
        }}</el-button>
        <el-button type="primary" size="small" @click="updateFromData">{{
        <el-button
          type="primary"
          size="small"
          @click="updateFromData"
        >{{
          $t("common.confirm")
        }}</el-button>
      </div>
    </el-dialog>
    <div class="leftTree subpage_Div box_div" v-if="showCata">
    <div
      class="leftTree subpage_Div box_div"
      v-if="showCata"
    >
      <div class="treeBox">
        <role-dep-tree></role-dep-tree>
      </div>
      <div class="btnBox">
        <el-button type="primary" size="small" @click="selectCataName"
          >确定</el-button
        >
        <el-button type="info" size="small" @click="showCata = false"
          >取消</el-button
        >
        <el-button
          type="primary"
          size="small"
          @click="selectCataName"
        >确定</el-button>
        <el-button
          type="info"
          size="small"
          @click="showCata = false"
        >取消</el-button>
      </div>
    </div>

    <div class="infoBox box_div subpage_Div" v-show="showinfoBox">
      <div slot="header" class="clearfix">
    <div
      class="infoBox box_div subpage_Div"
      v-show="showinfoBox"
    >
      <div
        slot="header"
        class="clearfix"
      >
        <span>{{ $t("dataManage.styleObj.deInformation") }}</span>
        <div style="float: right; cursor: pointer" @click="closeDetial">
        <div
          style="float: right; cursor: pointer"
          @click="closeDetial"
        >
          <i class="el-icon-close"></i>
        </div>
      </div>
@@ -562,7 +640,7 @@
    };
  },
  methods: {
     onResize() {
    onResize() {
      this.timer && clearTimeout(this.timer);
      this.timer = setTimeout(() => {
        this.calHeight();
@@ -679,7 +757,7 @@
      if (data.code != 200) {
        this.$message.error("列表调用失败");
      }
      console.log(data);

      this.tableData = data.result;
      this.count = data.count;
    },
@@ -801,7 +879,12 @@
      this.updateform = row;
      this.updateform.isAdmin = row.isAdmin.toString();
      const data = await selectDep({ id: row.depid });
      this.updateform.depValue = data.result.name;
      if (data.result == null) {
        this.updateform.depValue = null;
      } else {
        this.updateform.depValue = data.result.name;
      }

      this.UpdateFormdialog = true;
    },
    onSubmit() {