合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/BillQuartz.java

@@ -17,7 +17,7 @@ import java.util.List;
  * 定时器
  * @author weiximei
  */
-@Component
+//@Component
 @Slf4j
 public class BillQuartz {
 
@@ -30,7 +30,7 @@ public class BillQuartz {
     @Autowired
     private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
 
-    @Scheduled(cron = "0 0/10 * * * ?")
+    //@Scheduled(cron = "0 0/10 * * * ?")
     public void billInvoice() {
         log.info("定时任务，扫描订单，超过 10 分未付款则，关闭订单！");
         // 物业缴费

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserLicenseController.java

@@ -81,6 +81,18 @@ public class UserLicenseController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取用户车牌信息", notes = "获取用户车牌信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "licenseId", value = "车牌id"),
+    })
+    @RequestMapping(value = "/license/user/{licenseId}", method = RequestMethod.GET)
+    public ResponseBean getUserLicenseAndUserId(HttpSession session, @PathVariable("licenseId") Integer licenseId) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseService.getUserLicenseAndUserId(userElement, licenseId);
+        return responseBean;
+    }
 
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java

@@ -82,4 +82,21 @@ public interface TpEquipmentMapper {
             "where trne.community_id=#{communityId} and trne.unit_id=#{unitId} and te.equipment_type=#{equipmentType}")
     List<TpEquipment> selectByCommunityIdAndUnitId(@Param("communityId") Integer communityId, @Param("unitId") Integer unitId, @Param("equipmentType") Integer equipmentType);
 
+    /**
+     * 根据小区 和 单元号 查询所有人脸设备
+     * @param communityId
+     * @param unitId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select " +
+            "te.* " +
+            "from tp_unit_equipment trne left join tp_equipment te " +
+            "on trne.equipment_id = te.id " +
+            "LEFT JOIN tp_configuration tc ON te.uuid_id = tc.id " +
+            "where trne.community_id=#{communityId} and trne.unit_id=#{unitId} and te.equipment_type=#{equipmentType} " +
+            "AND tc.device_type = 1")
+    List<TpEquipment> selectByCommunityIdAndUnitIdAndFace(@Param("communityId") Integer communityId, @Param("unitId") Integer unitId, @Param("equipmentType") Integer equipmentType);
+
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserLicenseService.java

@@ -38,4 +38,12 @@ public interface ITaUserLicenseService {
      */
     ResponseBean deleteUserLicense(UserElement userElement, Integer licenseId);
 
+    /**
+     * 查询 车牌
+     * @param userElement
+     * @param licenseId
+     * @return
+     */
+    ResponseBean getUserLicenseAndUserId(UserElement userElement, Integer licenseId);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -15,6 +15,7 @@ import com.community.huiju.service.IHKService;
 import com.community.huiju.service.ImageServiceI;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -216,7 +217,8 @@ public class FaceServicelimpl implements FaceServiceI {
                 // 设备树
                 TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
                 // 所有设备
-                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
+                // List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
+                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(communityId, unitId, 4);
                 List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
                 StringBuilder doorUuids = new StringBuilder();
                 StringBuilder deviceUuids = new StringBuilder();
@@ -243,12 +245,14 @@ public class FaceServicelimpl implements FaceServiceI {
 
                 // 单元门口机
                 List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 3);
-                List<String> visualList = visualEquipments.stream()
-                        .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
-                        .collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(visualEquipments)) {
+                    List<String> visualList = visualEquipments.stream()
+                            .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                            .collect(Collectors.toList());
 //                List<String> visualList = new ArrayList<>();
 //                visualList.add("10010100000");
-                HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+                    HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+                }
             } else {
                 responseBean.addError("请录入正确图片");
             }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java

