界面修改

Surpriseplus

2023-01-17 93a38ac31615b1aa053a4440c59814ea72353945

界面修改

 .VSCodeCounter/2023-01-16_10-19-40/details.md

ÎļþÒÑɾ³ý

 .VSCodeCounter/2023-01-16_10-19-40/diff-details.md

ÎļþÒÑɾ³ý

 .VSCodeCounter/2023-01-16_10-19-40/diff.csv

ÎļþÒÑɾ³ý

 .VSCodeCounter/2023-01-16_10-19-40/diff.md

ÎļþÒÑɾ³ý

 .VSCodeCounter/2023-01-16_10-19-40/diff.txt

ÎļþÒÑɾ³ý

 .VSCodeCounter/2023-01-16_10-19-40/results.csv

ÎļþÒÑɾ³ý

 .VSCodeCounter/2023-01-16_10-19-40/results.json

ÎļþÒÑɾ³ý

 .VSCodeCounter/2023-01-16_10-19-40/results.md

ÎļþÒÑɾ³ý

 .VSCodeCounter/2023-01-16_10-19-40/results.txt

ÎļþÒÑɾ³ý

 public/LfSKyline/index.html

@@ -16,7 +16,7 @@
  <script src="../config/config.js"></script>
  <script>
    window.app = {
      fly: LFData + "/fly/lf_mpt.fly",
      fly: window.sceneConfig.fly,
      mainUrl: location.href.substring(0, location.href.lastIndexOf("/") + 1)

    }

 public/config/config.js

@@ -1,13 +1,13 @@
var ipConfig = '192.168.20.39';

// var ipConfig =  location.hostname;
var ipConfig = '192.168.20.205';
var menuStartName = "管道基础大数据平台";

var LFData = "http://" + ipConfig + "/LFData";

var BASE_URL = 'http://' + ipConfig + ':12316/server';
var BASE_URL = 'http://' + ipConfig + ':8088/server';

//webSocket æœåŠ¡åœ°å€
var socketUrl = 'ws://' + ipConfig + ':12316/server/ws/select';
var socketUrl = 'ws://' + ipConfig + ':8088/server/ws/select';

//数据库监控地址
var sql_Url = 'http://' + ipConfig + ':8081/admin/druid/sql.html';
@@ -33,14 +33,15 @@
// ç»¼åˆå±•ç¤º
window.sceneConfig = {
  // sdk许可
  licenseServer: 'http://' + ipConfig + '/LFServer',
  licenseServer: 'http://localhost/LFServer',
  // æœåŠ¡åœ°å€
  // baseURL: 'http://183.162.245.49:8888/',
  // MPT名称
  // mptName: "china_5m.Ei.397334",
  // // SG地址
  SGUrl: "http://" + ipConfig + "/SG/Elevation",
 
  //fly地址
  fly: 'http://' + ipConfig + '/LFData/fly/' + (ipConfig.indexOf("103.21.") ? "lfy_web.fly" : "lf_127.fly"),
  mptName: 'zhufeng.397336.mpt',
  positionBtn: [],
};

 src/assets/lang/en.js

@@ -495,6 +495,7 @@
    },
    more: 'More',
    Multiplechoice: 'Multiple choice',
    undergroundMode:'Underground mode'
  },
  downlog: {
    type1: 'Shp file',

 src/assets/lang/zh.js

@@ -490,8 +490,8 @@
      m8: '角度',
    },
    more: '更多',

    Multiplechoice: '多选',
    undergroundMode:'地下模式'
  },
  dataApply: {
    type1: '作废',

 src/components/MapView/mapMenuTop.vue

@@ -34,7 +34,7 @@
                @click="getCheckedNodes"
              >确认</el-button>
              <el-button
                   size="small"
                size="small"
                type="info"
                plain
                @click="resetCheckedNodes"
@@ -76,11 +76,13 @@
      </el-form-item>
      <el-form-item>
        <el-button
          plain size="small"
          plain
          size="small"
          @click="getAttributeQuery"
        >查询</el-button>
        <el-button
          type="info"  size="small"
          type="info"
          size="small"
          @click="clearQuery"
          plain
        >重置</el-button>
@@ -221,7 +223,11 @@
        }
      }
      if (count != 4) {
        alert('ShapeFile文件选择不全！');

        this.$message({
          message: 'ShapeFile文件选择不全！',
          type: 'warning'
        });
        return;
      }
      $.ajax(BASE_URL + '/inquiry/uploadShp?token=' + getToken(), {
@@ -340,7 +346,7 @@
      console.log(res.geometry)
      var jsonToWkt = this.$wkt.convert(res.geometry);
      this.$store.state.mapMenuShpFile = encr(jsonToWkt);
 

      this.showMapMenuPop();
    },
    showMapMenuPop() {
@@ -350,7 +356,7 @@
      this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.open("空间查询", null, {
        close: () => {

         if (this.$store.state.primitLayer != null) {
          if (this.$store.state.primitLayer != null) {
            sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
            this.$store.state.primitLayer = null;
          }

 src/components/mapsdk.vue

@@ -424,7 +424,7 @@

      var helper = new Cesium.EventHelper();
      helper.add(Viewer.scene.globe.tileLoadProgressEvent, function (e) {
        debugger
        
     if (e == 0) {
console.log("这个是加载最后一个矢量切片的回调");
}

 src/components/navMenu - ¸±±¾.vue

@@ -2,7 +2,10 @@
  <div class="leftMenu">
    <div class="leftTopWrapper">
      <div class="logo">
        <img src="../assets/img/www.terra-it.cn.png" alt="" />
        <img
          src="../assets/img/www.terra-it.cn.png"
          alt=""
        />
      </div>
      <div class="menu">
        <el-menu
@@ -19,15 +22,24 @@
    </div>
    <div class="leftBotWrapper">
      <div class="userInfo">
        <img src="../assets/img/user.png" alt="" />
        <img
          src="../assets/img/user.png"
          alt=""
        />
        <span>admin</span>
        <span @click="logOut">注销</span>
        &nbsp;
        <span @click="switchLang"> åˆ‡æ¢è¯­è¨€</span>
      </div>
      <div class="btnBox">
        <div><img src="../assets/img/leftBtn.png" alt="" /></div>
        <div><img src="../assets/img/rightBtn.png" alt="" /></div>
        <div><img
            src="../assets/img/leftBtn.png"
            alt=""
          /></div>
        <div><img
            src="../assets/img/rightBtn.png"
            alt=""
          /></div>
      </div>
    </div>
  </div>
@@ -97,7 +109,10 @@
            });
            this.menuList = this.treeData(menuLists);
          } else {
            alert('暂无菜单栏数据');
            this.$message({
              message: '暂无菜单栏数据',
              type: 'warning'
            });
          }
        } else {
          console.log('接口报错');
@@ -117,7 +132,10 @@
          return father.pid == 1; // è¿”回一级菜单
        });
      } else {
        alert('暂无菜单栏数据');
          this.$message({
              message: '暂无菜单栏数据',
              type: 'warning'
            });
      }
    },
    logOut() {

 src/components/navMenu copy.vue

@@ -174,7 +174,10 @@

          that.setMenuTree(menuLists);
        } else {
          alert('暂无菜单栏数据');
             this.$message({
              message: '暂无菜单栏数据',
              type: 'warning'
            });
        }
      }
    },
