场所内外场景图片字段排列修改，场所，牌位，消防设备删除功能完成

src/api/placeFirefighting/placeFirefighting.js

@@ -17,4 +17,10 @@ export default class placeFirefighting {
             `/religioussites/fire/fireEquipment/queryById`, { id: id }
         )
     };
+    //设备删除
+    placeFirefightingDelete(id) {
+        return request.delete(
+            `/religioussites/fire/fireEquipment/delete`, { ids: id }
+        )
+    };
 }

src/api/placePerson/placePerson.js

@@ -39,4 +39,9 @@ export default class placePerson {
             `/user/usertemplate/userType/queryById`, { id: id }
         )
     }
+    userDelete(id) {
+        return request.delete(
+            `/user/usermanagement/userManagement/delete`, { ids: id }
+        )
+    }
 }

src/api/tabletManage/TabletServer.js

@@ -20,4 +20,9 @@ export default class TabletServer {
             `/placememorialtablets/placeMemorialTablets/queryById`, { id: id }
         )
     };
+    tabletDelete(id) {
+        return request.delete(
+            `/placememorialtablets/placeMemorialTablets/delete`, { ids: id }
+        )
+    }
 }

src/views/placeManage/placeFirefighting/placeFirefightingList.vue

@@ -104,6 +104,15 @@
             </div>
           </div>
         </div>
+        <template #right>
+            <van-button
+              square
+              text="删除"
+              type="danger"
+              @click="del(item.id)"
+              class="delete-button"
+            />
+          </template>
       </van-swipe-cell>
     </van-list>
   </div>
@@ -187,6 +196,28 @@ export default {
         query: { id: data },
       });
     };
+    //牌位删除
+    const del = (id) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new placeFirefighting().placeFirefightingDelete(id).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            finished.value = false;
+            list.value = [];
+            onLoad();
+          });
+        }
+      });
+    };
     const onClickSearch = () => {
       if (active.value == "") {
         list.value = [];
@@ -216,6 +247,7 @@ export default {
       typeOfEmployeesName,
       hs_typeOfEmployees,
       gettypeOfEmployees,
+      del,
     };
   },
 };
