修改

zhsq_qk-system/src/main/resources/mapper/system/QkEmergencyRescueTeamMapper.xml

@@ -24,8 +24,27 @@
     </resultMap>
 
     <sql id="selectQkEmergencyRescueTeamVo">
-        select id, name, user_name, dept, post, company, emergency_rescue, city, area, township, village, phone, effect, longitude, latitude
-        from qk_emergency_rescue_team
+        SELECT
+            t.id,
+            t.NAME,
+            t.user_name,
+            t.dept,
+            t.post,
+            t.company,
+            t.emergency_rescue,
+            t.city,
+            t.area,
+            t.township,
+            t.village,
+            t.phone,
+            t.effect,
+            t.longitude,
+            t.latitude,
+            d.dept_id,
+            d.dept_name
+        FROM
+            qk_emergency_rescue_team t
+                LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
     </sql>
 
     <select id="selectQkEmergencyRescueTeamList" parameterType="QkEmergencyRescueTeam" resultMap="QkEmergencyRescueTeamResult">
@@ -43,21 +62,6 @@
                         <if test="post != null  and post != ''">
                             and post = #{post}
                         </if>
-                        <if test="company != null  and company != ''">
-                            and company = #{company}
-                        </if>
-                        <if test="emergencyRescue != null  and emergencyRescue != ''">
-                            and emergency_rescue = #{emergencyRescue}
-                        </if>
-                        <if test="city != null  and city != ''">
-                            and city = #{city}
-                        </if>
-                        <if test="area != null  and area != ''">
-                            and area = #{area}
-                        </if>
-                        <if test="township != null  and township != ''">
-                            and township = #{township}
-                        </if>
                         <if test="village != null  and village != ''">
                             and village = #{village}
                         </if>
@@ -99,14 +103,6 @@
                     </if>
                     <if test="emergencyRescue != null">emergency_rescue,
                     </if>
-                    <if test="city != null">city,
-                    </if>
-                    <if test="area != null">area,
-                    </if>
-                    <if test="township != null">township,
-                    </if>
-                    <if test="village != null">village,
-                    </if>
                     <if test="phone != null">phone,
                     </if>
                     <if test="effect != null">effect,
@@ -131,14 +127,6 @@
                     </if>
                     <if test="emergencyRescue != null">#{emergencyRescue},
                     </if>
-                    <if test="city != null">#{city},
-                    </if>
-                    <if test="area != null">#{area},
-                    </if>
-                    <if test="township != null">#{township},
-                    </if>
-                    <if test="village != null">#{village},
-                    </if>
                     <if test="phone != null">#{phone},
                     </if>
                     <if test="effect != null">#{effect},
@@ -171,18 +159,6 @@
                     <if test="emergencyRescue != null">emergency_rescue =
                         #{emergencyRescue},
                     </if>
-                    <if test="city != null">city =
-                        #{city},
-                    </if>
-                    <if test="area != null">area =
-                        #{area},
-                    </if>
-                    <if test="township != null">township =
-                        #{township},
-                    </if>
-                    <if test="village != null">village =
-                        #{village},
-                    </if>
                     <if test="phone != null">phone =
                         #{phone},
                     </if>

zhsq_qk-system/src/main/resources/mapper/system/QkRescueSuppliesMapper.xml

@@ -16,7 +16,7 @@
     </resultMap>
 
     <sql id="selectQkRescueSuppliesVo">
-        select id, varieties, cost, remarks, longitude, latitude
+        select id, varieties, cost, remarks, longitude, latitude,dept
         from qk_rescue_supplies
     </sql>
 

zhsq_qk-ui/src/views/system/shelter/index.vue

@@ -81,11 +81,11 @@
       <el-table-column label="地址" align="center" prop="address"/>
       <el-table-column label="避难场所范围" align="center" prop="range"/>
       <el-table-column label="避难场所现状描述" align="center" prop="state"/>
-      <el-table-column label="占地面积" align="center" prop="area"/>
-      <el-table-column label="可转移安置人数" align="center" prop="transferPerson"/>
-      <el-table-column label="建设内容" align="center" prop="constructionContent"/>
+      <el-table-column label="占地面积(m²)" align="center" prop="area"/>
+      <el-table-column label="可转移安置人数(万人)" align="center" prop="transferPerson"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
+      <el-table-column label="建设内容" align="center" prop="constructionContent"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -117,8 +117,8 @@
     />
 
     <!-- 添加或修改应急避难所对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="避难场所名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入避难场所名称"/>
         </el-form-item>