@@ -212,7 +215,10 @@
          return father.pid == 1; // è¿”回一级菜单
        });
      } else {
        alert('暂无菜单栏数据');
         this.$message({
              message: '暂无菜单栏数据',
              type: 'warning'
            });
      }
    },
    logOut() {

 src/components/navMenu.vue

@@ -221,7 +221,10 @@

          that.setMenuTree(menuLists);
        } else {
          alert('暂无菜单栏数据');
             this.$message({
              message: '暂无菜单栏数据',
              type: 'warning'
            });
        }
      }
    },
@@ -263,7 +266,10 @@
          return father.pid == 1; // è¿”回一级菜单
        });
      } else {
        alert('暂无菜单栏数据');
          this.$message({
              message: '暂无菜单栏数据',
              type: 'warning'
            });
      }
    },
    logOut() {

 src/views/Archive/index copy.vue

@@ -44,11 +44,15 @@
        </el-form>
      </div>
    </div>
    

    <div class="box_item">
      <div class="box_left">资料类别</div>
      <div class="box_cont">
        <div class="box_div" v-for="(item, index) in showList" :key="index">
        <div
          class="box_div"
          v-for="(item, index) in showList"
          :key="index"
        >
          <el-checkbox
            v-if="isShowFirstCheck"
            v-model="item.isCheckedFlag"
@@ -58,10 +62,16 @@
        </div>
      </div>
      <div class="box_right">
        <div class="box_div box_menu" @click="moreEvent(1)">
        <div
          class="box_div box_menu"
          @click="moreEvent(1)"
        >
          {{ $t('synthesis.more') }}
        </div>
        <div class="box_div box_menu" @click="checkEvent(1)">
        <div
          class="box_div box_menu"
          @click="checkEvent(1)"
        >
          <i class="el-icon-plus"></i> {{ $t('synthesis.Multiplechoice') }}
        </div>
      </div>
@@ -69,7 +79,11 @@
    <div class="box_item">
      <div class="box_left">项目名称</div>
      <div class="box_cont">
        <div class="box_div" v-for="(item, index) in showList1" :key="index">
        <div
          class="box_div"
          v-for="(item, index) in showList1"
          :key="index"
        >
          <el-checkbox
            v-if="isShowSecondCheck"
            v-model="item.isCheckedFlag"
@@ -79,10 +93,16 @@
        </div>
      </div>
      <div class="box_right">
        <div class="box_div box_menu" @click="moreEvent(2)">
        <div
          class="box_div box_menu"
          @click="moreEvent(2)"
        >
          {{ $t('synthesis.more') }}
        </div>
        <div class="box_div box_menu" @click="checkEvent(2)">
        <div
          class="box_div box_menu"
          @click="checkEvent(2)"
        >
          <i class="el-icon-plus"></i> {{ $t('synthesis.Multiplechoice') }}
        </div>
      </div>
@@ -771,9 +791,9 @@
        value: '',
        type: '',
        date: '',
      

      },
        fromSqlflag: false,
      fromSqlflag: false,
      filedsOption: [],
      condOption: [],
      queryForm: {
@@ -954,7 +974,7 @@
          break;
        case 2:
          this.getQueryDirTree();
         

          this.isMenuActive = false;
          break;
      }
