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

src/views/dike/engineeringCondition/dikeBaseInfo/options/bainBenefitIndex.vue

@@ -14,7 +14,7 @@
 
       <el-descriptions-item>
         <template slot="label"> 堤防名称 </template>
-        {{ this.form.dikeName }}
+        {{ this.formData.dikeName }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 记录更新时间 </template>
@@ -107,7 +107,7 @@ import {
 
 export default {
   name: "Gcxy",
-  props: ["dikeCode"],
+  props: ["dikeCode","formData"],
   data() {
     return {
       // 遮罩层

src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue

@@ -81,7 +81,7 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <bainBenefitIndex :dikeCode="this.formData.dikeCode" />
+        <bainBenefitIndex :dikeCode="this.formData.dikeCode" :formData="this.formData"/>
       </el-tab-pane>
       <!-- <el-tab-pane
         label="风险隐患调查信息"

src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemMan.vue

@@ -8,7 +8,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['manateam:manateam:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -18,7 +17,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['manateam:manateam:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -28,7 +26,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['manateam:manateam:remove']"
         >删除</el-button>
       </el-col>
       <!--      <el-col :span="1.5">-->
@@ -48,13 +45,13 @@
       <el-table-column label="序号" type="index" width="50" align="center" fixed/>
 
       <el-table-column label="堤防名称" align="center" prop="dikeName" min-width="120"/>
-      <el-table-column label="人员类型" align="center" prop="personType" :formatter="personTypeFormat" min-width="120"/>
       <el-table-column label="堤防代码" align="center" prop="dikeCode" min-width="120"/>
       <el-table-column label="账户或或手机号" align="center" prop="phone" min-width="120"/>
+      <el-table-column label="部门" align="center" prop="department" min-width="120"/>
       <el-table-column label="人员名称" align="center" prop="personName" min-width="120"/>
+      <el-table-column label="人员类型" align="center" prop="personType" :formatter="personTypeFormat" min-width="120"/>
       <el-table-column label="身份证号" align="center" prop="idNo" min-width="120"/>
       <el-table-column label="职务" align="center" prop="post" min-width="120"/>
-      <el-table-column label="部门" align="center" prop="department" min-width="120"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -62,14 +59,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['manateam:manateam:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['manateam:manateam:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -86,7 +81,18 @@
     <!-- 添加或修改管理团队管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-
+        <el-form-item label="堤防代码" prop="dikeCode">
+          <el-input v-model="form.dikeCode" placeholder="请输入堤防代码" disabled/>
+        </el-form-item>
+        <el-form-item label="账户或或手机号" prop="phone">
+          <line-user :form="form" v-if="open" />
+        </el-form-item>
+        <el-form-item label="部门" prop="department">
+          <el-input v-model="form.department" placeholder="请输入部门" />
+        </el-form-item>
+        <el-form-item label="人员名称" prop="personName">
+          <el-input v-model="form.personName" placeholder="请输入人员名称" />
+        </el-form-item>
         <el-form-item label="人员类型" prop="personType">
           <el-select v-model="form.personType" placeholder="请选择人员类型" style="width:100%">
             <el-option
@@ -97,24 +103,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="堤防代码" prop="dikeCode">
-          <el-input v-model="form.dikeCode" placeholder="请输入堤防代码" disabled/>
-        </el-form-item>
-        <el-form-item label="账户或或手机号" prop="phone">
-          <line-user :form="form" v-if="open" />
-        </el-form-item>
-        <el-form-item label="人员名称" prop="personName">
-          <el-input v-model="form.personName" placeholder="请输入人员名称" />
-        </el-form-item>
         <el-form-item label="身份证号" prop="idNo">
           <el-input v-model="form.idNo" placeholder="请输入身份证号" />
         </el-form-item>
         <el-form-item label="职务" prop="post">
           <el-input v-model="form.post" placeholder="请输入职务" />
         </el-form-item>
-        <el-form-item label="部门" prop="department">
-          <el-input v-model="form.department" placeholder="请输入部门" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/dike/managementGuarantee/gzzdgl/dsj/index.vue

@@ -46,15 +46,7 @@
           v-hasPermi="['df:dsj:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['df:dsj:export']"
-        >导出</el-button>
-      </el-col>
+
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/dike/managementGuarantee/gzzdgl/gltz/index.vue

@@ -46,15 +46,7 @@
           v-hasPermi="['df:gltz:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['df:gltz:export']"
-        >导出</el-button>
-      </el-col>
+
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/dike/managementGuarantee/gzzdgl/gzsc/index.vue

@@ -46,15 +46,7 @@
           v-hasPermi="['df:gzsc:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['df:gzsc:export']"
-        >导出</el-button>
-      </el-col>
+
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/dike/managementGuarantee/knwoledge/index.vue

@@ -23,7 +23,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['df:knowledge:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -33,7 +32,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['df:knowledge:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -43,18 +41,9 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['df:knowledge:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['df:knowledge:export']"
-        >导出</el-button>
-      </el-col>
+
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -87,14 +76,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['df:knowledge:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['df:knowledge:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/dike/managementTeamManagement/index.vue

@@ -82,13 +82,13 @@
       <el-table-column label="序号" type="index" width="50" align="center" fixed/>
 
       <el-table-column label="堤防名称" align="center" prop="dikeName" min-width="120"/>
-      <el-table-column label="人员类型" align="center" prop="personType" :formatter="personTypeFormat" min-width="120"/>
       <el-table-column label="堤防代码" align="center" prop="dikeCode" min-width="120"/>
       <el-table-column label="账户或或手机号" align="center" prop="phone" min-width="120"/>
+      <el-table-column label="部门" align="center" prop="department" min-width="120"/>
       <el-table-column label="人员名称" align="center" prop="personName" min-width="120"/>
+      <el-table-column label="人员类型" align="center" prop="personType" :formatter="personTypeFormat" min-width="120"/>
       <el-table-column label="身份证号" align="center" prop="idNo" min-width="120"/>
       <el-table-column label="职务" align="center" prop="post" min-width="120"/>
-      <el-table-column label="部门" align="center" prop="department" min-width="120"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -123,6 +123,19 @@
           <el-form-item label="堤防名称" prop="dikeName">
             <linkDike :form="form" v-if="open" />
           </el-form-item>
+
+        <el-form-item label="堤防代码" prop="dikeCode">
+          <el-input v-model="form.dikeCode" placeholder="请输入堤防代码" disabled/>
+        </el-form-item>
+        <el-form-item label="账户或或手机号" prop="phone">
+          <line-user :form="form" v-if="open" />
+        </el-form-item>
+        <el-form-item label="部门" prop="department">
+          <el-input v-model="form.department" placeholder="请输入部门" />
+        </el-form-item>
+        <el-form-item label="人员名称" prop="personName">
+          <el-input v-model="form.personName" placeholder="请输入人员名称" />
+        </el-form-item>
         <el-form-item label="人员类型" prop="personType">
           <el-select v-model="form.personType" placeholder="请选择人员类型" style="width:100%">
             <el-option
@@ -133,24 +146,13 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="堤防代码" prop="dikeCode">
-          <el-input v-model="form.dikeCode" placeholder="请输入堤防代码" disabled/>
-        </el-form-item>
-        <el-form-item label="账户或或手机号" prop="phone">
-          <line-user :form="form" v-if="open" />
-        </el-form-item>
-        <el-form-item label="人员名称" prop="personName">
-          <el-input v-model="form.personName" placeholder="请输入人员名称" />
-        </el-form-item>
         <el-form-item label="身份证号" prop="idNo">
           <el-input v-model="form.idNo" placeholder="请输入身份证号" />
         </el-form-item>
         <el-form-item label="职务" prop="post">
           <el-input v-model="form.post" placeholder="请输入职务" />
         </el-form-item>
-        <el-form-item label="部门" prop="department">
-          <el-input v-model="form.department" placeholder="请输入部门" />
-        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/mobilePage/index.vue

@@ -29,8 +29,8 @@ export default {
     // 获取当前请求地址
     const currentUrl =
       topTab === "sluice"
-        ? window.location.origin + "/mobileH5/SZengineeringInspectionList"
-        : window.location.origin + "/mobileH5/engineeringInspectionList";
+        ? window.location.origin + "/sgcyy-slgcyxgl/mobileH5/SZengineeringInspectionList"
+        : window.location.origin + "/sgcyy-slgcyxgl/mobileH5/engineeringInspectionList";
     this.h5Src = `${isProDuction ? currentUrl : devSrc}?t=${getToken()}`;
   },
 };

src/views/sluice/managementGuarantee/gzzdgl/dsj/index.vue

@@ -46,15 +46,7 @@
           v-hasPermi="['sz:dsj:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['sz:dsj:export']"
-        >导出</el-button>
-      </el-col>
+
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/sluice/managementGuarantee/gzzdgl/gltz/index.vue

@@ -46,15 +46,7 @@
           v-hasPermi="['sz:gltz:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['sz:gltz:export']"
-        >导出</el-button>
-      </el-col>
+
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/sluice/managementGuarantee/gzzdgl/gzsc/index.vue

@@ -46,15 +46,7 @@
           v-hasPermi="['sz:gzsc:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['sz:gzsc:export']"
-        >导出</el-button>
-      </el-col>
+
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>