@@ -131,21 +131,21 @@
         <el-form-item label="避难场所现状描述" prop="state">
           <el-input v-model="form.state" placeholder="请输入避难场所现状描述"/>
         </el-form-item>
-        <el-form-item label="占地面积" prop="area">
+        <el-form-item label="占地面积(m²)" prop="area">
           <el-input v-model="form.area" placeholder="请输入占地面积"/>
         </el-form-item>
-        <el-form-item label="可转移安置人数" prop="transferPerson">
+        <el-form-item label="可转移安置人数(万人)" prop="transferPerson">
           <el-input v-model="form.transferPerson" placeholder="请输入可转移安置人数"/>
         </el-form-item>
-        <el-form-item label="建设内容" prop="constructionContent">
-          <el-input v-model="form.constructionContent" type="textarea" placeholder="请输入内容"/>
-        </el-form-item>
         <el-form-item label="经度" prop="longitude">
           <el-input v-model="form.longitude" placeholder="请输入经度"/>
         </el-form-item>
         <el-form-item label="纬度" prop="latitude">
           <el-input v-model="form.latitude" placeholder="请输入纬度"/>
         </el-form-item>
+        <el-form-item label="建设内容" prop="constructionContent">
+          <el-input v-model="form.constructionContent" type="textarea" placeholder="请输入内容"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

zhsq_qk-ui/src/views/system/supplies/index.vue

@@ -135,9 +135,6 @@
         <el-form-item label="价值" prop="cost">
           <el-input v-model="form.cost" placeholder="请输入价值"/>
         </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容"/>
-        </el-form-item>
         <el-form-item label="经度" prop="longitude">
           <el-input v-model="form.longitude" placeholder="请输入经度"/>
         </el-form-item>
@@ -147,6 +144,9 @@
         <el-form-item label="所属部门" prop="dept">
           <el-input v-model="form.dept" placeholder="请输入街道"/>
         </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" type="textarea" :rows="4" placeholder="请输入内容"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

zhsq_qk-ui/src/views/system/team/index.vue

@@ -80,11 +80,7 @@
       <el-table-column label="账号" align="center" prop="userName"/>
       <el-table-column label="组织归属" align="center" prop="dept"/>
       <el-table-column label="职务" align="center" prop="post"/>
-      <el-table-column label="单位" align="center" prop="company"/>
-      <el-table-column label="救援队" align="center" prop="emergencyRescue"/>
-      <el-table-column label="村" align="center" prop="village"/>
       <el-table-column label="手机号" align="center" prop="phone"/>
-      <el-table-column label="防汛抗旱" align="center" prop="effect"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -126,8 +122,8 @@
         <el-form-item label="账号" prop="userName">
           <el-input v-model="form.userName" placeholder="请输入账号"/>
         </el-form-item>
-        <el-form-item label="组织归属" prop="dept">
-          <el-input v-model="form.dept" placeholder="请输入组织归属"/>
+        <el-form-item label="归属部门" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
         </el-form-item>
         <el-form-item label="职务" prop="post">
           <el-input v-model="form.post" placeholder="请输入职务"/>
@@ -138,18 +134,6 @@
         <el-form-item label="救援队" prop="emergencyRescue">
           <el-input v-model="form.emergencyRescue" placeholder="请输入救援队"/>
         </el-form-item>
-        <el-form-item label="市" prop="city">
-          <el-input v-model="form.city" placeholder="请输入市"/>
-        </el-form-item>
-        <el-form-item label="区县" prop="area">
-          <el-input v-model="form.area" placeholder="请输入区县"/>
-        </el-form-item>
-        <el-form-item label="乡镇" prop="township">
-          <el-input v-model="form.township" placeholder="请输入乡镇"/>
-        </el-form-item>
-        <el-form-item label="村" prop="village">
-          <el-input v-model="form.village" placeholder="请输入村"/>
-        </el-form-item>
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入手机号"/>
         </el-form-item>
@@ -174,9 +158,13 @@
 <script>
 
 import {addTeam, delTeam, updateTeam,getTeam, listTeam} from "@/api/system/team";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {deptTreeSelect} from "@/api/system/user";
 
 export default {
   name: "Team",
+  components: {Treeselect},
   data() {
     return {
       // 遮罩层
@@ -189,6 +177,10 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 部门树选项
+      deptOptions: undefined,
+      // 部门名称
+      deptName: undefined,
       // 总条数
       total: 0,
       // 抢险救援队表格数据
@@ -224,6 +216,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
     /** 查询抢险救援队列表 */
@@ -235,6 +228,13 @@ export default {
         this.loading = false;
       });
     },
+
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;