@@ -970,8 +990,8 @@
      this.companyOption = this.treeData(res.result);
      this.getQueryDepTree();
    },
     async getQueryDepTree(){
   const res = await selectdepTab();
    async getQueryDepTree() {
      const res = await selectdepTab();
      if (res.code != 200) {
        this.$message.error('单位列表获取失败');
        return;
@@ -1027,7 +1047,10 @@
    },
    downFormData() {
      if (this.multipleSelection1.length == 0) {
        alert('请先选择要下载的文件');
        this.$message({
          message: '请先选择要下载的文件',
          type: 'warning'
        });
        return;
      }
      this.showCodeBox = true;
@@ -1244,7 +1267,10 @@
      var token = getToken();
      var fs = document.getElementById("insertFile");
      if (fs.files.length == 0) {
        alert("请选择要上传的文件！");
        this.$message({
          message: '请选择要上传的文件！',
          type: 'warning'
        });
        return;
      }
      const formData = new FormData()

 src/views/Archive/index.vue

@@ -1125,7 +1125,11 @@
    },
    downFormData() {
      if (this.multipleSelection1.length == 0) {
        alert('请先选择要下载的文件');

        this.$message({
          message: '请先选择要下载的文件',
          type: 'warning'
        });
        return;
      }
      this.showCodeBox = true;
@@ -1171,7 +1175,7 @@
      this.listData.dirid = this.queryForm.dirid
      this.listData.depid = this.queryForm.depid;
      dataLib_selectByPageForMeta(this.listData).then((res) => {
 

        this.tableData1 = res.result;
        this.count = res.count;
      });
@@ -1344,7 +1348,11 @@
      var token = getToken();
      var fs = document.getElementById("insertFile");
      if (fs.files.length == 0) {
        alert("请选择要上传的文件！");

        this.$message({
          message: '请选择要上传的文件！',
          type: 'warning'
        });
        return;
      }
      const formData = new FormData()

 src/views/PackageTwo/WareInspection.vue

@@ -21,6 +21,10 @@
  methods: {
    showChangeIfream(res) {

      if (res.indexOf('{host}') != -1) {
 
        res = res.replace('{host}',ipConfig )
      }
      if (res.indexOf('token=') != -1) {
        res = res + getToken();
      }

 src/views/Synthesis/LeftMenu.vue

@@ -94,6 +94,12 @@
            name: '指北针',
            css: 'twoMenu_imge28',
          },
          {
            id: 'b9',
            label: 'synthesis.undergroundMode',
            name: '地下模式',
            css: 'twoMenu_imge28',
          },
        ],
        [
          {
@@ -324,6 +330,7 @@
      isolineFlag: false,
      isslopeFlag: false,
      isContrastFlag: false,
      UndergroundMode: false
    };
  },
  methods: {
@@ -996,6 +1003,11 @@
          this.isNaviget = !this.isNaviget;
          window.sgworld.navControl('nav', this.isNaviget);
          break;
        case 'b9': //地下模式

          this.UndergroundMode = !this.UndergroundMode;
          window.sgworld.Analysis.UndergroundMode(this.UndergroundMode, 0.3)
          break;
      }
    },
    setCoverage(res) {

 src/views/Thematic/index.js

@@ -36,7 +36,7 @@
  ],
  [
    { id: 'c1', name: '西气东输一线' },
    { id: 'c2', name: '西气东输二线西段干' },
    { id: 'c2', name: '西气东输二线西段干线' },
    { id: 'c3', name: '西气东输淮武支线' },
    { id: 'c4', name: '西部原油管道工程' },
  ],

 src/views/Thematic/index.vue

@@ -415,6 +415,7 @@
      } else if (vid.indexOf('c') != -1) {
        var url = geoserverWFSLine + '%27' + res.name + '%27';
        axios.get(url).then((res) => {

          if (res.status == 200) {
            if (res.data.features.length == 0) return;
            var std = [];
@@ -422,15 +423,31 @@
              var featurLayer = res.data.features[i];
              var path = featurLayer.geometry.coordinates[0];
              for (var j in path) {
                std.push(path[j][0], path[j][1], 50);
                // std.push(path[j][0], path[j][1], 50);
                std.push(path[j])
              }
            }

            this.showPathLine(std);
            var str = this.removeRepeat1(std);
            var val = [];
            for (var i in str) {
              val.push(str[i][0], str[i][1], 50);
            }
            this.showPathLine(val)
          }
        });
      }
    },
    removeRepeat1(arr) {
      const obj = {};
      return arr.filter(item => {
        if (!obj[item.toString()]) {
          obj[item.toString()] = item.toString();
          return item;
        }
      });
    },

    showPathLine(res) {

      window.sgworld.Creator.getFlyData(res, (data) => {
@@ -580,7 +597,7 @@
    setAddImageLayer(res) {
      let layerWMS = new Cesium.WebMapServiceImageryProvider({
        url: geoServerURl,
        layers:res.resource,
        layers: res.resource,
        parameters: {
          transparent: true,
          format: 'image/png',

 src/views/Tools/LayerTree.vue

@@ -376,34 +376,34 @@
    },
  },
  mounted() {
    // var std = [];
    // var val = this.treeData[0].children;
    var std = [];
    var val = this.treeData[0].children;

    // if (this.$store.state.showAllLayers == true) {
    //   for (var j = 0; j < val.length; j++) {
    //     if (val[j].id != 13 && val[j].id != 14) {
    //       std.push(val[j].id);
    //       this.setAddLayers(val[j]);
    //     }
    if (this.$store.state.showAllLayers == true) {
      for (var j = 0; j < val.length; j++) {
        if (val[j].id != 13 && val[j].id != 14) {
          std.push(val[j].id);
          this.setAddLayers(val[j]);
        }

    //   }
    //   this.$store.state.showAllLayers = false;
      }
      this.$store.state.showAllLayers = false;


    // } else {
    //   for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
    //     var val_id = window.Viewer.imageryLayers._layers[i];
    //     if (val_id.show == true) {
    //       for (var j = 0; j < val.length; j++) {
    //         if (val_id.imageryProvider.name == val[j].label) {
    //           std.push(val[j].id);
    //         }
    //       }
    //     }
    //   }
    // }
    } else {
      for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
        var val_id = window.Viewer.imageryLayers._layers[i];
        if (val_id.show == true) {
          for (var j = 0; j < val.length; j++) {
            if (val_id.imageryProvider.name == val[j].label) {
              std.push(val[j].id);
            }
          }
        }
      }
    }

    // this.$refs.tree.setCheckedKeys(std);
    this.$refs.tree.setCheckedKeys(std);
  },
};
</script>

 src/views/datamanage/SpatialData.vue

@@ -7,15 +7,18 @@
    <el-divider />
    <div class="spatialContent">
      <div class="spatial_leftTree">
        <el-input v-model="filterText"></el-input>
        <div style="width:300px">

          <el-tree
            ref="treeDay"
            :data="tree"
            :props="defaultProps"
            :default-expanded-keys="[1]"
            node-key="id"
            :current-node-key="10"
            @node-click="handleNodeClick"
            :filter-node-method="filterNode"
            ref="tree"
          ></el-tree>
        </div>
      </div>
@@ -41,15 +44,15 @@
          <el-form-item>
            <el-button
              @click="conditionVisible = true"
              class="primaries"
              size="small"
              icon="el-icon-plus"
              type="success"
            >{{$t('common.append')}}</el-button>
          </el-form-item>
          <el-form-item>
            <el-button
              @click="submitForm"
              class="primaries"
              type="primary"
              size="small"
              icon="el-icon-search"
            >{{$t('common.iquery')}}</el-button>
@@ -59,13 +62,14 @@
              @click="resetForm"
              size="small"
              icon="el-icon-refresh"
              type="info"
            >{{$t('common.reset')}}</el-button>
          </el-form-item>
          <el-form-item>
            <el-button
              @click="getSpaceMapVisibale"
              size="small"
              class="primaries"
                type="primary"
            >{{
              $t('synthesis.rangequery')
            }}</el-button>
@@ -454,7 +458,8 @@
      upAttach: {
        tabName: null,
        eventid: null,
      }
      },
      filterText: ''

    };
  },
