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

wulitaotao

2023-02-25 5fc6ec9e64f65adb83e8f5247c72e3e4d1339ba6

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

 src/assets/lang/en.js

@@ -786,6 +786,37 @@
      bak: 'Remarks',
    },
  },
  shuJuGuanLi:{
    language: "en",
    pselect:{
      select:"Please select",
      dFile:"Single file upload",
      dFiles:"Overall project upload",
      SurveyDiscipline:"Survey Discipline",
      SurveysDiscipline:"Surveys Discipline",
      GeologicalDisasterSpecialty:"Geological Disaster Specialty",
      CavernSpecialty:"Cavern Specialty",
    },
    shuJuJianSuo:{
      valueone:"Please enter content"
    },
    butten:{
      uploadFile:"Upload File",
      NewPeer:"New Peer",
      AddChild:"Add Child",
      Delete:"Delete",
      MoveUp:"Move Up",
      MoveDown:"Move down",
      Report:"Report",
      Histogram:"Histogram",
      Download:"Download",

    }



  },

};

export default en;

 src/assets/lang/zh.js

@@ -794,6 +794,37 @@
      bak: '备注',
    },
  },
  shuJuGuanLi:{
    language: "zh",
    pselect:{
      select:"请选择",
      dFile:"单文件上传",
      dFiles:"项目整体上传",
      SurveyDiscipline:"测量专业",
      SurveysDiscipline:"勘察专业",
      GeologicalDisasterSpecialty:"地灾专业",
      CavernSpecialty:"洞库专业",
    },
    shuJuJianSuo:{
      valueone:"请输入内容"
    },
    butten:{
      uploadFile:"上传文件",
      NewPeer:"新增同级",
      AddChild:"新增子级",
      Delete:"删除",
      MoveUp:"向上移动",
      MoveDown:"向下移动",
      Report:"报表",
      Histogram:"柱状图",
      Download:"下载",

    }



  },

};

export default zh;

 src/views/datamanage/SpatialData.vue

@@ -79,14 +79,17 @@
        </el-form>
        </div>
        <div class="dividing-line"></div>
        <div class="table_box2" style="height:calc(100% - 89px)">
        <div class="table_box" style="height:calc(100% - 89px)">
<!--          border-->
<!--          ref="filterTable"-->
<!--          :data="tableData"-->
<!--          style="width: 100%"-->
<!--          height="calc(100% - 57px)"-->
<!--          :header-cell-style="{background:'#e6eaee',color:'#181818', 'text-align': 'center'}  "-->
          <el-table
            border
            ref="filterTable"
            :data="tableData"
            style="width: 100%"
            height="calc(100% - 57px)"
            :header-cell-style="{background:'#e6eaee',color:'#181818', 'text-align': 'center'}  "
          >
          <el-table-column
              type="selection"

 src/views/datamanage/dataStatistics.vue

@@ -8,7 +8,7 @@
    ></My-bread>
    <el-divider />
    <div class="contentBox">
      <div class="content_Left subpage_Div">
      <div class="content_Left subpage_Div"  style="border: 1px solid #dcdfe6;">
        <el-tree
          :data="treeData"
          @node-click="handleNodeClick"
@@ -19,7 +19,7 @@
        >
        </el-tree>
      </div>
      <div class="content_Right subpage_Div">
      <div class="content_Right subpage_Div" style="border: 1px solid #dcdfe6;">
        <div class="iquery subpage_Div">
          <div>
            <el-button
@@ -27,24 +27,25 @@
              size="small"
              type="warning"
              @click="setCountFlagChange(1)"
              >报表</el-button
              >{{ $t("shuJuGuanLi.butten.Report") }}</el-button
            >
            <el-button
              icon="el-icon-pie-chart"
              size="small"
              type="primary"
              @click="setCountFlagChange(2)"
              >柱状图</el-button
              >{{ $t("shuJuGuanLi.butten.Histogram") }}</el-button
            >
            <el-button
              icon="el-icon-download"
              size="small"
              type="success"
              @click="setCountFlagChange(3)"
              >下载</el-button
              >{{ $t("shuJuGuanLi.butten.Download") }}</el-button
            >
          </div>
        </div>
        <div class="dividing-line"></div>
        <div class="contentTable subpage_Div" v-show="setCountFlag">
          <el-table
            :data="tableData"
