Merge remote-tracking branch 'origin/master'

1 month ago · f3a772416a
12 changed files with 24 additions and 24 deletions
--- a/src/views/dike/managementGuarantee/archivesManagement/index.vue
+++ b/src/views/dike/managementGuarantee/archivesManagement/index.vue
@ -17,10 +17,10 @@
      v-show="showSearch"
      label-width="68px"
    >
-      <el-form-item label="堤防编码" prop="dikeCode">
+      <el-form-item label="堤防名称" prop="dikeCode">
        <el-input
          v-model="queryParams.data.dikeCode"
-          placeholder="请输入堤防编码"
+          placeholder="请输入堤防名称"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
--- a/src/views/dike/managementGuarantee/fundGuarantee/index.vue
+++ b/src/views/dike/managementGuarantee/fundGuarantee/index.vue
@ -16,7 +16,7 @@
      :inline="true"
      v-show="showSearch"
    >
-      <el-form-item label="堤防名称1" prop="dikeName">
+      <el-form-item label="堤防名称" prop="dikeName">
        <el-input
          v-model="queryParams.data.dikeName"
          placeholder="请输入堤防名称"
--- a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
@ -110,7 +110,7 @@
        :formatter="dikeTypeFormat"
        min-width="120"
      />
-      <el-table-column
+<!--      <el-table-column
        label="工程规模"
        align="center"
        prop="engScal"
@ -122,7 +122,7 @@
        align="center"
        prop="unit"
        min-width="120"
-      />
+      />-->
      <el-table-column
        label="所在行政区划"
        align="center"
--- a/src/views/dike/safetyManage/declarationManage/examine/components/listPage/index.vue
+++ b/src/views/dike/safetyManage/declarationManage/examine/components/listPage/index.vue
@ -133,13 +133,13 @@
        :formatter="formatAdcd"
        min-width="120"
      />
-      <el-table-column
+<!--      <el-table-column
        label="工程规模"
        align="center"
        prop="engScal"
        :formatter="projectScaleFormat"
        min-width="120"
-      />
+      />-->
      <el-table-column
        label="堤防类型"
        align="center"
--- a/src/views/dike/safetyManage/floodControlManagement/power.vue
+++ b/src/views/dike/safetyManage/floodControlManagement/power.vue
@ -16,7 +16,7 @@
      v-show="showSearch"
      label-width="68px"
    >
-      <el-form-item label="关联堤防" prop="dikeName">
+      <el-form-item label="堤防名称" prop="dikeName">
        <el-input
          v-model="queryParams.cv.value"
          placeholder="请输入堤防名称"
--- a/src/views/dike/safetyManage/floodControlManagement/preplan.vue
+++ b/src/views/dike/safetyManage/floodControlManagement/preplan.vue
@ -16,7 +16,7 @@
      v-show="showSearch"
      label-width="68px"
    >
-      <el-form-item label="关联堤防" prop="dikeName">
+      <el-form-item label="堤防名称" prop="dikeName">
        <el-input
          v-model="queryParams.cv.value"
          placeholder="请输入堤防名称"
--- a/src/views/dike/safetyManage/floodControlManagement/supplies.vue
+++ b/src/views/dike/safetyManage/floodControlManagement/supplies.vue
@ -16,7 +16,7 @@
      v-show="showSearch"
      label-width="68px"
    >
-      <el-form-item label="关联堤防" prop="dikeName">
+      <el-form-item label="堤防名称" prop="dikeName">
        <el-input
          v-model="queryParams.cv.value"
          placeholder="请输入堤防名称"
--- a/src/views/res/managementGuarantee/fundGuarantee/index.vue
+++ b/src/views/res/managementGuarantee/fundGuarantee/index.vue
@ -34,7 +34,7 @@
        </el-input>
      </el-form-item>
-      <el-form-item label="水库主管部门" prop="unit">
+<!--      <el-form-item label="水库主管部门" prop="unit">
        <el-input
          v-model="queryParams.data.unit"
          placeholder="请输入水库主管部门"
@ -50,7 +50,7 @@
            @click="handleQuery"
          ></el-button>
        </el-input>
-      </el-form-item>
+      </el-form-item>-->
      <!--
      <el-form-item label="单位名称" prop="unitName">
        <el-input
@ -193,12 +193,12 @@
        :formatter="projectScaleFormat"
        min-width="120"
      /> -->
-      <el-table-column
+<!--      <el-table-column
        label="水库主管部门"
        align="center"
        prop="unit"
        min-width="120"
-      />
+      />-->
      <el-table-column
        label="操作"
--- a/src/views/res/safetyManage/confirmDelimitationManage/index.vue
+++ b/src/views/res/safetyManage/confirmDelimitationManage/index.vue
@ -18,10 +18,10 @@
        v-show="showSearch"
        label-width="68px"
      >
-        <el-form-item label="堤防名称" prop="resName">
+        <el-form-item label="水库名称" prop="resName">
          <el-input
            v-model="queryParams.data.resName"
-            placeholder="请输入堤防名称"
+            placeholder="请输入水库名称"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
@ -36,10 +36,10 @@
          </el-input>
        </el-form-item>
-        <el-form-item label="堤防类型" prop="resType">
+        <el-form-item label="水库类型" prop="resType">
          <el-select
            v-model="queryParams.data.resType"
-            placeholder="请选择堤防类型"
+            placeholder="请选择水库类型"
            clearable
            size="small"
            @change="handleQuery"
--- a/src/views/sluice/managementGuarantee/fundGuarantee/index.vue
+++ b/src/views/sluice/managementGuarantee/fundGuarantee/index.vue
@ -172,12 +172,12 @@
        :formatter="projectScaleFormat"
        min-width="120"
      />
-      <el-table-column
+<!--      <el-table-column
        label="水闸主管部门"
        align="center"
        prop="unit"
        min-width="120"
-      />
+      />-->
      <el-table-column
        label="所在行政区划"
        align="center"
--- a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
@ -117,12 +117,12 @@
        :formatter="projectScaleFormat"
        min-width="120"
      />
-      <el-table-column
+<!--      <el-table-column
        label="水闸主管部门"
        align="center"
        prop="unit"
        min-width="120"
-      />
+      />-->
      <el-table-column
        label="所在行政区划"
        align="center"
--- a/vue.config.js
+++ b/vue.config.js
@ -80,8 +80,8 @@ module.exports = {
        changeOrigin: true,
      },
      [process.env.VUE_APP_BASE_API]: {
-        target: "http://shuili.product.dev.com:30115/",
+        // target: "http://shuili.product.dev.com:30115/",
-        // target: "http://172.16.34.80:18082/",
+        target: "http://192.168.2.107:18082/",
        // target: 'http://172.16.32.62:18888/',
        // target: "http://172.16.34.27:18082",
        changeOrigin: true,