@@ -464,8 +469,17 @@
    this.showPermsBtn();
    this.getTreeDataAll();
  },
  methods: {
  watch: {
    filterText(val) {
      this.$refs.tree.filter(val);
    }
  },

  methods: {
    filterNode(value, data) {
      if (!value) return true;
      return data.label.indexOf(value) !== -1;
    },
    getSpaceMapVisibale() {
      this.dialogMapVisible = true;
      this.showMapVisible = true;
@@ -507,7 +521,11 @@
      var token = getToken();
      var fs = document.getElementById("insertFile");
      if (fs.files.length == 0) {
        alert("请选择要上传的文件！");

        this.$message({
          message: '请选择要上传的文件！',
          type: 'warning'
        });
        return;
      }
      const formData = new FormData()
@@ -581,7 +599,8 @@
      for (var i in option) {
        var val_Data = option[i];
        val_Data.id = '1' + i;
        val_Data.label = val_Data.tabDesc + "(" + val_Data.tab + ")"
        // val_Data.label = val_Data.tabDesc + "(" + val_Data.tab + ")"
        val_Data.label = val_Data.tabDesc
        option[i].id = parseInt(option[i].id)
        if (option[i].ns == 'bd') {


 src/views/datamanage/addStyle.vue

@@ -3,18 +3,23 @@
    <My-bread :list="['数据管理', '样式管理', '添加样式']"></My-bread>
    <el-divider />
    <div class="inquire">
      <el-form ref="formData1" :model="updateForm" :inline="true">
      <el-form
        ref="formData1"
        :model="updateForm"
        :inline="true"
      >
        <el-form-item>
          <el-link
            style="margin-left: 10px; margin-right: 20px"
            :underline="false"
            @click="returnStyle"
            title="返回"
            ><i class="el-icon-d-arrow-left"></i
          ></el-link>
          <el-button type="primary" size="small" @click="showCatalog()"
            >目录</el-button
          >
          ><i class="el-icon-d-arrow-left"></i></el-link>
          <el-button
            type="primary"
            size="small"
            @click="showCatalog()"
          >目录</el-button>
        </el-form-item>
        <el-form-item>
          <el-tooltip
@@ -28,12 +33,17 @@
              disabled
              class="firstInput"
            />
          </el-tooltip> </el-form-item
        ><el-form-item>
          </el-tooltip>
        </el-form-item>
        <el-form-item>
          <span>类型选择</span>
        </el-form-item>
        <el-form-item>
          <el-select v-model="updateForm.type" clearable placeholder="请选择">
          <el-select
            v-model="updateForm.type"
            clearable
            placeholder="请选择"
          >
            <el-option
              v-for="item in options"
              :key="item.value"
@@ -64,7 +74,10 @@
            :accept="acceptItem"
          >
            <template #trigger>
              <el-button type="primary" size="small">选择</el-button>
              <el-button
                type="primary"
                size="small"
              >选择</el-button>
            </template>
            <el-button
              class="ml-3"
@@ -79,8 +92,7 @@
              :underline="false"
              @click="delStyleData"
              style="margin-left: 300px"
              ><i class="el-icon-delete"></i
            ></el-link>
            ><i class="el-icon-delete"></i></el-link>
          </el-upload>
        </el-form-item>
      </el-form>
@@ -94,20 +106,66 @@
        height="99%"
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55" />
        <el-table-column width="50" type="index" label="序号" />
        <el-table-column min-width="150" prop="name" label="数据名称" />
        <el-table-column min-width="200" prop="path" label="所属目录" />
        <el-table-column min-width="100" prop="create_time" label="创建时间" />
        <el-table-column min-width="100" prop="create_user" label="创建人员" />
        <el-table-column min-width="80" prop="type" label="数据类型" />
        <el-table-column min-width="80" prop="format" label="数据格式" />
        <el-table-column min-width="80" prop="up_unit" label="上传单位" />
        <el-table-column min-width="50" prop="status" label="数据状态" />
        <el-table-column min-width="50" prop="version" label="数据版本" />
        <el-table-column
          type="selection"
          width="55"
        />
        <el-table-column
          width="50"
          type="index"
          label="序号"
        />
        <el-table-column
          min-width="150"
          prop="name"
          label="数据名称"
        />
        <el-table-column
          min-width="200"
          prop="path"
          label="所属目录"
        />
        <el-table-column
          min-width="100"
          prop="create_time"
          label="创建时间"
        />
        <el-table-column
          min-width="100"
          prop="create_user"
          label="创建人员"
        />
        <el-table-column
          min-width="80"
          prop="type"
          label="数据类型"
        />
        <el-table-column
          min-width="80"
          prop="format"
          label="数据格式"
        />
        <el-table-column
          min-width="80"
          prop="up_unit"
          label="上传单位"
        />
        <el-table-column
          min-width="50"
          prop="status"
          label="数据状态"
        />
        <el-table-column
          min-width="50"
          prop="version"
          label="数据版本"
        />
      </el-table>
    </div>
    <div class="pagination_box" style="margin-top: 20px; margin-left: 400px">
    <div
      class="pagination_box"
      style="margin-top: 20px; margin-left: 400px"
    >
      <el-pagination
        @size-change="handleSizeChange"
        @current-change="handleCurrentChange"
@@ -119,17 +177,24 @@
      >
      </el-pagination>
    </div>
    <div class="leftTree" v-show="showCata">
    <div
      class="leftTree"
      v-show="showCata"
    >
      <div class="treeBox">
        <catalogueTree></catalogueTree>
      </div>
      <div class="btnBox">
        <el-button type="primary" size="small" @click="selectCataName"
          >确定</el-button
        >
        <el-button type="primary" size="small" @click="closeCata"
          >取消</el-button
        >
        <el-button
          type="primary"
          size="small"
          @click="selectCataName"
        >确定</el-button>
        <el-button
          type="primary"
          size="small"
          @click="closeCata"
        >取消</el-button>
      </div>
    </div>
    <!-- <div class="infoBox" v-show="showinfoBox">
@@ -290,7 +355,7 @@
          });
          this.startFromData();
        })
        .catch(() => {});
        .catch(() => { });
    },
    // æ˜¾ç¤ºç›®å½•
    showCatalog() {
@@ -310,7 +375,11 @@

    submitUpload() {
      if (this.updateForm.path_id == "" || this.updateForm.type == "") {
        alert("请选择数据类型或上传目录");

        this.$message({
          message: '请选择数据类型或上传目录',
          type: 'warning'
        });
        this.$refs.upload.abort();
        return false;
      } else {
@@ -341,7 +410,8 @@
          });
          this.getMetaData(10, 1);
        } else {
          alert("上传失败");

          this.$message.error('上传失败');
          console.log(res);
        }
      });

 src/views/datamanage/catalogueManage copy.vue