@@ -500,6 +501,7 @@
  width: 98%;
  padding: 1%;
  .contentBox {
    padding-top: 10px;
    height: calc(98% - 63px);
    width: 100%;
    display: flex;
@@ -526,7 +528,7 @@
        height: 82%;
        padding: 1%;
        border-radius: 5px;
        margin-top: 1%;
        //margin-top: 1%;
        .el-table,
        .el-table /deep/ .el-table__expanded-cell {
          background-color: transparent !important;

 src/views/datamanage/dataUpdata.vue

@@ -36,28 +36,23 @@
                :popper-append-to-body="false"
                placeholder="请选择"
              >
                <el-option
<!--                <el-option
                  v-for="item in uploadOption"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                ></el-option>
              </el-select>
                ></el-option>-->

<!--              <el-select v-else-if="$t('shuJuGuanLi.shuJuJianSuo.language')==='en'"
                  :disabled="tableData.length == 0 ? false : true"
                  v-model="formInline.uploadType"
                  @change="uploadTypeChange"
                  :popper-append-to-body="false"
                  placeholder="请选择"
              >
                <el-option
                           v-for="item in uploadOption2"
                           :key="item.value"
                           :label="item.label"
                           :value="item.value"
                ></el-option>
              </el-select>-->
                    :label="$t('shuJuGuanLi.pselect.dFile')"
                    value="v1"
                />
                <el-option
                    :label="$t('shuJuGuanLi.pselect.dFiles')"
                    value="v2"
                />

              </el-select>

            </el-form-item>
            <!-- 存储目录 -->
@@ -146,13 +141,30 @@
                v-model="formInline.specialtyId"
                :placeholder="$t('common.choose')"
              >
                <el-option
<!--                <el-option
                  v-for="item in specialtyOption"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                >
                </el-option>
                  :value="item.value">
                </el-option>-->

                <el-option
                    :label="$t('shuJuGuanLi.pselect.SurveyDiscipline')"
                    value="测量专业"
                />
                <el-option
                    :label="$t('shuJuGuanLi.pselect.SurveysDiscipline')"
                    value="勘察专业"
                />
                <el-option
                    :label="$t('shuJuGuanLi.pselect.GeologicalDisasterSpecialty')"
                    value="地灾专业"
                />
                <el-option
                    :label="$t('shuJuGuanLi.pselect.CavernSpecialty')"
                    value="洞库专业"
                />

              </el-select>
            </el-form-item>
            <!-- 坐标系 -->
@@ -1291,7 +1303,6 @@
        demTolerance: "5",
        demChangeRate: "200",
        lazDensity: "1",
        imgResolution: "0.2",
      },
      quayTestShow: {
        checkOsgb: false,
@@ -1334,20 +1345,9 @@
          label: "项目整体上传",
        },
      ],
      uploadOption2: [
        {
          value: "v1",
          label: "Single file upload",
        },
        {
          value: "v2",
          label: "Overall project upload",
        },
      ],
      formInline: {
        uploadType: "v1",
        dirid: null,
        verid: null,
        specialtyId: "测量专业",
        specialtyData: "请选择数据",
        metaData: "请选择元数据",
@@ -1401,8 +1401,8 @@
      dbTableData: [],
      dialogVisible: false,
      listLoader: {
        id: null,
        pageSize: 1,
        dirid: null,
        pageIndex: 1,
        pageSize: 10,
      },
      count1: 0,
@@ -2794,11 +2794,11 @@
}
.inquire {
  padding: 8px;
  margin-top: 20px;
  //margin-top: 20px;

  border-radius: 5px;

  margin-bottom: 20px;
  //margin-bottom: 20px;
  .el-form-item {
    margin: 5px;
  }

 src/views/datamanage/projectManage.vue

@@ -8,7 +8,7 @@
    ></My-bread>
    <el-divider />
    <div class="verSionContent">
      <div class="verSion_leftTree subpage_Div">
      <div class="verSion_leftTree subpage_Div" style="border: 1px solid #dcdfe6;">
        <el-tree
          ref="tree"
          :props="defaultProps"
@@ -36,6 +36,7 @@
          </el-form-item>
        </el-form>
        <!-- <el-divider class="eldivider" /> -->
        <div class="dividing-line"></div>
        <div class="table_box" style="height: calc(100% - 89px)">
          <el-table
            ref="filterTable"
@@ -462,6 +463,7 @@
  width: 98%;
  padding: 1%;
  .verSionContent {
    padding-top: 10px;
    width: 100%;
    height: calc(100% - 75px);
    display: flex;
@@ -486,11 +488,11 @@
  }
}
.demo-form-inline {
  padding: 8px;
  //padding: 8px;
  // margin-top: 10px;
  border-radius: 5px;
  border: 1px solid #dcdfe6;
  margin-bottom: 20px;
  //border: 1px solid #dcdfe6;
  //margin-bottom: 20px;
  text-align: right;
  .el-form-item {
    margin: 5px;

 src/views/datamanage/versionManage.vue

@@ -197,7 +197,7 @@
          <el-select
            :popper-append-to-body="false"
            v-model="upform.dirid"
            :placeholder="$t('shuJuGuanLi.pselect')"
            :placeholder="$t('shuJuGuanLi.pselect.select')"
             style="width:85%"
          >
            <el-option