@@ -218,8 +218,8 @@ public class MonitoringServiceImpl implements IMonitoringService {
             queryMap.put("appKey", tpEquipment.getAppkey());
             queryMap.put("appSecret", tpEquipment.getSecret());
             try {
-                String result = OkHttpRequestUtils.doGet(yinShiProperties.getVideoTokenUrl(), queryMap);
-                JSONObject jsonObject = JSONObject.parseObject(result);
+                String result = OkHttpRequestUtils.doPost(yinShiProperties.getVideoTokenUrl(), queryMap);
+                JSONObject jsonObject = JSONObject.parseObject(result).getJSONObject("data");
                 tpEquipment.setOpUserUuid(jsonObject.getString("accessToken"));
                 tpEquipment.setUnitUuids(String.valueOf(jsonObject.getLong("expireTime")));
                 tpEquipmentMapper.updateByPrimaryKeySelective(tpEquipment);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseServiceImpl.java

@@ -104,6 +104,10 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         //2. 更新车牌信息
 
         taUserLicenses = taUserLicenses.stream().map(e-> {
+            TaUserLicense userLicense = getTaUserLicense(e.getLicensePlate(), e);
+            userLicense.setUpdateDate(new Date());
+            userLicense.setUpdateUser(userElement.getId());
+            taUserLicenseMapper.updateByPrimaryKeySelective(userLicense);
             e.setUnitPrice(String.valueOf(Double.valueOf(e.getUnitPrice()) / 100));
             return e;
         }).collect(Collectors.toList());
@@ -140,7 +144,6 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         taUserLicense.setLicensePlate(carNo);
         String price = String.valueOf(Double.valueOf(((BigDecimal) jsonParam.get("Cost")).toString()) * 100);
         taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
-        taUserLicense.setCreateDate(new Date());
         taUserLicense.setParkingLot(String.valueOf(jsonParam.get("ParkingName")));
         taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(jsonParam.get("RenewTime"))));
 
@@ -169,4 +172,20 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         responseBean.addSuccess("操作成功！");
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getUserLicenseAndUserId(UserElement userElement, Integer licenseId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserLicense taUserLicense = taUserLicenseMapper.selectByUserIdAndCommunityIdAndLicenseId(userElement.getCommunityId(), userElement.getId(), licenseId);
+        if (null == taUserLicense) {
+            responseBean.addError("没有关联此车牌！");
+            return responseBean;
+        }
+
+        taUserLicense = getTaUserLicense(taUserLicense.getLicensePlate(), taUserLicense);
+        taUserLicenseMapper.updateByPrimaryKeySelective(taUserLicense);
+        responseBean.addSuccess(taUserLicense);
+        return responseBean;
+    }
 }

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml

@@ -170,13 +170,13 @@
     WHERE
 	tr.community_id = #{communityId}
     and tr.transaction_id=#{transactionId}
-      <if test="type != null and type != '' and type == 2" >
+      <if test="type == 2" >
         AND release_identity=1
       </if>
-      <if test="type != null and type != '' and type == 1" >
+      <if test="type == 1" >
         AND  tr.ta_user_id = #{founderUserID}
       </if>
-      <if test="type != null and type != '' and type == 0" >
+      <if test="type == 0" >
         AND (tr.ta_user_id = #{founderUserID}) OR (tr.reply_ta_user_id = #{founderUserID})
       </if>
    </select>

CODE/smart-community/property-api/src/main/resources/mapper/TpShopMapper.xml

@@ -33,7 +33,7 @@
         <if test="tpShop.shopStatus != null and tpShop.shopStatus != ''">
             and t.shop_status  = #{tpShop.shopStatus}
         </if>
-        ORDER BY t.sort, t.update_date desc
+        ORDER BY t.sort desc, t.update_date desc
     </select>
 
 </mapper>

VUECODE/smart-operate-manage/config/prod.env.js

@@ -2,4 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   BASE_API: '"http://106.14.20.193:8086/operate-api"',
+  // BASE_API: '"http://operate.jcjyhn.com/operate-api"',
 }

VUECODE/smart-property-manage/config/prod.env.js