@@ -445,11 +445,11 @@
            this.getDirTree();
            return;
          } else {
            alert('调整失败，请重试！');
            this.$message.error('修改失败，请重试！');
          }
        })
        .catch(() => {
          alert('修改失败，请重试！');
          this.$message.error('修改失败，请重试！');
        });
    },
    handleNodeClick(data) {
@@ -474,7 +474,7 @@
                }, 500);
              })
              .catch((res) => {
                alert('修改失败，请重试！');
                this.$message.error('修改失败，请重试！');
                this.fullscreenLoading = false;
              });
          } else {

 src/views/datamanage/catalogueManage.vue

@@ -574,11 +574,11 @@
            this.getDirTree();
            return;
          } else {
            alert('调整失败，请重试！');
           this.$message.error('修改失败，请重试！');
          }
        })
        .catch(() => {
          alert('修改失败，请重试！');
      this.$message.error('修改失败，请重试！');
        });
    },
    handleNodeClick(data, node) {
@@ -604,7 +604,7 @@
                }, 500);
              })
              .catch((res) => {
                alert('修改失败，请重试！');
            this.$message.error('修改失败，请重试！');
                this.fullscreenLoading = false;
              });
          } else {

 src/views/datamanage/dataController.vue

@@ -109,10 +109,11 @@
 
          this.setViewController(this.menuList[0]);
        } else {
          alert('暂无菜单栏数据');
         
          this.$message.error('暂无菜单栏数据');
        }
      } else {
        console.log('接口报错');
         this.$message.error('接口报错');
      }

      // this.treeList = this.treeData(data.result);
@@ -139,7 +140,8 @@
          return father.pid == 1; // è¿”回一级菜单
        });
      } else {
        alert('暂无菜单栏数据');
 
         this.$message.error('暂无菜单栏数据');
      }
    },


 src/views/datamanage/dataUpdata.vue

@@ -315,6 +315,7 @@
                  @click="handerLogClick(scope.row)"
                  type="text"
                  size="mini"
                  style="font-size: 14px;"
                > æ—¥å¿—
                </el-button>
              </template>
