Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0

src/views/dike/runManage/patrolMaintenance/patrolItemsManage/details.vue

@@ -24,14 +24,14 @@
               :remote-method="handleGetRemoteDikeMethod"
               @focus="handleGetRemoteDikeMethod('')"
               @change="handleChangeDike"
-              v-model="formData.dikeCode"
+              v-model="formData.dikeName"
               placeholder="请选择堤防"
             >
               <el-option
                 v-for="item in dikeList"
-                :key="item.id"
+                :key="item.dikeCode"
                 :label="item.dikeName"
-                :value="item.dikeCode"
+                :value="item.dikeName"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -255,10 +255,10 @@ export default {
     },
     handleChangeDike() {
       let res = this.dikeList.find(
-        (v) => v.dikeCode === this.formData.dikeCode
+        (v) => v.dikeName === this.formData.dikeName
       );
       this.formData.dikeType = res.dikeType;
-      this.formData.dikeName = res.dikeName;
+      this.formData.dikeCode = res.dikeCode;
     },
     // 获取详情信息
     async getDetailsData() {

src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue

@@ -179,10 +179,16 @@ export default {
         </div>
       </div>
       <el-table :height="tableHeight" :data="tableData" border>
-        <el-table-column type="index" align="center" label="序号" width="100">
+        <!-- <el-table-column type="index" align="center" label="序号" width="100">
+        </el-table-column> -->
+        <el-table-column prop="id" align="center" label="单号" width="100">
         </el-table-column>
         <el-table-column prop="name" align="center" label="巡查名称">
         </el-table-column>
+        <el-table-column prop="dikeName" align="center" label="工程名称">
+        </el-table-column>
+        <el-table-column prop="dikeCode" align="center" label="工程代码">
+        </el-table-column>
         <el-table-column align="center" label="巡查类型">
           <template slot-scope="scope">
             <span v-if="xcTypeOptions.length > 0 && scope.row.type !== null">{{

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://172.16.34.80:18082/",
+        target: "http://shuili.product.dev.com:30115/",
+        // target: "http://172.16.34.80:18082/",
         // target: 'http://172.16.32.62:18888/',
         // target: "http://172.16.34.27:18082",
         changeOrigin: true,