bug修改

surprise

2023-12-11 9d5fc70530330177bd2a67e568d67b8883694685

bug修改

 src/components/mapsdk.vue

 src/components/preview_map.vue

@@ -1,160 +1,71 @@
<template>
  <div
    id="mapdiv"
    class="previewBox"
  >
    <div
      v-if="modelLayer"
      class="modelLayer box_divm"
    >
  <div id="mapdiv" class="previewBox">
    <div v-if="modelLayer" class="modelLayer box_divm">
      <div class="modelBox">
        <div
          style="float:right"
          :title="$t('synthesis.undergroundMode')"
          @click="setUndergroundMode"
        >
        <div style="float:right" :title="$t('synthesis.undergroundMode')" @click="setUndergroundMode">
          <i class="el-icon-sunrise "></i>
        </div>
      </div>
      <div class="modelBox">
        <el-tree
          :data="treeData"
          show-checkbox
          node-key="id"
          ref="tree"
          :default-expanded-keys="[1]"
          :props="defaultProps"
          @node-click="handleNodeClick"
          @check="handleCheckChange"
          @node-contextmenu="rightClick"
        >
        <el-tree :data="treeData" show-checkbox node-key="id" ref="tree" :default-expanded-keys="[1]"
          :props="defaultProps" @node-click="handleNodeClick" @check="handleCheckChange" @node-contextmenu="rightClick">
        </el-tree>
      </div>
    </div>
    <div
      v-if="editModelFlag"
      class="modelLayer box_divm"
    >
      <el-form
        ref="form"
        :model="modelForm"
        label-width="80px"
      >
    <div v-if="editModelFlag" class="modelLayer box_divm">
      <el-form ref="form" :model="modelForm" label-width="80px">
        <el-form-item>
          <el-button
            size="small"
            @click="dialogLayerVisible = true"
          >图层</el-button>
          <el-button
            size="small"
            v-if="$store.state.previewLayer.type == 'mpt'"
            @click="setcropping"
          >裁剪</el-button>
          <el-button
            size="small"
            v-if="$store.state.previewLayer.type != 'mpt'"
            @click="locateTo"
          >定位</el-button>
          <el-button
            size="small"
            v-if="$store.state.previewLayer.type != 'mpt'"
            @click="showTileset"
          >显隐</el-button>
          <el-button size="small" v-if="$store.state.previewLayer.stype != 'yl'"
            @click="dialogLayerVisible = true">图层</el-button>
          <el-button size="small" v-if="$store.state.previewLayer.type == 'mpt'" @click="setcropping">裁剪</el-button>
          <el-button size="small" v-if="$store.state.previewLayer.type != 'mpt'" @click="locateTo">定位</el-button>
          <el-button size="small" v-if="$store.state.previewLayer.type != 'mpt'" @click="showTileset">显隐</el-button>

          <el-button
            size="small"
            v-if="$store.state.previewLayer.type != 'mpt'"
            @click="setUndergroundMode"
          >地下</el-button>
          <el-button size="small" v-if="$store.state.previewLayer.type != 'mpt'"
            @click="setUndergroundMode">地下</el-button>
          <br />
          <el-button
            v-if="$store.state.previewLayer.type != '3dml' &&
          <el-button v-if="$store.state.previewLayer.type != '3dml' &&
            $store.state.previewLayer.type != 'cpt' &&
            $store.state.previewLayer.type != 'mpt'"
            size="small"
            @click="pickupCoords"
          >拾取</el-button>
          <el-button
            v-if="$store.state.previewLayer.type != '3dml' &&
            $store.state.previewLayer.type != 'mpt'" size="small" @click="pickupCoords">拾取</el-button>
          <el-button v-if="$store.state.previewLayer.type != '3dml' &&
            $store.state.previewLayer.type != 'cpt' &&
            $store.state.previewLayer.type != 'mpt'"
            size="small"
            @click="reload"
          >
            $store.state.previewLayer.type != 'mpt'" size="small" @click="reload">
            重载
          </el-button>
          <el-button
            v-if="modelForm.modelid == null && $store.state.previewLayer.type != '3dml' &&
          <el-button v-if="modelForm.modelid == null && $store.state.previewLayer.type != '3dml' &&
            $store.state.previewLayer.type != 'cpt' &&
            $store.state.previewLayer.type != 'mpt'"
            size="small"
            @click="getModeKeyId"
          >模型主键</el-button>
          <el-button
            v-if="$store.state.previewLayer.type != '3dml' &&
            $store.state.previewLayer.type != 'mpt'" size="small" @click="getModeKeyId">模型主键</el-button>
          <el-button v-if="$store.state.previewLayer.type != '3dml' &&
            $store.state.previewLayer.type != 'cpt'
            "
            size="small"
            @click="resave"
          >保存</el-button>
            " size="small" @click="resave">保存</el-button>

        </el-form-item>
        <el-form-item
          label="经度:"
          v-if="$store.state.previewLayer.type != '3dml' &&
        <el-form-item label="经度:" v-if="$store.state.previewLayer.type != '3dml' &&
          $store.state.previewLayer.type != 'cpt' &&
          $store.state.previewLayer.type != 'mpt'"
        >
          <el-input
            size="small"
            v-model="modelForm.lon"
          ></el-input>
          $store.state.previewLayer.type != 'mpt'">
          <el-input size="small" v-model="modelForm.lon"></el-input>

        </el-form-item>
        <el-form-item
          label="纬度:"
          v-if="$store.state.previewLayer.type != '3dml' &&
        <el-form-item label="纬度:" v-if="$store.state.previewLayer.type != '3dml' &&
          $store.state.previewLayer.type != 'cpt' &&
          $store.state.previewLayer.type != 'mpt'"
        >
          <el-input
            size="small"
            v-model="modelForm.lat"
          ></el-input>
          $store.state.previewLayer.type != 'mpt'">
          <el-input size="small" v-model="modelForm.lat"></el-input>

        </el-form-item>
        <el-form-item
          label="高度:"
          v-if="$store.state.previewLayer.type != '3dml' &&
        <el-form-item label="高度:" v-if="$store.state.previewLayer.type != '3dml' &&
          $store.state.previewLayer.type != 'cpt' &&
          $store.state.previewLayer.type != 'mpt'"
        >
          <el-input
            size="small"
            v-model="modelForm.height"
          ></el-input>
          $store.state.previewLayer.type != 'mpt'">
          <el-input size="small" v-model="modelForm.height"></el-input>

        </el-form-item>
        <el-form-item
          label="角度:"
          v-if="$store.state.previewLayer.type != '3dml' &&
        <el-form-item label="角度:" v-if="$store.state.previewLayer.type != '3dml' &&
          $store.state.previewLayer.type != 'cpt' &&
          $store.state.previewLayer.type != 'mpt'"
        >
          <el-input
            size="small"
            v-model="modelForm.yaw"
          ></el-input>
          $store.state.previewLayer.type != 'mpt'">
          <el-input size="small" v-model="modelForm.yaw"></el-input>

        </el-form-item>
        <el-form-item
          label="比例:"
          v-if="$store.state.previewLayer.type == 'las'"
        >
          <el-input
            size="small"
            v-model="modelForm.scale"
          ></el-input>
        <el-form-item label="比例:" v-if="$store.state.previewLayer.type == 'las'">
          <el-input size="small" v-model="modelForm.scale"></el-input>

        </el-form-item>
        <!-- <el-form-item label="透明度:">