@@ -502,37 +503,37 @@
            class="ContBox"
            v-show="quayTestShow.checkAttrs"
          >
            <el-checkbox disabled>属性检查：(*dlg*.gdb+*地形图**.dwg)</el-checkbox>
            <el-checkbox checked disabled>属性检查：(*dlg*.gdb+*地形图**.dwg)</el-checkbox>
          </div>
          <div
            class="ContBox"
            v-show="quayTestShow.checkMath"
          >
            <el-checkbox disabled>数学基础检查：(.shp,.dlg)</el-checkbox>
            <el-checkbox checked disabled>数学基础检查：(.shp,.dlg)</el-checkbox>
          </div>
          <div
            class="ContBox"
            v-show="quayTestShow.checkDecorate"
          >
            <el-checkbox disabled>图面整饰检查：(.dwg)</el-checkbox>
            <el-checkbox checked disabled>图面整饰检查：(.dwg)</el-checkbox>
          </div>
          <div
            class="ContBox"
            v-show="quayTestShow.checkXls"
          >
            <el-checkbox disabled>表格数据检查：(.xls/.xlsx)</el-checkbox>
            <el-checkbox checked disabled>表格数据检查：(.xls/.xlsx)</el-checkbox>
          </div>
          <div
            class="ContBox"
            v-show="quayTestShow.checkOrigin"
          >
            <el-checkbox disabled>原点检查：(*剖面图*.dwg)</el-checkbox>
            <el-checkbox checked disabled>原点检查：(*剖面图*.dwg)</el-checkbox>
          </div>
          <div
            class="ContBox"
            v-show="quayTestShow.checkMeta"
          >
            <el-checkbox disabled>元数据检查：(*元数据*.xls/.xlsx)</el-checkbox>
            <el-checkbox checked disabled>元数据检查：(*元数据*.xls/.xlsx)</el-checkbox>
          </div>
          <div
            class="ContBox"
@@ -544,7 +545,7 @@
              class="demo-form-inline"
            >
              <el-form-item>
                <el-checkbox disabled>拓扑检查：(*地形图*.dwg)</el-checkbox>
                <el-checkbox checked disabled>拓扑检查：(*地形图*.dwg)</el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -598,7 +599,7 @@
              class="demo-form-inline"
            >
              <el-form-item>
                <el-checkbox disabled>栅格检查：(.tif/.img)</el-checkbox>
                <el-checkbox checked disabled>栅格检查：(.tif/.img)</el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -628,7 +629,7 @@
              class="demo-form-inline"
            >
              <el-form-item>
                <el-checkbox disabled>高程检查：(.tif/.img)</el-checkbox>
                <el-checkbox checked disabled>高程检查：(.tif/.img)</el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -658,7 +659,7 @@
              class="demo-form-inline"
            >
              <el-form-item>
                <el-checkbox disabled>点云检查：(.laz + *激光点云*.xls/.xlsx)</el-checkbox>
                <el-checkbox checked disabled>点云检查：(.laz + *激光点云*.xls/.xlsx)</el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -680,7 +681,7 @@
              class="demo-form-inline"
            >
              <el-form-item>
                <el-checkbox disabled>OSGB检查：(.osgb + *倾斜摄影*.xls/.xlsx) </el-checkbox>
                <el-checkbox checked disabled>OSGB检查：(.osgb + *倾斜摄影*.xls/.xlsx) </el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -1082,6 +1083,8 @@
        pageSize: 1,
        pageSize: 10,
      },
      count1:0,
      attributeData:[],
    }
  },


 src/views/datamanage/dictionaryManage.vue

@@ -55,7 +55,7 @@
            v-for="item in optionCount"
            :class="{ active: activeName == item.tab }"
          >
            {{ item.tabDesc }}({{ item.tab }})
            {{ item.tabDesc }} 
          </li>
        </ul>
      </div>

 src/views/datamanage/domainManage.vue

@@ -7,12 +7,15 @@
    <el-divider />
    <div class="mainBox">
      <div class="leftTree">
        <el-input v-model="filterInput"></el-input>
        <div style="width:450px">
          <el-tree
            :data="domainData"
            :props="defaultProps"
            :default-expand-all="true"
            @node-click="toggleTabs"
            :filter-node-method="filterNode"
            ref="tree"
          ></el-tree>
        </div>
      </div>
@@ -367,6 +370,7 @@
  components: { MyBread },
  data() {
    return {
      filterInput: '',
      domainOptions: [],
      multipleSelection: [],
      behavior: '',
@@ -426,7 +430,13 @@
      return this.$store.state.cataNode.id;
    },
  },
 
  methods: {
      filterNode(value, data) {
      if (!value) return true;
 
      return data.val.indexOf(value) !== -1;
    },
    async toggleTabs(data) {
      this.fullscreenLoading = true;
      this.listData.ns = data.ns;
@@ -473,10 +483,12 @@
        let bdres = res.result.filter((item) => item.ns == 'bd');
        let bsres = res.result.filter((item) => item.ns == 'bs');
        for (var i in bdres) {
          bdres[i].val = bdres[i].tabDesc + '(' + bdres[i].tab + ')';
          // bdres[i].val = bdres[i].tabDesc + '(' + bdres[i].tab + ')';
          bdres[i].val = bdres[i].tabDesc;
        }
        for (var i in bsres) {
          bsres[i].val = bsres[i].tabDesc + '(' + bsres[i].tab + ')';
          // bsres[i].val = bsres[i].tabDesc + '(' + bsres[i].tab + ')';
          bsres[i].val = bsres[i].tabDesc;
        }
        this.domainData[0].children = bdres;
        this.domainData[1].children = bsres;
@@ -704,6 +716,9 @@
      immediate: true,
      handler(val) { },
    },
    filterInput(val) {
      this.$refs.tree.filter(val);
    }
  },
};
</script>

 src/views/maintenance/databaseMonitoring.vue