@@ -248,7 +280,6 @@ html {
   .list-item {
     background-color: #fff;
     padding-left: 10px;
-    margin-bottom: 5px;
     overflow: hidden;
     .item_top {
       width: 100%;
@@ -281,7 +312,6 @@ html {
       overflow: hidden;
       width: 100%;
       font-size: 16px;
-      border-bottom: 1px solid #f5f5f5;
       .item_down_left {
         width: 70%;
         float: left;

src/views/placeManage/placePerson/placePerson.vue

@@ -1,16 +1,20 @@
 <template>
-  <van-nav-bar fixed title="人员档案管理" left-arrow @click-left="onClickLeft" @click-right="onClickright"
-    :style="{ 'background-color': selectColor }">
+  <van-nav-bar
+    fixed
+    title="人员档案管理"
+    left-arrow
+    @click-left="onClickLeft"
+    @click-right="onClickright"
+    :style="{ 'background-color': selectColor }"
+  >
     <template #right>
       <van-icon name="plus" size="18" />
     </template>
   </van-nav-bar>
   <div class="main">
     <van-tabs v-model:active="active">
-      <van-tab title="姓名查询" name="name">
-      </van-tab>
-      <van-tab title="身份证查询" name="cardId">
-      </van-tab>
+      <van-tab title="姓名查询" name="name"> </van-tab>
+      <van-tab title="身份证查询" name="cardId"> </van-tab>
     </van-tabs>
     <van-search v-model="value1" show-action placeholder="请输入关键词">
       <template #action>
@@ -19,7 +23,12 @@
     </van-search>
     <div class="PersonList">
       <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+        <van-list
+          v-model:loading="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <van-swipe-cell v-for="item in dataList" :key="item">
             <div class="PersonItem" @click="goPlacePersonInfo(item.id)">
               <van-row>
@@ -27,15 +36,26 @@
                   <p>
                     {{ item.name }}（<span style="color: #36a7f3">{{
                       item.idcard
-                    }}</span>）
+                    }}</span
+                    >）
                   </p>
                 </van-col>
                 <van-col span="6" style="text-align: right">
-                  <span v-if="item.religion == 1" style="color: #25bc5c">伊斯兰教</span>
-                  <span v-if="item.religion == 2" style="color: #53b4f4">基督教</span>
-                  <span v-if="item.religion == 3" style="color: #36a7f3">天主教</span>
-                  <span v-if="item.religion == 4" style="color: #d7cc18">佛教</span>
-                  <span v-if="item.religion == 5" style="color: #36a7f3">道教</span>
+                  <span v-if="item.religion == 1" style="color: #25bc5c"
+                    >伊斯兰教</span
+                  >
+                  <span v-if="item.religion == 2" style="color: #53b4f4"
+                    >基督教</span
+                  >
+                  <span v-if="item.religion == 3" style="color: #36a7f3"
+                    >天主教</span
+                  >
+                  <span v-if="item.religion == 4" style="color: #d7cc18"
+                    >佛教</span
+                  >
+                  <span v-if="item.religion == 5" style="color: #36a7f3"
+                    >道教</span
+                  >
                 </van-col>
               </van-row>
               <van-row>
@@ -44,17 +64,29 @@
                     item.locationName
                   }}</span>
                 </van-col>
-                <van-col span="6" style="
+                <van-col
+                  span="6"
+                  style="
                     text-align: right;
                     font-size: 12px;
                     white-space: nowrap;
                     overflow: hidden;
                     text-overflow: ellipsis;
-                  ">
+                  "
+                >
                   <span>{{ item.personnelTypeName }}</span>
                 </van-col>
               </van-row>
             </div>
+            <template #right>
+              <van-button
+                square
+                text="删除"
+                type="danger"
+                @click="del(item.id)"
+                class="delete-button"
+              />
+            </template>
           </van-swipe-cell>
         </van-list>
       </van-pull-refresh>
@@ -66,6 +98,7 @@
 import { ref } from "vue";
 import { useRouter } from "vue-router";
 import UserManage from "@/api/user/UserManage";
+import placePerson from "@/api/placePerson/placePerson";
 export default {
   setup() {
     const searchForm = ref({
@@ -119,7 +152,6 @@ export default {
       // 重新加载数据
       // 将 loading 设置为 true，表示处于加载状态
       loading.value = true;
-
       onLoad();
     };
     //跳转
@@ -139,15 +171,37 @@ export default {
     const value1 = ref("");
     const search1 = () => {
       if (active.value == "name") {
-        searchForm.value.name = value1.value
+        searchForm.value.name = value1.value;
       } else {
-        searchForm.value.idcard = value1.value
+        searchForm.value.idcard = value1.value;
       }
       dataList.value = [];
       loading.value = true;
       index = 0;
-      finished.value = false
-      onLoad()
+      finished.value = false;
+      onLoad();
+    };
+    //人员删除
+    const del = (id) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new placePerson().userDelete(id).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            dataList.value = [];
+            loading.value = true;
+            index = 0;
+            finished.value = false;
+            onLoad();
+          });
+        }
+      });
     };
     //返回
     const onClickLeft = () => {
@@ -168,7 +222,8 @@ export default {
       dataList,
       selectColor,
       onClickright,
-      search1
+      search1,
+      del,
     };
   },
 };
@@ -254,4 +309,12 @@ html {
     }
   }
 }
+.goods-card {
+  margin: 0;
+  background-color: white;
+}
+
+.delete-button {
+  height: 100%;
+}
 </style>

src/views/placeManage/placePerson/placePersonAdd.vue