@@ -167,46 +78,20 @@
      </el-form>
    </div>

    <el-dialog
      :title="formInline.title"
      :visible.sync="dialogVisible"
      :modal="false"
      :modal-append-to-body="false"
      :close-on-click-modal="false"
      :before-close="handleClose"
      width="30%"
    >
    <el-dialog :title="formInline.title" :visible.sync="dialogVisible" :modal="false" :modal-append-to-body="false"
      :close-on-click-modal="false" :before-close="handleClose" width="30%">
      <div style="height:63vh">
        <el-tabs
          v-model="activeName"
          @tab-click="handleClick"
        >
          <el-tab-pane
            label="属性"
            name="first"
            v-if="serveType"
          >
            <el-form
              ref="form"
              :model="formInline"
              label-width="80px"
            >
        <el-tabs v-model="activeName" @tab-click="handleClick">
          <el-tab-pane label="属性" name="first" v-if="serveType">
            <el-form ref="form" :model="formInline" label-width="80px">

              <el-form-item :label="$t('common.name')">
                <el-input v-model="formInline.name"></el-input>

              </el-form-item>
              <el-form-item :label="$t('common.type')">
                <el-select
                  v-model="formInline.type"
                  style="width:100%"
                >
                  <el-option
                    v-for="item in options"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value"
                  >
                <el-select v-model="formInline.type" style="width:100%">
                  <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                  </el-option>
                </el-select>