@@ -22,6 +22,7 @@
    //这里存放数据
    return {
      sql_Url: '',
      host: null,
    };
  },
  //方法集合
@@ -29,10 +30,15 @@
    handleSelectionChange() { },
    getUrl() {

      if (this.$store.state.iframeMsg.indexOf('token=') != -1) {
        this.sql_Url = this.$store.state.iframeMsg + getToken();
      var url = this.$store.state.iframeMsg;
      if (url.indexOf('{host}') != -1) {
        url = url.replace('{host}', ipConfig)
      }
 
      if (url.indexOf('token=') != -1) {
        this.sql_Url = url + getToken();
      } else {
        this.sql_Url = this.$store.state.iframeMsg;
        this.sql_Url = url;
      }
    },
  },

 src/views/maintenance/menuSettings copy 2.vue

@@ -749,11 +749,11 @@
            this.getMenuTree();
            return;
          } else {
            alert('调整失败，请重试！');
            this.$message.error('调整失败，请重试！');
          }
        })
        .catch(() => {
          alert('修改失败，请重试！');
          this.$message.error('调整失败，请重试！');
        });
    },
    handleNodeClick(data, node) {
@@ -779,7 +779,7 @@
                }, 500);
              })
              .catch((res) => {
                alert('修改失败，请重试！');
               this.$message.error('调整失败，请重试！');
                this.fullscreenLoading = false;
              });
          } else {

 src/views/maintenance/menuSettings copy.vue

@@ -570,11 +570,11 @@
            this.getMenuTree();
            return;
          } else {
            alert('调整失败，请重试！');
           this.$message.error('调整失败，请重试！');
          }
        })
        .catch(() => {
          alert('修改失败，请重试！');
           this.$message.error('调整失败，请重试！');
        });
    },
    handleNodeClick(data) {
@@ -600,7 +600,7 @@
                }, 500);
              })
              .catch((res) => {
                alert('修改失败，请重试！');
                this.$message.error('调整失败，请重试！');
                this.fullscreenLoading = false;
              });
          } else {

 src/views/maintenance/menuSettings.vue

@@ -749,11 +749,11 @@
            this.getMenuTree();
            return;
          } else {
            alert('调整失败，请重试！');
             this.$message.error('调整失败，请重试！');
          }
        })
        .catch(() => {
          alert('修改失败，请重试！');
           this.$message.error('调整失败，请重试！');
        });
    },
    handleNodeClick(data, node) {
@@ -779,7 +779,7 @@
                }, 500);
              })
              .catch((res) => {
                alert('修改失败，请重试！');
                this.$message.error('调整失败，请重试！');
                this.fullscreenLoading = false;
              });
          } else {

 src/views/maintenance/mochaitmo copy.vue

@@ -64,7 +64,7 @@
import databaseMonitoring from '@/views/maintenance/databaseMonitoring.vue'; //数据库监控
import systemMonitoring from '@/views/maintenance/systemMonitoring.vue'; //系统监控
import parameterConfiguration from '@/views/maintenance/parameterConfiguration.vue'; //系统配置
import downlog  from '@/views/maintenance/downlog.vue'; //下载日志
import downlog from '@/views/maintenance/downlog.vue'; //下载日志
import { selectMenuRecursive, queryMenuTree, getPerms } from '../../api/api';
import customElMenu from '../../components/customElMenu.vue';
export default {
@@ -145,9 +145,9 @@
      let menuLists = data.result.filter((value) => {
        return value.url == '/mochaitmo';
      });
   

      const res = await selectMenuRecursive({ name: menuLists[0].cnName });
         

      if (res.code == 200) {
        if (res.result.length != 0) {
          let menuList = res.result.filter((value) => {
@@ -157,7 +157,8 @@
          this.getCookies();
          //
        } else {
          alert('暂无菜单栏数据');

          this.$message.error('暂无菜单栏数据');
        }
      } else {
        console.log('接口报错');

 src/views/maintenance/systemMonitoring.vue

@@ -6,6 +6,117 @@
      ]"></My-bread>
    <el-divider />
    <div class="content_Box">
      <div class="cloumn_Box1">
        <div class="flex_Box1">
          <el-tabs
            v-model="activeName"
            @tab-click="handleClick"
          >
            <el-tab-pane
              :label="$t('operatManage.systemMonitoringObj.abnormalResources')"
              name="first"
            >
              <el-table
                :data="resInfo"
                style="width: 100%; height: 310px"
              >
                <el-table-column
                  prop="id"
                  :label="$t('operatManage.systemMonitoringObj.resourceID')"
                >
                </el-table-column>
                <el-table-column
                  prop="name"
                  :label="$t('operatManage.systemMonitoringObj.resourceName')"
                >
                </el-table-column>
                <el-table-column
                  prop="bak"
                  :label="$t('operatManage.systemMonitoringObj.resourceState')"
                >
                </el-table-column>
                <el-table-column
                  prop="createTime"
                  :label="$t('operatManage.systemMonitoringObj.abnormaltime')"
                  show-overflow-tooltip
                >
                </el-table-column>
              </el-table>
            </el-tab-pane>
            <el-tab-pane
              :label="
                $t('operatManage.systemMonitoringObj.serviceResourceStatus')
              "
              name="second"
            >

              <div
                id="resUseChart"
                style="width:101vh; height: 30vh; "
              ></div>

            </el-tab-pane>
            <el-tab-pane
              :label="$t('operatManage.systemMonitoringObj.userloginStatus')"
              name="third"
            >
              <div
                id="userLoginChart"
                style="width:101vh; height: 30vh; "
              ></div>
            </el-tab-pane>
            <el-tab-pane
              :label="
                $t('operatManage.systemMonitoringObj.resourceOperationStatus')
              "
              name="fourth"
            >
              <div
                id="operateCountChart"
                style="width:101vh; height: 30vh; "
              ></div>
            </el-tab-pane>
          </el-tabs>
        </div>
        <div class="flex_Box">
          <div>
            <div
              style="line-height: 32px"
              class="imageTitle"
            >
              {{ $t('operatManage.systemMonitoringObj.onlinePersonnel') }}
            </div>
          </div>
          <el-table
            :data="tableData"
            style="width: 100%"
            height="90%"
          >
            <el-table-column
              align="center"
              type="index"
              :label="$t('operatManage.ELM.index')"
              width="100px"
            />
            <el-table-column
              prop="uid"
              :label="$t('operatManage.systemMonitoringObj.userID')"
            >
            </el-table-column>
            <el-table-column
              prop="uname"
              :label="$t('operatManage.systemMonitoringObj.username')"
            >
            </el-table-column>
            <el-table-column
              prop="loginTime"
              :label="$t('operatManage.systemMonitoringObj.onlineTime')"
              fixed="right"
            >
            </el-table-column>
          </el-table>
        </div>
      </div>
      <div class="cloumn_Box">
        <div class="flex_Box">
          <div style="width: 100%; height: 20px">
@@ -96,117 +207,7 @@

        </div>
      </div>
      <div class="cloumn_Box1">
        <div class="flex_Box1">
          <el-tabs
            v-model="activeName"
            @tab-click="handleClick"
          >
            <el-tab-pane
              :label="$t('operatManage.systemMonitoringObj.abnormalResources')"
              name="first"
            >
              <el-table
                :data="resInfo"
                style="width: 100%; height: 310px"
              >
                <el-table-column
                  prop="id"
                  :label="$t('operatManage.systemMonitoringObj.resourceID')"
                >
                </el-table-column>
                <el-table-column
                  prop="name"
                  :label="$t('operatManage.systemMonitoringObj.resourceName')"
                >
                </el-table-column>
                <el-table-column
                  prop="bak"
                  :label="$t('operatManage.systemMonitoringObj.resourceState')"
                >
                </el-table-column>
                <el-table-column
                  prop="createTime"
                  :label="$t('operatManage.systemMonitoringObj.abnormaltime')"
                  show-overflow-tooltip
                >
                </el-table-column>
              </el-table>
            </el-tab-pane>
            <el-tab-pane
              :label="
                $t('operatManage.systemMonitoringObj.serviceResourceStatus')
              "
              name="second"
            >

              <div
                id="resUseChart"
                style="width:101vh; height: 30vh; "
              ></div>

            </el-tab-pane>
            <el-tab-pane
              :label="$t('operatManage.systemMonitoringObj.userloginStatus')"
              name="third"
            >
              <div
                id="userLoginChart"
           style="width:101vh; height: 30vh; "
              ></div>
            </el-tab-pane>
            <el-tab-pane
              :label="
                $t('operatManage.systemMonitoringObj.resourceOperationStatus')
              "
              name="fourth"
            >
              <div
                id="operateCountChart"
              style="width:101vh; height: 30vh; "
              ></div>
            </el-tab-pane>
          </el-tabs>
        </div>
        <div class="flex_Box">
          <div>
            <div
              style="line-height: 32px"
              class="imageTitle"
            >
              {{ $t('operatManage.systemMonitoringObj.onlinePersonnel') }}
            </div>
          </div>
          <el-table
            :data="tableData"
            style="width: 100%"
            height="90%"
          >
            <el-table-column
              align="center"
              type="index"
              :label="$t('operatManage.ELM.index')"
              width="100px"
            />
            <el-table-column
              prop="uid"
              :label="$t('operatManage.systemMonitoringObj.userID')"
            >
            </el-table-column>
            <el-table-column
              prop="uname"
              :label="$t('operatManage.systemMonitoringObj.username')"
            >
            </el-table-column>
            <el-table-column
              prop="loginTime"
              :label="$t('operatManage.systemMonitoringObj.onlineTime')"
              fixed="right"
            >
            </el-table-column>
          </el-table>
        </div>
      </div>
    </div>
    <!-- <div class="inform_box">
      <div class="content_box">
@@ -470,6 +471,13 @@
            seriesIndex: 0,
          },
        ],
        toolbox: {
          show: true,
          feature: {

            saveAsImage: { show: true }
          }
        },
        title: [],
        tooltip: {
          trigger: 'axis',
@@ -655,6 +663,13 @@
        tooltip: {
          trigger: 'item',
        },
        toolbox: {
          show: true,
          feature: {

            saveAsImage: { show: true }
          }
        },
        legend: {
          top: '5%',
          left: 'center',
@@ -764,6 +779,13 @@
            type: 'shadow',
          },
        },
        toolbox: {
          show: true,
          feature: {

            saveAsImage: { show: true }
          }
        },
        grid: {
          left: '3%',
          right: '4%',
@@ -832,7 +854,7 @@
    var height = (mysright * 1.5) + "px"
    $("#shuiwen").width(width);
    $("#shuiwen").height(height);