@@ -2,4 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   BASE_API: '"http://106.14.20.193:8086/property-api"',
+  // BASE_API: '"http://property.jcjyhn.com/property-api"',
 }

VUECODE/smart-property-manage/src/views/bill/info/index.vue

@@ -7,9 +7,10 @@
       <el-button type="info" @click="updateBill">修改</el-button>
     </div>
     <div class="bill-info-search">
-      <span style="font-size: 14px; color: #606266;">收费情况</span>
+      <span style="font-size: 14px; color:#888888">收费情况</span>
       <el-form :model="formInline" inline="true" class="form-inline">
-        <el-form-item label="选择房子">
+        <el-form-item>
+          <span class="title-info">选择房子</span>
           <el-select v-model="formInline.phaseId" placeholder="请选择期" @change="buildSelectChange(0)">
             <el-option
               v-for="item in phaseList"
@@ -48,18 +49,21 @@
           </el-select>
         </el-form-item>
         <br>
-        <el-form-item label="户主姓名">
-          <el-input v-model="formInline.ownerName"/>
+        <el-form-item>
+          <span class="title-info">户主姓名</span>
+          <el-input v-model="formInline.ownerName" style="padding-left:25%;transform:translateY(-90%);"/>
         </el-form-item>
-        <el-form-item label="缴费状态">
-          <el-select v-model="formInline.billStatus" placeholder="请选择">
+        <el-form-item>
+          <span class="title-info">缴费状态</span>
+          <el-select v-model="formInline.billStatus" placeholder="请选择" style="padding-left:25%;transform:translateY(-90%);">
             <el-option label="未缴费" value="0"/>
             <el-option label="已线上缴费" value="1"/>
             <el-option label="已线下缴费" value="2"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="缴费人姓名">
-          <el-input v-model="formInline.payName"/>
+        <el-form-item>
+          <span class="title-info">缴费人姓名</span>
+          <el-input v-model="formInline.payName" style="padding-left:30%;transform:translateY(-90%);"/>
         </el-form-item>
         <el-form-item>
           <el-button type="info" @click="cleanQuery">清空</el-button>
@@ -72,7 +76,7 @@
       <el-button type="danger" @click="deleteBeachIds">删除</el-button>
       <el-button type="primary" @click="offlinePayment">设置为已线下缴费</el-button>
       <el-button type="success" @click="exportExcel">导出数据</el-button>
-      <div style="height: 40px; line-height: 40px; margin-left: 10px; font-size: 14px; color: #606266;">未缴户主费用可以直接点击 收费金额数字 修改，已缴费户主无法修改，需要线下多退少补</div>
+      <div style="height: 40px; line-height: 40px; margin-left: 10px; font-size: 14px; color:#888888;padding-left:18%;">未缴户主费用可以直接点击 收费金额数字 修改，已缴费户主无法修改，需要线下多退少补</div>
     </div>
     <el-table
       v-loading="tableLoading"