@@ -1245,4 +1245,7 @@ export default {
   height: 400px;
   overflow: auto;
 }
+.bgList{
+  background: #36a7f3;
+}
 </style>

src/views/placeManage/placeRegister/placeRegister.vue

@@ -13,48 +13,55 @@
         <van-tab>
           <template #title> <van-icon name="orders-o" />基础信息</template>
           <div style="padding: 0 10px; height: 570px; overflow: auto">
-            <van-cell-group>
-              <van-field
-                name="uploader"
-                label-align="top"
-                label-width="8em"
-                label="场所内外景照片:"
-              >
-                <template #input>
-                  <van-uploader
-                    readonly
-                    v-model="fileList"
-                    :max-count="5"
-                    accept=""
-                    :preview-full-image="false"
-                    :before-delete="deleteRead"
-                    @click-upload="chooseImg"
+            <div class="imgbox">
+              <div class="img-left">
+                <van-cell-group>
+                  <van-field
+                    name="uploader"
+                    label-align="top"
+                    label-width="8em"
+                    label="场所内外景(主):"
                   >
-                  </van-uploader>
-                </template>
-              </van-field>
-            </van-cell-group>
-            <van-cell-group>
-              <van-field
-                name="uploader"
-                label-align="top"
-                label-width="8em"
-                label="场所外景照片:"
-              >
-                <template #input>
-                  <van-uploader
-                    readonly
-                    v-model="fileList4"
-                    :max-count="5"
-                    accept=""
-                    :preview-full-image="false"
-                    :before-delete="deleteRead4"
-                    @click-upload="chooseImg4"
+                    <template #input>
+                      <van-uploader
+                        readonly
+                        v-model="fileList"
+                        :max-count="1"
+                        accept=""
+                        :preview-full-image="false"
+                        :before-delete="deleteRead"
+                        @click-upload="chooseImg"
+                      >
+                      </van-uploader>
+                    </template>
+                  </van-field>
+                </van-cell-group>
+              </div>
+              <div class="img-left">
+                <van-cell-group>
+                  <van-field
+                    name="uploader"
+                    label-align="top"
+                    label-width="9em"
+                    label="场所内外景(其他):"
                   >
-                  </van-uploader>
-                </template>
-              </van-field>
-            </van-cell-group>
+                    <template #input>
+                      <van-uploader
+                        readonly
+                        v-model="fileList4"
+                        :max-count="5"
+                        preview-size="60"
+                        accept=""
+                        :preview-full-image="false"
+                        :before-delete="deleteRead4"
+                        @click-upload="chooseImg4"
+                      >
+                      </van-uploader>
+                    </template>
+                  </van-field>
+                </van-cell-group>
+              </div>
+            </div>
             <van-cell-group>
               <van-field
                 v-model="inputForm.name"
@@ -1413,6 +1420,20 @@ export default {
 };
 </script>
 <style lang="less">