@@ -217,113 +102,47 @@

              </el-form-item>
              <el-form-item>
                <el-button
                  v-show="isShowModel"
                  type="success"
                  plain
                  size="small"
                  @click="InsertData"
                >{{
                <el-button v-show="isShowModel" type="success" plain size="small" @click="InsertData">{{
                  $t('common.increase') }}</el-button>
                <el-button
                  v-show="!isShowModel"
                  type="info"
                  plain
                  size="small"
                  @click="EditData"
                >{{ $t('common.update')
                <el-button v-show="!isShowModel" type="info" plain size="small" @click="EditData">{{ $t('common.update')
                }}</el-button>
              </el-form-item>
            </el-form>

          </el-tab-pane>
          <el-tab-pane
            label="附件"
            name="second"
          >
            <el-form
              :model="fromfile"
              class="demo-form-inline"
            >
          <el-tab-pane label="附件" name="second">
            <el-form :model="fromfile" class="demo-form-inline">
              <el-form-item>
                <el-input
                  v-model="fromfile.file"
                  style="width: 300px; margin-right: 20px"
                  :placeholder="$t('common.choose')"
                  disabled
                ></el-input>
                <input
                  name="file1"
                  type="file"
                  id="insertFile"
                  multiple="multiple"
                  style="display: none"
                  @change="insertFile()"
                />
                <el-link
                  @click="getInsertFile()"
                  :underline="false"
                ><i class="el-icon-folder-opened"></i></el-link>
                <el-input v-model="fromfile.file" style="width: 300px; margin-right: 20px"
                  :placeholder="$t('common.choose')" disabled></el-input>
                <input name="file1" type="file" id="insertFile" multiple="multiple" style="display: none"
                  @change="insertFile()" />
                <el-link @click="getInsertFile()" :underline="false"><i class="el-icon-folder-opened"></i></el-link>
              </el-form-item>
              <el-form-item>
                <el-row>
                  <el-col :span="3">
                    <el-link
                      class="elLink"
                      :underline="false"
                      @click="setAttachInsert"
                    >{{ $t('common.append')
                    <el-link class="elLink" :underline="false" @click="setAttachInsert">{{ $t('common.append')
                    }}</el-link>
                  </el-col>
                  <el-col :span="3">
                    <el-link
                      class="elLink"
                      :underline="false"
                      @click="setAttachDel"
                    >{{ $t('common.delete') }}</el-link>
                    <el-link class="elLink" :underline="false" @click="setAttachDel">{{ $t('common.delete') }}</el-link>
                  </el-col>

                </el-row>
              </el-form-item>
            </el-form>
            <el-table
              :data="tableData"
              ref="filterTable"
              height="calc(100% - 130px)"
              border
              style="width: 100%"
              @selection-change="handleAttatchChange"
            >
              <el-table-column
                type="selection"
                width="70"
              />
              <el-table-column
                width="60"
                type="index"
                :label="$t('common.index')"
              />
              <el-table-column
                prop="name"
                :label="$t('common.name')"
              />
            <el-table :data="tableData" ref="filterTable" height="calc(100% - 130px)" border style="width: 100%"
              @selection-change="handleAttatchChange">
              <el-table-column type="selection" width="70" />
              <el-table-column width="60" type="index" :label="$t('common.index')" />
              <el-table-column prop="name" :label="$t('common.name')" />

              <el-table-column
                prop="sizes"
                :label="$t('common.size')"
                :formatter="statSizeChange"
              />
              <el-table-column
                align="center"
                :label="$t('common.operate')"
                min-width="100"
              >
              <el-table-column prop="sizes" :label="$t('common.size')" :formatter="statSizeChange" />
              <el-table-column align="center" :label="$t('common.operate')" min-width="100">
                <template slot-scope="scope">
                  <el-link
                    v-if="matchState(scope, /[]/)"
                    @click="setAttatchDetail(scope.$index, scope.row)"
                    class="elLink"
                  >{{ $t('common.see') }}</el-link>
                  <el-link v-if="matchState(scope, /[]/)" @click="setAttatchDetail(scope.$index, scope.row)"
                    class="elLink">{{ $t('common.see') }}</el-link>

                </template>
              </el-table-column>
@@ -346,44 +165,21 @@
        <map-sdk v-if='showMapVisible'></map-sdk>
      </div>
    </el-dialog> -->
    <el-dialog
      title="预览"
      :append-to-body="false"
      :visible.sync="dialog.dialogVisible"
      width="70%"
      :close-on-click-modal="false"
    >
      <div
        v-if="dialog.isPdf"
        class="pdfClass"
      >
        <iframe
          :src="dialog.src"
          type="application/x-google-chrome-pdf"
          width="100%"
          height="100%"
        >
    <el-dialog title="预览" :append-to-body="false" :visible.sync="dialog.dialogVisible" width="70%"
      :close-on-click-modal="false">
      <div v-if="dialog.isPdf" class="pdfClass">
        <iframe :src="dialog.src" type="application/x-google-chrome-pdf" width="100%" height="100%">
        </iframe>
      </div>
      <div
        v-if="dialog.isJpg"
        class="pdfClass"
      >
      <div v-if="dialog.isJpg" class="pdfClass">

        <el-image
          style="width:100%; height:100%"
          :src="dialog.src"
          :preview-src-list="[dialog.src]"
        >
        <el-image style="width:100%; height:100%" :src="dialog.src" :preview-src-list="[dialog.src]">
        </el-image>

      </div>
    </el-dialog>

    <div
      v-show="dialogLayerVisible"
      class="levelLayer box_divm"
    >
    <div v-show="dialogLayerVisible" class="levelLayer box_divm">
      <div class="levelTitle">
        <div>
          图层列表
@@ -393,67 +189,33 @@
        </div>
      </div>
      <div class="layerContent">
        <div
          v-for="(item,index) in layerTree"
          class="contLayer"
        >
          <div> <el-checkbox
              v-model="item.checked"
              @change="setLayerTreeChange(item)"
            >{{item.cnName}}</el-checkbox></div>
        <div v-for="(item, index) in layerTree" class="contLayer">
          <div> <el-checkbox v-model="item.checked" @change="setLayerTreeChange(item)">{{ item.cnName }}</el-checkbox>
          </div>
          <div>

            <el-button
              icon="el-icon-map-location"
              size="mini"
              @click="setLayerTreeLocation(item)"
            ></el-button>
            <el-button icon="el-icon-map-location" size="mini" @click="setLayerTreeLocation(item)"></el-button>
          </div>
        </div>
      </div>

    </div>
    <div
      v-show="modelKeyFlag"
      class="modelLayer box_divm"
      v-drag
    >
      <el-form
        ref="form"
        :model="modelForm"
        label-width="80px"
      >
    <div v-show="modelKeyFlag" class="modelLayer box_divm" v-drag>
      <el-form ref="form" :model="modelForm" label-width="80px">
        <el-form-item label="主键ID">
          <el-select v-model="modelLayerId">
            <el-option
              v-for="item in optionKey"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            >
            <el-option v-for="item in optionKey" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item>
          <el-button
            type="primary"
            size="small"
            @click="setSureKeyModelKey"
          >{{ $t('common.confirm') }}</el-button>
          <el-button type="primary" size="small" @click="setSureKeyModelKey">{{ $t('common.confirm') }}</el-button>
        </el-form-item>
      </el-form>
    </div>
    <undergroundModel ref="undergroundModel" />
    <el-card
      class="box-card"
      ref="card"
      :style="{ ...rightClickMenuStyle }"
      v-show="menuVisible"
    >
      <div
        class="edit"
        @click="setShowFile"
      >
    <el-card class="box-card" ref="card" :style="{ ...rightClickMenuStyle }" v-show="menuVisible">
      <div class="edit" @click="setShowFile">
        <i class="el-icon-tickets"></i>&nbsp;&nbsp;附件
      </div>
    </el-card>
@@ -1254,27 +1016,26 @@
      Viewer.scene.globe.depthTestAgainstTerrain = true;
      // window.elevationTool = new SmartEarth.ElevationTool(window.sg);
      // elevationTool.setContourColor("#F1D487");
      var option = {
        url: window.sceneConfig.SGUrl,
        layerName: window.sceneConfig.mptName,
        requestVertexNormals: true,
      };
      window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
      window.terrainFlag = '2'
      window.terrainLayer = new Cesium.CesiumTerrainProvider({
        // url: LFData + '/3d/terrain/dem20230321'
        url: demLayer
      });
      Viewer.terrainProvider = window.terrainLayer

      window.terrainFlag = '1'
      // window.terrainLayer = new Cesium.CesiumTerrainProvider({
      //   url: demLayer
      // });

      // Viewer.terrainProvider = window.terrainLayer

      if (this.$store.state.previewLayer) {
        var res = this.$store.state.previewLayer;
        var type = res.type;
        console.log(type)
        res.ulr = res.url.replace("{host}", iisHost);
        if (type == 'DEM') {
          window.terrainLayer.deleteObject();
          // Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
          // window.terrainLayer.deleteObject();
          Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
          // window.terrainLayer = null;
          window.terrainLayer = null;
          window.terrainLayer = new Cesium.CesiumTerrainProvider({
@@ -1290,11 +1051,14 @@
            }
          });*/

          if (res.geom) {
          var wkt = this.$wkt.parse(res.geom);
          var height = this.getHeight(wkt.coordinates[2]);
          Viewer.camera.flyTo({
            destination: Cesium.Cartesian3.fromDegrees(wkt.coordinates[1], wkt.coordinates[0], height),
          });
          }

        } else if (type == 'DOM') {
          var wkt = this.$wkt.parse(res.geom);
          var height = this.getHeight(wkt.coordinates[2])
@@ -1734,6 +1498,7 @@
    top: 20%;
    left: 50%;
    transform: translate(-50%, 0%);

    .levelTitle {
      width: 100%;
      display: flex;
@@ -1741,6 +1506,7 @@
      font-size: 16px;
      font-family: Source Han Sans CN;
    }

    .contLayer {
      margin: 10px 0px;
      font-size: 14px;
@@ -1749,6 +1515,7 @@
      justify-content: space-between;
    }
  }

  .pdfClass {
    height: 70vh;
    width: 100%;
@@ -1756,8 +1523,7 @@
  }

  .el-icon-sunrise {
    background: url("../assets/img/synthesis/images/3白底_157.png") center
      center no-repeat;
    background: url("../assets/img/synthesis/images/3白底_157.png") center center no-repeat;
    background-size: 24px;
  }

@@ -1765,6 +1531,7 @@
    content: "11";
    visibility: hidden;
  }

  .box-card {
    position: fixed;
    display: block;

 src/views/datamanage/uploadmanage.vue

@@ -1469,6 +1469,7 @@
    },
    //预览弹窗打开
    setPreviewLayer(res) {
      res.stype= 'yl'
      this.$store.state.previewLayer = res;
      this.dialogVisible = true;
      this.showMapView = true;

 src/views/userManage/roleManage.vue

@@ -1,40 +1,19 @@
<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="flex_box">
          <div style="margin-right: auto">
            <el-form-item
              :label="$t('userManage.RM.ownedSystem')"
              prop="ownedSystem"
            >
              <el-select
                :popper-append-to-body="false"
                size="small"
                v-model="roleForm.depValue"
                :placeholder="$t('userManage.RM.ownedSystemHolder')"
                style="width: 200px"
                ref="treeSelect"
              >
                <el-option
                  :value="roleForm.depid"
                  :label="roleForm.depValue"
                  style="height: auto"
                >
                  <el-tree
                    ref="tree"
                    :data="depList"
                    node-key="id"
                    :props="props"
                    @node-click="handleRouleDepList"
                  />
            <el-form-item :label="$t('userManage.RM.ownedSystem')" prop="ownedSystem">
              <el-select :popper-append-to-body="false" size="small" v-model="roleForm.depValue"
                :placeholder="$t('userManage.RM.ownedSystemHolder')" style="width: 200px" ref="treeSelect">
                <el-option :value="roleForm.depid" :label="roleForm.depValue" style="height: auto">
                  <el-tree ref="tree" :data="depList" node-key="id" :props="props" @node-click="handleRouleDepList" />
                </el-option>
              </el-select>
              <!-- <el-input
@@ -44,12 +23,8 @@
          /> -->
            </el-form-item>
            <el-form-item :label="$t('userManage.RM.roleName')" prop="username">
              <el-input
                v-model="roleForm.username"
                :placeholder="$t('userManage.RM.roleNameHolder')"
                size="small"
                style="width: 200px"
              >
              <el-input v-model="roleForm.username" :placeholder="$t('userManage.RM.roleNameHolder')" size="small"
                style="width: 200px">
                <i slot="suffix" class="el-icon-search" @click="onSubmit"></i>
              </el-input>
            </el-form-item>
@@ -65,33 +40,21 @@
            <!--                }}</el-button>-->
            <!--            </el-form-item>-->
            <el-form-item>
              <el-button
                type="success"
                size="small"
                @click="setInsertFormdialog"
                v-if="menuStatus.insert"
                ><i class="el-icon-circle-plus-outline"></i> &nbsp;{{
              <el-button type="success" size="small" @click="setInsertFormdialog" v-if="menuStatus.insert"><i
                  class="el-icon-circle-plus-outline"></i> &nbsp;{{
                  $t("userManage.RM.add")
                }}</el-button
              >
                  }}</el-button>
            </el-form-item>
            <el-form-item>
              <el-button
                type="danger"
                size="small"
                @click="handleDelete()"
                v-if="menuStatus.delete"
                ><i class="el-icon-delete"></i>&nbsp;{{
              <el-button type="danger" size="small" @click="handleDelete()" v-if="menuStatus.delete"><i
                  class="el-icon-delete"></i>&nbsp;{{
                  $t("common.delete")
                }}</el-button
              >
                  }}</el-button>
            </el-form-item>
            <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>
          </div>
        </div>
@@ -145,48 +108,22 @@
    </div>
    <div class="dividing-line"></div>
    <div class="table_box subpage_Div" :style="styleVar">
      <el-table
        :data="tableData"
        style="width: 100%"
        border
        height="calc(100% - 45px)"
        @selection-change="handleSelectionChange"
      >
      <el-table :data="tableData" style="width: 100%" border height="calc(100% - 45px)"
        @selection-change="handleSelectionChange">
        <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" 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="name"
          :label="$t('userManage.RM.roleName')"
        />
        <el-table-column align="center" prop="name" :label="$t('userManage.RM.roleName')" />

        <el-table-column
          align="center"
          prop="depName"
          :label="$t('userManage.RM.ownedSystem')"
        />
        <el-table-column align="center" prop="depName" :label="$t('userManage.RM.ownedSystem')" />

        <el-table-column
          align="center"
          prop="isAdmin"
          :label="$t('userManage.RM.isAdmin')"
        >
          <template slot-scope="scope">
        <el-table-column align="center" prop="isAdmin" :label="$t('userManage.RM.isAdmin')" :formatter="formateIsAdmin">
          <!-- <template slot-scope="scope">
            <span v-if="scope.row.isAdmin == 1">是 </span>
            <span v-else>否</span>
          </template>
          </template> -->
        </el-table-column>
        <el-table-column
          align="center"
          prop="descr"
          :label="$t('userManage.RM.describe')"
        />
        <el-table-column align="center" prop="descr" :label="$t('userManage.RM.describe')" />

        <!-- <el-table-column
          align="center"
@@ -215,93 +152,39 @@
          prop="bak"
          :label="$t('userManage.RM.remarks')"
        /> -->
        <el-table-column
          fixed="right"
          :label="$t('common.operate')"
          width="200"
        >
        <el-table-column fixed="right" :label="$t('common.operate')" width="200">
          <template slot-scope="scope">
            <el-button
              type="primary"
              @click="showDetail(scope.$index, scope.row)"
              size="small"
              plain
              >{{ $t("common.see") }}</el-button
            >
            <el-button
              v-if="menuStatus.update"
              type="warning"
              @click="handleEdit(scope.$index, scope.row)"
              size="small"
              plain
              >{{ $t("common.update") }}</el-button
            >
            <el-button type="primary" @click="showDetail(scope.$index, scope.row)" size="small" plain>{{ $t("common.see")
            }}</el-button>
            <el-button v-if="menuStatus.update" type="warning" @click="handleEdit(scope.$index, scope.row)" size="small"
              plain>{{ $t("common.update") }}</el-button>
          </template>
        </el-table-column>
      </el-table>
      <div style="margin-top: 10px" class="pagination_box">
        <el-pagination
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"
          :current-page="listData.pageIndex"
          :page-sizes="[10, 20, 50, 100]"
          :page-size="listData.pageSize"
          layout="total, sizes, prev, pager, next, jumper"
          :total="count"
        >
        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
          :current-page="listData.pageIndex" :page-sizes="[10, 20, 50, 100]" :page-size="listData.pageSize"
          layout="total, sizes, prev, pager, next, jumper" :total="count">
        </el-pagination>
      </div>
    </div>

    <el-dialog
      :title="$t('userManage.RM.insertRole')"
      :before-close="handleClose"
      style="overflow: hidden"
      :visible.sync="InsertFormdialog"
    >
    <el-dialog :title="$t('userManage.RM.insertRole')" :before-close="handleClose" style="overflow: hidden"
      :visible.sync="InsertFormdialog">
      <div style="height: 500px; overflow: auto">
        <el-form :model="insertform" label-position="top">
          <el-form-item
            :label="$t('userManage.RM.roleName')"
            :label-width="formLabelWidth"
          >
            <el-input
              style="width: 85%"
              v-model="insertform.name"
              autocomplete="off"
              :placeholder="
                $t('shuJuGuanLi.shuJuJianSuo.valuetwo') +
          <el-form-item :label="$t('userManage.RM.roleName')" :label-width="formLabelWidth">
            <el-input style="width: 85%" v-model="insertform.name" autocomplete="off" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo') +
                $t('userManage.RM.roleName')
              "
            ></el-input>
              "></el-input>
          </el-form-item>
          <el-form-item
            :label="$t('userManage.RM.ownedSystem')"
            :label-width="formLabelWidth"
            :prop="insertform.depValue"
            :rules="[{ required: true, message: '不能为空' }]"
          >
            <el-select
              :popper-append-to-body="false"
              v-model="insertform.depValue"
              :placeholder="
                $t('shuJuGuanLi.shuJuJianSuo.valuetree') +
          <el-form-item :label="$t('userManage.RM.ownedSystem')" :label-width="formLabelWidth" :prop="insertform.depValue"
            :rules="[{ required: true, message: '不能为空' }]">
            <el-select :popper-append-to-body="false" v-model="insertform.depValue" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree') +
                $t('userManage.RM.ownedSystem')
              "
              style="width: 85%"
            >
              <el-option
                :value="insertform.depid"
                :label="insertform.depValue"
                style="height: auto"
              >
                <el-tree
                  ref="tree"
                  :data="depList"
                  node-key="id"
                  :props="props"
                  @node-click="handleDepList"
                />
              " style="width: 85%">
              <el-option :value="insertform.depid" :label="insertform.depValue" style="height: auto">
                <el-tree ref="tree" :data="depList" node-key="id" :props="props" @node-click="handleDepList" />
              </el-option>
            </el-select>
            <!-- <el-input
@@ -316,24 +199,12 @@
            @click="showDepTree(2)"
          >{{ $t('common.choose') }}</el-button> -->
          </el-form-item>
          <el-form-item
            :label="$t('userManage.RM.describe')"
            :label-width="formLabelWidth"
          >
            <el-input
              style="width: 85%"
              v-model="insertform.descr"
              autocomplete="off"
              :placeholder="
                $t('shuJuGuanLi.shuJuJianSuo.valuetwo') +
          <el-form-item :label="$t('userManage.RM.describe')" :label-width="formLabelWidth">
            <el-input style="width: 85%" v-model="insertform.descr" autocomplete="off" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo') +
                $t('userManage.RM.describe')
              "
            ></el-input>
              "></el-input>
          </el-form-item>
          <el-form-item
            :label="$t('userManage.RM.isAdmin')"
            :label-width="formLabelWidth"
          >
          <el-form-item :label="$t('userManage.RM.isAdmin')" :label-width="formLabelWidth">
            <!-- <el-radio
           
              label="1"
@@ -342,35 +213,16 @@
              v-model="insertform.isAdmin"
              label="0"
            >否</el-radio> -->
            <el-select
              style="width: 85%"
              v-model="insertform.isAdmin"
              :placeholder="
                $t('shuJuGuanLi.shuJuJianSuo.valuetree') +
            <el-select style="width: 85%" v-model="insertform.isAdmin" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree') +
                $t('userManage.RM.isAdmin')
              "
            >
              <el-option
                v-for="item in options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              ></el-option>
              ">
              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
            </el-select>
          </el-form-item>
          <el-form-item
            :label="$t('userManage.RM.remarks')"
            :label-width="formLabelWidth"
          >
            <el-input
              style="width: 85%"
              v-model="insertform.bak"
              autocomplete="off"
              :placeholder="
                $t('shuJuGuanLi.shuJuJianSuo.valuetwo') +
          <el-form-item :label="$t('userManage.RM.remarks')" :label-width="formLabelWidth">
            <el-input style="width: 85%" v-model="insertform.bak" autocomplete="off" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo') +
                $t('userManage.RM.remarks')
              "
            ></el-input>
              "></el-input>
          </el-form-item>
        </el-form>
      </div>
@@ -383,47 +235,18 @@
        }}</el-button>
      </div>
    </el-dialog>
    <el-dialog
      :title="$t('userManage.RM.updateRole')"
      :visible.sync="UpdateFormdialog"
      :before-close="handleCloseEdit"
    >
    <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">
          <el-form-item
            :label="$t('userManage.RM.roleName')"
            :label-width="formLabelWidth"
          >
            <el-input
              v-model="updateform.name"
              autocomplete="off"
              style="width: 85%"
            ></el-input>
          <el-form-item :label="$t('userManage.RM.roleName')" :label-width="formLabelWidth">
            <el-input v-model="updateform.name" autocomplete="off" style="width: 85%"></el-input>
          </el-form-item>

          <el-form-item
            :label="$t('userManage.RM.ownedSystem')"
            :label-width="formLabelWidth"
            :prop="updateform.depValue"
          >
            <el-select
              :popper-append-to-body="false"
              v-model="updateform.depValue"
              placeholder="请选择"
              style="width: 85%"
            >
              <el-option
                :value="updateform.depid"
                :label="updateform.depValue"
                style="height: auto"
              >
                <el-tree
                  ref="tree"
                  :data="depList"
                  node-key="id"
                  :props="props"
                  @node-click="handleUpdataDepList"
                />
          <el-form-item :label="$t('userManage.RM.ownedSystem')" :label-width="formLabelWidth"
            :prop="updateform.depValue">
            <el-select :popper-append-to-body="false" v-model="updateform.depValue" placeholder="请选择" style="width: 85%">
              <el-option :value="updateform.depid" :label="updateform.depValue" style="height: auto">
                <el-tree ref="tree" :data="depList" node-key="id" :props="props" @node-click="handleUpdataDepList" />
              </el-option>
            </el-select>

@@ -439,10 +262,7 @@
            @click="showDepTree(3)"
          >{{ $t('common.choose') }}</el-button> -->
          </el-form-item>
          <el-form-item
            :label="$t('userManage.RM.isAdmin')"
            :label-width="formLabelWidth"
          >
          <el-form-item :label="$t('userManage.RM.isAdmin')" :label-width="formLabelWidth">
            <!-- <el-radio
              v-model="updateform.isAdmin"
              label="1"
@@ -452,33 +272,14 @@
              label="0"
            >否</el-radio> -->
            <el-select style="width: 85%" v-model="updateform.isAdmin">
              <el-option
                v-for="item in options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              ></el-option>
              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
            </el-select>
          </el-form-item>
          <el-form-item
            :label="$t('userManage.RM.describe')"
            :label-width="formLabelWidth"
          >
            <el-input
              v-model="updateform.descr"
              autocomplete="off"
              style="width: 85%"
            ></el-input>
          <el-form-item :label="$t('userManage.RM.describe')" :label-width="formLabelWidth">
            <el-input v-model="updateform.descr" autocomplete="off" style="width: 85%"></el-input>
          </el-form-item>
          <el-form-item
            :label="$t('userManage.RM.remarks')"
            :label-width="formLabelWidth"
          >
            <el-input
              v-model="updateform.bak"
              autocomplete="off"
              style="width: 85%"
            ></el-input>
          <el-form-item :label="$t('userManage.RM.remarks')" :label-width="formLabelWidth">
            <el-input v-model="updateform.bak" autocomplete="off" style="width: 85%"></el-input>
          </el-form-item>
        </el-form>
      </div>
@@ -496,12 +297,8 @@
        <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" v-show="showinfoBox">
@@ -725,8 +522,8 @@
      this.itemdetail.createUser = this.itemdetail.createName;

      this.itemdetail.updateUser = this.itemdetail.updateName;
      this.itemdetail.admin =
        parseInt(this.itemdetail.isAdmin) === 0 ? "否" : "是";
      this.itemdetail.admin =this.formateIsAdmin(this.itemdetail)
        
    },
    handleSelectionChange(val) {
      this.multipleSelection = val;
@@ -735,6 +532,27 @@
      let date = row[column.property];
      return this.formomentTime(date);
    },

    formateIsAdmin(row, column) {
      switch (row.isAdmin) {
        case 0:
          return "普通用户";
          break;
        case 1:
          return "超级管理员";
          break;
        case 2:
          return "数据管理员";
          break;
        case 3:
          return "领导";
          break;
      
      }
  
    },


    formomentTime(date) {
      if (date === undefined || date === null) {
        return;
@@ -990,6 +808,7 @@
  .el-input {
    width: 300px;
  }

  .leftTree {
    position: absolute;
    z-index: 9999;
@@ -1002,12 +821,14 @@
      height: 550px;
      overflow: auto;
    }

    .btnBox {
      width: 123px;
      margin: 10px auto 0;
      // background-color: red;
    }
  }

  .inquire {
    height: auto;