bug修改

2 months ago · 010e46d040
35 changed files with 88 additions and 60 deletions
--- a/src/components/myUpload/index.vue
+++ b/src/components/myUpload/index.vue
@ -35,7 +35,7 @@ export default {
  },
  data() {
    return {
-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      headers: {
        shuili: "water " + getToken(),
      },
--- a/src/router/index.js
+++ b/src/router/index.js
@ -40,7 +40,7 @@ export const constantRoutes = [
  },
  {
    path: '/login',
-    component: (resolve) => require(['@/views/loginbg'], resolve),
+    component: (resolve) => require(['@/views/login'], resolve),
    hidden: true
  },
  {
@ -163,11 +163,11 @@ router.beforeEach((to, from, next) => {
    if (to.query.token) {
      setToken(to.query.token);
      if (to.query.page === 'null') {
-        next("/welcome")
+        next("/dike/engineeringCondition/dikeBaseInfo")
      } else if (to.query.page) {
        next(to.query.page)
      } else {
-        next("/welcome")
+        next("/dike/engineeringCondition/dikeBaseInfo")
      }
    }
  } else {
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/index.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/index.vue
@ -50,6 +50,23 @@
          />
        </el-select>
      </el-form-item>
+      <el-form-item label="堤防级别" prop="dikeGrad">
+        <el-select
+          v-model="queryParams.data.dikeGrad"
+          placeholder="请选择堤防级别"
+          clearable
+          size="small"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="dict in engGradOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+
      <el-form-item label="行政区划" prop="adcd">
        <el-cascader
          v-model="queryParams.data.adcd"
@ -128,7 +145,7 @@
      <el-table-column
        label="堤防级别"
        align="center"
-        prop="engGrad"
+        prop="dikeGrad"
        :formatter="engGradFormat"
        min-width="120"
      />
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/bainBenefitIndex.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/bainBenefitIndex.vue
@ -14,14 +14,14 @@

      <el-descriptions-item>
        <template slot="label"> 堤防代码 </template>
-        {{ this.form.dikeCode }}
+        {{ dikeCode }}
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 记录更新时间 </template>
        {{ this.form.updatedate }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 保护总人口数 </template>
+        <template slot="label"> 保护总人口数（人） </template>
        {{ this.form.dikePrpp }}
      </el-descriptions-item>
      <el-descriptions-item>
@ -37,7 +37,7 @@
        {{ this.form.dikePrtwam }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 保护耕地面积 </template>
+        <template slot="label"> 保护耕地面积（万亩） </template>
        {{ this.form.dikePrflar }}
      </el-descriptions-item>

--- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue
@ -154,20 +154,20 @@
      <!--        {{ this.form.dikeRvbk }}-->
      <!--      </el-descriptions-item>-->
      <el-descriptions-item>
-        <template slot="label"> 规划防洪潮标准 </template>
+        <template slot="label"> 规划防洪潮标准（年一遇） </template>
        {{ this.form.dikePlnStda }}
      </el-descriptions-item>

      <el-descriptions-item>
-        <template slot="label"> 现状防洪潮标准 </template>
+        <template slot="label"> 现状防洪潮标准（年一遇） </template>
        {{ this.form.dikeCrtStda }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 达标长度 </template>
+        <template slot="label"> 达标长度（km） </template>
        {{ this.form.dikeStdaLen }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 不达标长度 </template>
+        <template slot="label"> 不达标长度（km） </template>
        {{ this.form.dikeNotStdaLen }}
      </el-descriptions-item>
      <!--      <el-descriptions-item>-->
@ -179,19 +179,19 @@
        {{ elevSysFormat(this.form) }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 起点堤顶高程 </template>
+        <template slot="label"> 起点堤顶高程（m） </template>
        {{ this.form.startDikeTopEl }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 终点堤顶高程 </template>
+        <template slot="label"> 终点堤顶高程（m） </template>
        {{ this.form.endDikeTopEl }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 防浪墙顶最低高程 </template>
+        <template slot="label"> 防浪墙顶最低高程（m） </template>
        {{ this.form.dikeWawaMinElev }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 防浪墙顶最高高程 </template>
+        <template slot="label"> 防浪墙顶最高高程（m） </template>
        {{ this.form.dikeWawaMaxElev }}
      </el-descriptions-item>
      <!--      <el-descriptions-item>-->
@ -203,11 +203,11 @@
      <!--        {{ this.form.dikeWawaMaxLoc }}-->
      <!--      </el-descriptions-item>-->
      <el-descriptions-item>
-        <template slot="label"> 堤顶最低高程 </template>
+        <template slot="label"> 堤顶最低高程（m） </template>
        {{ this.form.dikeElevMin }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 堤顶最高高程 </template>
+        <template slot="label"> 堤顶最高高程（m） </template>
        {{ this.form.dikeElevMax }}
      </el-descriptions-item>
      <!--      <el-descriptions-item>-->
@ -540,9 +540,6 @@ export default {
    },
    // 高程系统字典翻译
    elevSysFormat(row, column) {
-      if (row.elevSys.length < 2) {
-        row.elevSys = "0" + row.elevSys
-      }
      return this.selectDictLabel(this.elevSysOptions, row.elevSys);
    },
    // 取消按钮
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue
@ -13,7 +13,7 @@
    >
      <el-descriptions-item>
        <template slot="label"> 堤防代码 </template>
-        {{ this.form.dikeCode }}
+        {{ dikeCode }}
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 记录更新时间 </template>
--- a/src/views/dike/managementGuarantee/standardizationConstruction/index.vue
+++ b/src/views/dike/managementGuarantee/standardizationConstruction/index.vue
@ -10,7 +10,7 @@
        {{ item.routeName }}
      </el-breadcrumb-item>
    </el-breadcrumb>
-    <dataCharts ref="dataCharts" />
+<!--    <dataCharts ref="dataCharts" />-->
    <listPage :chartEleGetData="chartEleGetData" />
  </div>
 </template>
--- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/transform.vue
+++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/transform.vue
@ -360,7 +360,7 @@ export default {
      // 安全类别是否通过字典
      securityCategoryIsPassOptions: [],

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      // 查询参数
      queryParams: {
        pageNum: 1,
--- a/src/views/dike/safetyManage/floodControlManagement/preplan.vue
+++ b/src/views/dike/safetyManage/floodControlManagement/preplan.vue
@ -335,7 +335,7 @@ export default {
        },
      ],

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      // 遮罩层
      loading: true,
      // 选中数组
--- a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
+++ b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
@ -284,7 +284,7 @@ export default {
      // 安全类别字典
      securityCategoryOptions: [],

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      // 查询参数
      queryParams: {
        pageNum: 1,
--- a/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
+++ b/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
@ -166,7 +166,7 @@ export default {
      // 启闭机型式字典
      hoistTypeOptions: [],

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      // 查询参数
      queryParams: {
        pageNum: 1,
--- a/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/options/projectManagement.vue
+++ b/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/options/projectManagement.vue
@ -505,7 +505,7 @@ export default {
      // 监控类型字典
      monitoringTypeOptions: [],

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      // 查询参数
      queryParams: {
        pageNum: 1,
--- a/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/options/projectManagement.vue
+++ b/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/options/projectManagement.vue
@ -644,7 +644,7 @@ export default {
      // 保护范围划界字典
      protectionDelimitationOptions: [],

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      // 查询参数
      queryParams: {
        pageNum: 1,
--- a/src/views/engineeringCondition/identificationPlate/dyke/components/markForm.vue
+++ b/src/views/engineeringCondition/identificationPlate/dyke/components/markForm.vue
@ -118,7 +118,7 @@ export default {
    return {
      form: {},
      valid: false,
-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      // 请求头
      headers: {
        shuili: "water " + getToken(),
--- a/src/views/engineeringCondition/identificationPlate/sluice/components/markForm.vue
+++ b/src/views/engineeringCondition/identificationPlate/sluice/components/markForm.vue
@ -120,7 +120,7 @@ export default {
      form: {},
      valid: false,

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      // 请求头
      headers: {
        shuili: "water " + getToken(),
--- a/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue
+++ b/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue
@ -417,7 +417,7 @@ export default {
      // 安全鉴定状态字典
      securityStatusOptions: [],

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 查询参数
      queryParams: {
--- a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
+++ b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
@ -348,7 +348,7 @@ export default {
      // 总条数
      total: 0,

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 水闸换证信息表格数据
      hzxxList: [],
--- a/src/views/safetyManage/floodControlManagement/sluice/preplan.vue
+++ b/src/views/safetyManage/floodControlManagement/sluice/preplan.vue
@ -320,7 +320,7 @@ export default {
      // 非单个禁用
      single: true,

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 非多个禁用
      multiple: true,
--- a/src/views/safetyManage/safeProduction/sluice/index.vue
+++ b/src/views/safetyManage/safeProduction/sluice/index.vue
@ -362,7 +362,7 @@ export default {
      // 显示搜索条件
      showSearch: true,

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 总条数
      total: 0,
--- a/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue
+++ b/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue
@ -268,7 +268,7 @@ export default {
      // 非单个禁用
      single: true,

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 非多个禁用
      multiple: true,
--- a/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection.vue
+++ b/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection.vue
@ -156,7 +156,7 @@ export default {
      // 总条数
      total: 0,

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 水闸安全检测表格数据
      aqjcList: [],
--- a/src/views/singleLogin.vue
+++ b/src/views/singleLogin.vue
@ -10,7 +10,7 @@ export default {
  },
  created() {
    // this.loading = true;
-    this.$router.push("/");
+    this.$router.push("/dike/engineeringCondition/dikeBaseInfo");
    // console.log("token", this.$route);
    // setToken(this.$route.query.token);
  },
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo
@ -630,7 +630,7 @@ export default {
      // 弹出层标题
      title: "",

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 是否显示弹出层
      open: false,
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/index.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/index.vue
@ -50,6 +50,22 @@
          />
        </el-select>
      </el-form-item>
+      <el-form-item label="工程规模" prop="engScal">
+        <el-select
+          v-model="queryParams.data.engScal"
+          placeholder="请选择工程规模"
+          clearable
+          size="small"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="dict in projectScaleOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
      <el-form-item label="行政区划" prop="adcd">
        <el-cascader
          v-model="queryParams.data.adcd"
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/accidentRecord.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/accidentRecord.vue
@ -30,7 +30,7 @@
 <!--      </el-descriptions-item>-->
      <el-descriptions-item>
        <template slot="label"> 水闸代码 </template>
-        {{ this.form.wagaCode }}
+        {{ wagaCode }}
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 记录更新时间 </template>
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/designParameter2.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/designParameter2.vue
@ -13,7 +13,7 @@
    >
      <el-descriptions-item>
        <template slot="label"> 水闸代码 </template>
-        {{ this.form.wagaCode }}
+        {{ wagaCode }}
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 正常蓄水位 </template>
@ -29,7 +29,7 @@
    </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 校核洪水位 </template>
-        {{ this.form.dsrcin }}
+        {{ this.form.chfllv }}
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 历史最大过闸流量 </template>
@ -41,7 +41,7 @@
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 记录更新时间 </template>
-        {{ this.form.updateTime }}
+        {{ this.form.updateDate }}
      </el-descriptions-item>

      <el-descriptions-item>
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/dischargeCapacity2.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/dischargeCapacity2.vue
@ -13,11 +13,11 @@
    >
      <el-descriptions-item>
        <template slot="label"> 水闸代码 </template>
-        {{ this.form.wageCode }}
+        {{ wagaCode }}
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 记录更新时间 </template>
-        {{ this.form.updateTime }}
+        {{ this.form.updateDate }}
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 闸上水位（m） </template>
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue
@ -18,7 +18,7 @@

      <el-descriptions-item>
        <template slot="label"> 水闸代码 </template>
-        {{ this.form.wagaCode }}
+        {{ wagaCode }}
      </el-descriptions-item>
 <!--      <el-descriptions-item>-->
 <!--        <template slot="label"> 闸室结构 </template>-->
@ -34,7 +34,7 @@
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 记录更新时间 </template>
-        {{this.form.updateTime }}
+        {{this.form.updateDate }}
      </el-descriptions-item>
      <el-descriptions-item>
        <template slot="label"> 闸室结构 </template>
@ -50,15 +50,15 @@
        {{ this.form.gthlntwd }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 闸孔数量 </template>
+        <template slot="label"> 闸孔数量（孔） </template>
        {{ this.form.gaorNum }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 副闸闸孔数量 </template>
+        <template slot="label"> 副闸闸孔数量（孔） </template>
        {{ this.form.agaorNum }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 副闸闸孔总净宽 </template>
+        <template slot="label"> 副闸闸孔总净宽（m） </template>
        {{ this.form.agthlntwd }}
      </el-descriptions-item>
      <el-descriptions-item>
@ -75,7 +75,7 @@
        {{ machineFormFormat(this.form) }}
      </el-descriptions-item>
      <el-descriptions-item>
-        <template slot="label"> 启闭机数量 </template>
+        <template slot="label"> 启闭机数量（个） </template>
        {{ this.form.hsgram }}
      </el-descriptions-item>
 <!--      <el-descriptions-item>-->
@ -405,7 +405,7 @@ export default {
      return this.selectDictLabel(this.gcxtOptions, cleanElevSys);
    },
    machineFormFormat(row){
-      return this.selectDictLabel(this.mainOptions,row.hset)
+      return this.selectDictLabel(this.mainOptions,row.hseq)
    },
    gtstFormat(row) {
      return this.selectDictLabel(this.gtstOptions, row.gtst);
--- a/src/views/sluice/managementGuarantee/standardizationConstruction/index.vue
+++ b/src/views/sluice/managementGuarantee/standardizationConstruction/index.vue
@ -10,7 +10,7 @@
        {{ item.routeName }}
      </el-breadcrumb-item>
    </el-breadcrumb>
-    <dataCharts ref="dataCharts" />
+<!--    <dataCharts ref="dataCharts" />-->
    <listPage :chartEleGetData="chartEleGetData" />
  </div>
 </template>
--- a/src/views/sluice/safetyManage/declarationManage/declare/components/listPage/transform.vue
+++ b/src/views/sluice/safetyManage/declarationManage/declare/components/listPage/transform.vue
@ -352,7 +352,7 @@ export default {
      // 弹出层标题
      title: "",

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 是否显示弹出层
      open: false,
--- a/src/views/sluice/safetyManage/floodControlManagement/components/pRTable.vue
+++ b/src/views/sluice/safetyManage/floodControlManagement/components/pRTable.vue
@ -64,7 +64,6 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
-            v-hasPermi="['syxjl:syxjl:edit']"
            >修改</el-button
          >
          <el-button
@ -72,7 +71,6 @@
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
-            v-hasPermi="['syxjl:syxjl:remove']"
            >删除</el-button
          >
        </template>
--- a/src/views/sluice/safetyManage/floodControlManagement/preplan.vue
+++ b/src/views/sluice/safetyManage/floodControlManagement/preplan.vue
@ -369,7 +369,7 @@ export default {
      // 总条数
      total: 0,

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 水闸预案表格数据
      yaxxList: [],
--- a/src/views/sluice/safetyManage/safeProduction/components/list.vue
+++ b/src/views/sluice/safetyManage/safeProduction/components/list.vue
@ -359,7 +359,7 @@ export default {
      // 非单个禁用
      single: true,

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 非多个禁用
      multiple: true,
--- a/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
+++ b/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
@ -278,7 +278,7 @@ export default {
      // 弹出层标题
      title: "",

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 是否显示弹出层
      open: false,
--- a/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
+++ b/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
@ -152,7 +152,7 @@ export default {
      // 非多个禁用
      multiple: true,

-      uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      // 显示搜索条件
      showSearch: true,