+.main {
+  .imgbox {
+    width: 100%;
+    overflow: hidden;
+    .img-left {
+      float: left;
+      width: 50%;
+    }
+    .img-right {
+      float: left;
+      width: 50%;
+    }
+  }
+}
 .btn {
   margin: 10px auto;
   padding: 0 10px;

src/views/placeManage/placeRegister/placeRegisterInfo.vue

@@ -17,48 +17,55 @@
         <van-tab>
           <template #title> <van-icon name="orders-o" />基础信息</template>
           <div style="padding: 0 10px; height: 470px; overflow: auto">
-            <van-cell-group>
-              <van-field
-                name="uploader"
-                label-align="top"
-                label-width="8em"
-                label="场所内外景照片:"
-              >
-                <template #input>
-                  <van-uploader
-                    readonly
-                    v-model="fileList"
-                    :max-count="5"
-                    accept=""
-                    :preview-full-image="false"
-                    :before-delete="deleteRead"
-                    @click-upload="chooseImg"
+            <div class="imgbox">
+              <div class="img-left">
+                <van-cell-group>
+                  <van-field
+                    name="uploader"
+                    label-align="top"
+                    label-width="8em"
+                    label="场所内外景(主):"
                   >
-                  </van-uploader>
-                </template>
-              </van-field>
-            </van-cell-group>
-            <van-cell-group>
-            <van-field
-              name="uploader"
-              label-align="top"
-              label-width="8em"
-              label="场所外景照片:"
-            >
-              <template #input>
-                <van-uploader
-                  readonly
-                  v-model="fileList4"
-                  :max-count="5"
-                  accept=""
-                  :preview-full-image="false"
-                  :before-delete="deleteRead4"
-                  @click-upload="chooseImg4"
-                >
-                </van-uploader>
-              </template>
-            </van-field>
-          </van-cell-group>
+                    <template #input>
+                      <van-uploader
+                        readonly
+                        v-model="fileList"
+                        :max-count="1"
+                        accept=""
+                        :preview-full-image="false"
+                        :before-delete="deleteRead"
+                        @click-upload="chooseImg"
+                      >
+                      </van-uploader>
+                    </template>
+                  </van-field>
+                </van-cell-group>
+              </div>
+              <div class="img-left">
+                <van-cell-group>
+                  <van-field
+                    name="uploader"
+                    label-align="top"
+                    label-width="9em"
+                    label="场所内外景(其他):"
+                  >
+                    <template #input>
+                      <van-uploader
+                        readonly
+                        v-model="fileList4"
+                        :max-count="5"
+                        preview-size="60"
+                        accept=""
+                        :preview-full-image="false"
+                        :before-delete="deleteRead4"
+                        @click-upload="chooseImg4"
+                      >
+                      </van-uploader>
+                    </template>
+                  </van-field>
+                </van-cell-group>
+              </div>
+            </div>
             <van-cell-group>
               <van-field
                 v-model="dataitem.name"
@@ -1503,6 +1510,20 @@ export default {
 </script>
 
 <style lang="less">
+.main {
+  .imgbox {
+    width: 100%;
+    overflow: hidden;
+    .img-left {
+      float: left;
+      width: 50%;
+    }
+    .img-right {
+      float: left;
+      width: 50%;
+    }
+  }
+}
 .btn {
   margin: 10px auto;
   .van-button {

src/views/placeManage/placeTablet/placeTablet.vue

@@ -7,7 +7,7 @@
     @click-right="onClickright"
     :style="{ 'background-color': selectColor }"
   >
-   <template #right>
+    <template #right>
       <van-icon name="plus" size="18" />
     </template>
   </van-nav-bar>
@@ -24,7 +24,11 @@
         <div @click="search1">搜索</div>
       </template>
     </van-search>
-    <van-pull-refresh v-if="show==true" v-model="refreshing" @refresh="onRefresh">
+    <van-pull-refresh
+      v-if="show == true"
+      v-model="refreshing"
+      @refresh="onRefresh"
+    >
       <van-list
         v-model:loading="loading"
         :finished="finished"
@@ -37,7 +41,9 @@
               <div class="item_top_left">
                 {{ item.brandName }}
               </div>
-              <div class="item_top_right" style="color: red">￥{{ item.sacrificeExpenses }}</div>
+              <div class="item_top_right" style="color: red">
+                ￥{{ item.sacrificeExpenses }}
+              </div>
             </div>
             <div class="item_down">
               <div class="item_down_left" style="color: #a2a2a2">
@@ -46,10 +52,23 @@
               <div class="item_down_right">场管：{{ item.siteContact }}</div>
             </div>
           </div>
+          <template #right>
+            <van-button
+              square
+              text="删除"
+              type="danger"
+              @click="del(item.id)"
+              class="delete-button"
+            />
+          </template>
         </van-swipe-cell>
       </van-list>
     </van-pull-refresh>
-    <van-pull-refresh v-if="show==false" v-model="refreshing" @refresh="onRefresh">
+    <van-pull-refresh
+      v-if="show == false"
+      v-model="refreshing"
+      @refresh="onRefresh"
+    >
       <van-list
         v-model:loading="loading1"
         :finished="finished1"
@@ -62,7 +81,9 @@
               <div class="item_top_left">
                 {{ item.brandName }}
               </div>
-              <div class="item_top_right" style="color: red">￥{{ item.sacrificeExpenses }}</div>
+              <div class="item_top_right" style="color: red">
+                ￥{{ item.sacrificeExpenses }}
+              </div>
             </div>
             <div class="item_down">
               <div class="item_down_left" style="color: #a2a2a2">
@@ -71,6 +92,15 @@
               <div class="item_down_right">场管：{{ item.siteContact }}</div>
             </div>
           </div>
+          <template #right>
+            <van-button
+              square
+              text="删除"
+              type="danger"
+              @click="del(item.id)"
+              class="delete-button"
+            />
+          </template>
         </van-swipe-cell>
       </van-list>
     </van-pull-refresh>
@@ -109,7 +139,7 @@ export default {
       information: "",
     });
     //搜索事件
-    const show = ref(true)
+    const show = ref(true);
     const searchName = ref("");
     const searchList = ref([]);
     const loading1 = ref(false);
@@ -117,27 +147,29 @@ export default {
     const refreshing1 = ref(false);
     let index1 = 0;
     const search = () => {
-      show.value = false
+      show.value = false;
       loading1.value = true;
       finished1.value = false;
-      new TabletServer().list({
-        current:index1 + 1,
-        size:11,
-        brandName:searchName.value
-      }).then(({records,pages})=>{
-        searchList.value = searchList.value.concat(records)
-        loading1.value = false;
+      new TabletServer()
+        .list({
+          current: index1 + 1,
+          size: 11,
+          brandName: searchName.value,
+        })
+        .then(({ records, pages }) => {
+          searchList.value = searchList.value.concat(records);
+          loading1.value = false;
           if (index1 + 1 >= pages) {
             finished1.value = true;
           }
           index1++;
-      })
+        });
     };
 
-    const search1 = ()=>{
+    const search1 = () => {
       searchList.value = [];
-      search()
-    }
+      search();
+    };
     //页面跳转以及数据传递
     let router = useRouter();
     const goTabletInfo = (item) => {
@@ -159,7 +191,7 @@ export default {
         .list({
           current: index + 1,
           size: 11,
-          ...inputForm.value
+          ...inputForm.value,
         })
         .then(({ records, pages }) => {
           TabletData.value = TabletData.value.concat(records);
@@ -183,6 +215,33 @@ export default {
     const onClickLeft = () => {
       history.back();
     };
+    //牌位删除
+    const del = (id) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new TabletServer().tabletDelete(id).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            finished.value = false;
+            TabletData.value = [];
+            onLoad();
+            index1 = 0;
+            loading1.value = true;
+            finished1.value = false;
+            searchList.value = [];
+            search();
+          });
+        }
+      });
+    };
     //进入场所录入页面
     const onClickright = () => {
       router.push("/placeTabletAdd");
@@ -207,7 +266,8 @@ export default {
       search,
       show,
       searchList,
-      search1
+      search1,
+      del,
     };
   },
 };
@@ -240,7 +300,7 @@ html {
   .list-item {
     background-color: #fff;
     padding: 10px;
-    margin-bottom: 5px;
+    border-bottom: 1px solid #f5f5f5;
     overflow: hidden;
     .item_top {
       width: 100%;
@@ -263,7 +323,6 @@ html {
       width: 100%;
       font-size: 16px;
       padding: 5px 0;
-      border-bottom: 1px solid 	#F5F5F5;
       .item_down_left {
         width: 70%;
         float: left;