@@ -550,11 +554,10 @@ export default {
   margin-top: 20px;
 }
 .title-info {
-  font-weight: bold;
   height: 40px;
   line-height: 40px;
-  font-size: 14px;
-  color: #606266;
+  font-size:14px;
+  color:#888888
 }
 .bill-info-search {
   margin-left: 20px;

VUECODE/smart-property-manage/src/views/grogshop/configindex.vue

@@ -126,9 +126,6 @@ export default {
         appIndexImg: [
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
-        appCarouselImg: [
-          { required: true, message: '轮播图', trigger: 'blur' }
-        ],
         hotelName: [
           { required: true, message: '酒店名称', trigger: 'blur' }
         ],
@@ -169,9 +166,10 @@ export default {
       this.listData.appIndexImg = res.data[0]
     },
     handleRemove(file, fileList) {
+      console.log(fileList)
       this.listData.appCarouselImg = []
       for (let i = 0; i < fileList.length; i++) {
-        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+        this.listData.appCarouselImg.push(fileList[i].url)
       }
     },
     handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
@@ -224,6 +222,10 @@ export default {
       this.$refs[formName].resetFields()
     },
     updateRental() {
+      if(this.listData.appCarouselImg.length == 0){
+       this.$message.error("酒店banner图不能为空")
+       return
+     }
       // 加载框
       const loading = this.$loading({
         lock: true,

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomEdit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="root">
-    <el-form ref="ruleForm" :model="ruleForm"  label-width="100px" class="demo-ruleForm">
-      <el-form-item label="房型名称" >
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+      <el-form-item label="房型名称" prop="roomName">
         <el-input v-model="ruleForm.roomName" placeholder="房型名称"/>
       </el-form-item>
       <!-- <el-form-item label="房型号" >
@@ -10,10 +10,10 @@
      <el-form-item class="filter-item" label="房型短描述" prop="remark" >
         <el-input v-model.trim="ruleForm.remark" placeholder="房型推荐语等"/>
       </el-form-item>
-      <el-form-item label="房型价格">
+      <el-form-item label="房型价格" prop="price">
         <el-input v-model="ruleForm.price" placeholder="单位元" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
-      <el-form-item class="filter-item"  label="上架状态">
+      <el-form-item class="filter-item"  label="上架状态" prop="roomStatus">
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
          <el-option label="上架" value="1"/>
          <el-option label="下架" value="2"/>
@@ -41,18 +41,21 @@ export default {
        roomStatus: '',
              sort: '',
            roomNo: ''
+      },
+      rules: {
+        roomName: [
+          { required: true, message: '请输入房型名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入房型描述', trigger: 'blur' }
+        ],
+        price: [
+          { required: true, message: '请输入价格', trigger: 'blur' }
+        ],
+        roomStatus: [
+          { required: true, message: '请选择状态', trigger: 'blur' }
+        ],         
       }
-      // rules: {
-      //   userName: [
-      //     { required: true, message: '请输入姓名', trigger: 'blur' }
-      //   ],
-      //   price: [
-      //     { required: true, message: '请输入价格', trigger: 'blur' }
-      //   ],
-      //   menuArray: [
-      //     { required: true, message: '请选择角色', trigger: 'blur' }
-      //   ],       
-      // }
     }
   },
   mounted() {
@@ -64,14 +67,14 @@ export default {
       //   this.$message.error('请输入房型号');
       //   return
       // }
-      if(this.ruleForm.roomName ===''){
-        this.$message.error('请输入房型名称');
-        return
-      }
-      if(this.ruleForm.price ===''){
-        this.$message.error('房型价格');
-        return
-      }
+      // if(this.ruleForm.roomName ===''){
+      //   this.$message.error('请输入房型名称');
+      //   return
+      // }
+      // if(this.ruleForm.price ===''){
+      //   this.$message.error('房型价格');
+      //   return
+      // }
     
       this.$store.dispatch('HotelRoomEdit', this.ruleForm).then((res) => {
         if(res.code === '1'){

VUECODE/smart-property-manage/src/views/rental/rentalAdd.vue

@@ -92,7 +92,6 @@
         <el-checkbox v-model="listData.balcony" true-label="1" false-label="0">阳台</el-checkbox>
       </el-form-item>
       <el-form-item label="地图定位" prop="communityLatitude">
-        <span>高德坐标</span>
         <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择公寓位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 100px;" />
@@ -203,9 +202,6 @@ export default {
         appListImg: [
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
-        appCarouselImg: [
-          { required: true, message: '轮播图', trigger: 'blur' }
-        ],
         communityAddress: [
           { required: true, message: '请选择小区地址', trigger: 'blur' }
         ],
@@ -286,6 +282,10 @@ export default {
       this.$refs[formName].resetFields()
     },
     addRental() {
+      if(this.listData.appCarouselImg.length == 0){
+       this.$message.error("app轮播图不能为空")
+       return
+     }
       // 加载框
       const loading = this.$loading({
         lock: true,

VUECODE/smart-property-manage/src/views/rental/rentalEdit.vue

@@ -9,7 +9,7 @@
         <span style="font-size:0.7vw;color:#C0C0C0">季租,年租优惠可以写在房间介绍中</span>
       </el-form-item>
       <el-form-item label="面积" prop="area">
-        <el-input v-model="listData.area" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="面积"/>
+        <el-input v-model="listData.area" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="单位 平米"/>
       </el-form-item>
       <el-form-item label="app列表展示图" prop="appListImg">
         <el-upload

VUECODE/smart-property-manage/src/views/shop/shopAdd.vue

@@ -275,6 +275,11 @@ export default {
         this.$message.error('商铺介绍不能为空');
         return
       }
+      if(this.listData.appCarouselImg == 0){
+         this.$message.error("轮播图不能为空")
+        loading.close()
+        return
+      }
       // 加载框
       const loading = this.$loading({
         lock: true,

VUECODE/smart-property-manage/src/views/shop/shopEdit.vue

@@ -163,9 +163,6 @@ export default {
         appListImg: [
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
-        appCarouselImg: [
-          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
-        ],
         shopName: [
           { required: true, message: '商铺名称', trigger: 'blur' }
         ],
@@ -215,7 +212,7 @@ export default {
     handleRemove(file, fileList) {
       this.listData.appCarouselImg = []
       for (let i = 0; i < fileList.length; i++) {
-        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+        this.listData.appCarouselImg.push(fileList[i].url)
       }
     },
     handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
@@ -284,7 +281,7 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      if(this.listData.appCarouselImg == 0){
+      if(this.listData.appCarouselImg.length == 0){
          this.$message.error("轮播图不能为空")
         loading.close()
         return

VUECODE/smart-property-manage/src/views/systemResources/app/index.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName2" type="card" @tab-click="handleClick">
       <el-tab-pane label="banner轮播" name="banner">
         <div style="width: 1000px; margin-left: auto; margin-right: auto;">
-          <span>APP端公告列表中,前多少个,显示在公告banner位？</span>
+          <span style="font-size:0.7vw;color:#666666">APP端公告列表中,前多少个,显示在公告banner位？</span>
           <el-input v-model="announcementBannerNum" min="1" max="10" type="number" placeholder="请输入数字" style="width: 150px;" @change="handleBannerChange"/>
           <el-tooltip class="item" effect="dark" content="如果需要修改,请选择1~10之间的数字后保存!" placement="top-start">
             <i class="el-icon-info"/>
@@ -11,7 +11,7 @@
           <el-button v-if="announcementBannerBool" type="primary" @click="carouselAnnouncementBanner">保存</el-button>
         </div>
         <div style="width: 1000px; margin-left: auto; margin-right: auto; margin-top: 20px;">
-          <span>APP端活动列表中,前多少个,显示在活动banner位？</span>
+          <span style="font-size:0.7vw;color:#666666">APP端活动列表中,前多少个,显示在活动banner位？</span>
           <el-input v-model="activityBannerNum" min="1" max="10" type="number" placeholder="请输入数字" style="width: 150px;" @change="handleActivityChange"/>
           <el-tooltip class="item" effect="dark" content="如果需要修改,请选择1~10之间的数字后保存!" placement="top-start">
             <i class="el-icon-info"/>
@@ -118,13 +118,14 @@
       </el-tab-pane>
       <el-tab-pane label="公区监控" name="monitoring">
         <span style="display: flex; justify-content: center;">可配置项</span>
-        <div style="display: flex; justify-content: center; margin-top: 20px;">
+        <!-- padding: 10px 20px 0;border-radius: 8px;margin: 20px 15px 10px 15px;border: 1px solid #eee;box-shadow: 4px 4px 10px #dadada; -->
+        <div style="display: flex; justify-content: center; margin: 20px 15px 10px 15px;">
           <span style="display: flex; justify-content: center; color: #409EFF;cursor: pointer; margin-right: 50px;" @click="addMonitoring">添加一个配置</span>
           <span style="display: flex; justify-content: center; color: #409EFF;cursor: pointer; margin-left: 50px;" @click="monitoringSubmit">提交</span>
         </div>
-        <div style="display: flex; justify-content: center; flex-wrap: wrap;">
+        <div style="display: flex; justify-content: center; flex-wrap: wrap; ">
           <el-form v-for="(item, index) in equipmentList" ref="monitoringForm" label-width="120px" style="margin-top: 20px;">
-            <div>
+            <div style="padding: 10px 20px 0;border-radius: 8px;margin: 20px 15px 10px 15px;border: 1px solid #eee;box-shadow: 4px 4px 10px #dadada;">
               <el-form-item label="编号">
                 <!-- item.id -->
                 <span>{{ index }}</span>
@@ -223,26 +224,28 @@ export default {
       })
     },
     monitoringRemover(id, equipmentIndex) { // 监控删除
-      // console.log('monitoringForm : ', this.equipmentList, '  下坐标：', index)
-      // const tempEquipmentList = []
-      // this.equipmentList.map((item, index) => {
-      //   // 排除需要删除的下坐标的数据
-      //   if (index !== equipmentIndex) {
-      //     tempEquipmentList.push(item)
-      //   }
-      // })
-      // this.equipmentList = tempEquipmentList
-
-      this.$store.dispatch('DeleteEquipment', id).then(res => {
-        const resCode = res.code
-        if (resCode === '1') {
-          this.$message.error(res.message)
-          return
+      // console.log('monitoringForm : ', this.equipmentList, '  下坐标：', equipmentIndex)
+      const tempEquipmentList = []
+      this.equipmentList.map((item, index) => {
+        // 排除需要删除的下坐标的数据
+        if (index !== equipmentIndex) {
+          tempEquipmentList.push(item)
         }
-        this.getMenuList()
-      }).catch(() => {
-        console.log('DeleteEquipment error!')
       })
+      this.equipmentList = tempEquipmentList
+
+      if (id !== '') {
+        this.$store.dispatch('DeleteEquipment', id).then(res => {
+          const resCode = res.code
+          if (resCode === '1') {
+            this.$message.error(res.message)
+            return
+          }
+          this.getMenuList()
+        }).catch(() => {
+          console.log('DeleteEquipment error!')
+        })
+      }
     },
     onSubmit() {
       this.getPropertyData()

VUECODE/smart-property-manage/src/views/ticket/details.vue

@@ -1,8 +1,8 @@
 <template>
 <div id="app" style="margin-top:30px;font-size: 14px; color: #606266;">
  <el-form :inline="true" :model="listQuery" class="form-listQuery">
-      <div style="transform:translateY(-70%);">
-         <span style="padding-right:0%;font-weight:bold;font-size:12px;">工单详情</span>
+      <div style="transform:translateY(-70%); margin-top:5px;">
+         <span style="padding-left:0.8%;">工单详情</span>
      </div>
      <div>
        <table>
@@ -48,11 +48,12 @@
       </div> -->
 
       <div style="transform:translateY(20%);">
-        <el-form-item style="padding-left:1%;" class="filter-item" label="工单标题:" >
+        <el-form-item style="padding-left:0.8%;" class="filter-item">
+          <span>工单标题:</span>
          <span>{{listQuery.ticketTitle}}</span>
         </el-form-item>
-        <el-form-item  label="当前负责人:" class="size-left">
-         <span>{{listQuery.tpUserNmae}}</span>
+        <el-form-item  class="size-left">
+         <span>当前负责人:{{listQuery.tpUserNmae}}</span>
       </el-form-item>
       </div>
       <div>