Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java

@@ -145,16 +145,51 @@ public class WxInstrument extends BaseEntity {
      */
     private String shoppingPath;
 
+    /**
+     * 蓝牙连接中标题
+     */
+    private String bluetoothConnectingTitle;
+
     /**
      * 蓝牙连接中图片
      */
     private String bluetoothConnecting;
 
+    /**
+     * 蓝牙连接中文案
+     */
+    private String bluetoothConnectingContent;
+
+    /**
+     * 蓝牙关闭标题
+     */
+    private String bluetoothClosedTitle;
+
     /**
      * 蓝牙关闭图片
      */
     private String bluetoothClosed;
 
+    /**
+     * 蓝牙关闭文案
+     */
+    private String bluetoothClosedContent;
+
+    /**
+     * 蓝牙连接失败标题
+     */
+    private String bluetoothConnectFailTitle;
+
+    /**
+     * 蓝牙连接失败图片
+     */
+    private String bluetoothConnectFail;
+
+    /**
+     * 蓝牙连接失败文案
+     */
+    private String bluetoothConnectFailContent;
+
     /**
      * iot版本升级说明
      */
@@ -436,6 +471,63 @@ public class WxInstrument extends BaseEntity {
         this.bindingCredit = bindingCredit;
     }
 
+    public String getBluetoothConnectingTitle() {
+        return bluetoothConnectingTitle;
+    }
+
+    public void setBluetoothConnectingTitle(String bluetoothConnectingTitle) {
+        this.bluetoothConnectingTitle = bluetoothConnectingTitle;
+    }
+
+    public String getBluetoothClosedTitle() {
+        return bluetoothClosedTitle;
+    }
+
+    public void setBluetoothClosedTitle(String bluetoothClosedTitle) {
+        this.bluetoothClosedTitle = bluetoothClosedTitle;
+    }
+
+    public String getBluetoothConnectFailTitle() {
+        return bluetoothConnectFailTitle;
+    }
+
+    public void setBluetoothConnectFailTitle(String bluetoothConnectFailTitle) {
+        this.bluetoothConnectFailTitle = bluetoothConnectFailTitle;
+    }
+
+    public String getBluetoothConnectFail() {
+        return bluetoothConnectFail;
+    }
+
+    public void setBluetoothConnectFail(String bluetoothConnectFail) {
+        this.bluetoothConnectFail = bluetoothConnectFail;
+    }
+
+    public String getBluetoothConnectingContent() {
+        return bluetoothConnectingContent;
+    }
+
+    public void setBluetoothConnectingContent(String bluetoothConnectingContent) {
+        this.bluetoothConnectingContent = bluetoothConnectingContent;
+    }
+
+    public String getBluetoothClosedContent() {
+        return bluetoothClosedContent;
+    }
+
+    public void setBluetoothClosedContent(String bluetoothClosedContent) {
+        this.bluetoothClosedContent = bluetoothClosedContent;
+    }
+
+    public String getBluetoothConnectFailContent() {
+        return bluetoothConnectFailContent;
+    }
+
+    public void setBluetoothConnectFailContent(String bluetoothConnectFailContent) {
+        this.bluetoothConnectFailContent = bluetoothConnectFailContent;
+    }
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentMode.java

@@ -32,6 +32,11 @@ public class WxInstrumentMode extends BaseEntity {
     @Excel(name = "模式id")
     private Long modeId;
 
+    /**
+     * 是否带new标识（0不带，1带）
+     */
+    private Integer isNew;
+
     /**
      * 排序
      */
@@ -83,6 +88,14 @@ public class WxInstrumentMode extends BaseEntity {
         this.modeSort = modeSort;
     }
 
+    public Integer getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(Integer isNew) {
+        this.isNew = isNew;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java

@@ -141,16 +141,52 @@ public class WxInstrumentSaveReq {
      */
     private String shoppingPath;
 
+    /**
+     * 蓝牙连接中标题
+     */
+    private String bluetoothConnectingTitle;
+
     /**
      * 蓝牙连接中图片
      */
     private String bluetoothConnecting;
 
+    /**
+     * 蓝牙连接中文案
+     */
+    private String bluetoothConnectingContent;
+
+    /**
+     * 蓝牙关闭标题
+     */
+    private String bluetoothClosedTitle;
+
     /**
      * 蓝牙关闭图片
      */
     private String bluetoothClosed;
 
+    /**
+     * 蓝牙关闭文案
+     */
+    private String bluetoothClosedContent;
+
+    /**
+     * 蓝牙连接失败标题
+     */
+    private String bluetoothConnectFailTitle;
+
+    /**
+     * 蓝牙连接失败图片
+     */
+    private String bluetoothConnectFail;
+
+    /**
+     * 蓝牙连接失败文案
+     */
+    private String bluetoothConnectFailContent;
+
+
     /**
      * iot版本升级说明
      */
@@ -189,6 +225,11 @@ public class WxInstrumentSaveReq {
      */
     private List<Integer> modeIdsValue;
 
+    /**
+     * 带new标识的模式
+     */
+    private List<Integer> newModeIdList;
+
     public Long getId() {
         return id;
     }
@@ -436,4 +477,68 @@ public class WxInstrumentSaveReq {
     public void setModeIdsValue(List<Integer> modeIdsValue) {
         this.modeIdsValue = modeIdsValue;
     }
+
+    public String getBluetoothConnectingTitle() {
+        return bluetoothConnectingTitle;
+    }
+
+    public void setBluetoothConnectingTitle(String bluetoothConnectingTitle) {
+        this.bluetoothConnectingTitle = bluetoothConnectingTitle;
+    }
+
+    public String getBluetoothConnectingContent() {
+        return bluetoothConnectingContent;
+    }
+
+    public void setBluetoothConnectingContent(String bluetoothConnectingContent) {
+        this.bluetoothConnectingContent = bluetoothConnectingContent;
+    }
+
+    public String getBluetoothClosedTitle() {
+        return bluetoothClosedTitle;
+    }
+
+    public void setBluetoothClosedTitle(String bluetoothClosedTitle) {
+        this.bluetoothClosedTitle = bluetoothClosedTitle;
+    }
+
+    public String getBluetoothClosedContent() {
+        return bluetoothClosedContent;
+    }
+
+    public void setBluetoothClosedContent(String bluetoothClosedContent) {
+        this.bluetoothClosedContent = bluetoothClosedContent;
+    }
+
+    public String getBluetoothConnectFailTitle() {
+        return bluetoothConnectFailTitle;
+    }
+
+    public void setBluetoothConnectFailTitle(String bluetoothConnectFailTitle) {
+        this.bluetoothConnectFailTitle = bluetoothConnectFailTitle;
+    }
+
+    public String getBluetoothConnectFail() {
+        return bluetoothConnectFail;
+    }
+
+    public void setBluetoothConnectFail(String bluetoothConnectFail) {
+        this.bluetoothConnectFail = bluetoothConnectFail;
+    }
+
+    public String getBluetoothConnectFailContent() {
+        return bluetoothConnectFailContent;
+    }
+
+    public void setBluetoothConnectFailContent(String bluetoothConnectFailContent) {
+        this.bluetoothConnectFailContent = bluetoothConnectFailContent;
+    }
+
+    public List<Integer> getNewModeIdList() {
+        return newModeIdList;
+    }
+
+    public void setNewModeIdList(List<Integer> newModeIdList) {
+        this.newModeIdList = newModeIdList;
+    }
 }

flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml

@@ -30,8 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isPurchase"    column="is_purchase"    />
         <result property="shoppingAppid"    column="shopping_appid"    />
         <result property="shoppingPath"    column="shopping_path"    />
+        <result property="bluetoothConnectingTitle"    column="bluetooth_connecting_title"    />
+        <result property="bluetoothConnectingContent"    column="bluetooth_connecting_content"    />
         <result property="bluetoothConnecting"    column="bluetooth_connecting"    />
+        <result property="bluetoothClosedTitle"    column="bluetooth_closed_title"    />
+        <result property="bluetoothClosedContent"    column="bluetooth_closed_content"    />
         <result property="bluetoothClosed"    column="bluetooth_closed"    />
+        <result property="bluetoothConnectFailTitle"    column="bluetooth_connect_fail_title"    />
+        <result property="bluetoothConnectFailContent"    column="bluetooth_connect_fail_content"    />
+        <result property="bluetoothConnectFail"    column="bluetooth_connect_fail"    />
         <result property="iotVersionUpgrade"    column="iot_version_upgrade"    />
         <result property="sortNo"    column="sort_no"    />
         <result property="status"    column="status"    />
@@ -45,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxInstrumentVo">
-        select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, is_extra_clock, binding_credit, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, nursing_time, iot_version, iot_upgrade_data, is_scan_code, is_purchase, shopping_appid, shopping_path, bluetooth_connecting, bluetooth_closed, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark from wx_instrument
+        select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, is_extra_clock, binding_credit, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, nursing_time, iot_version, iot_upgrade_data, is_scan_code, is_purchase, shopping_appid, shopping_path, bluetooth_connecting_title, bluetooth_connecting_content,bluetooth_connecting, bluetooth_closed_title, bluetooth_closed_content, bluetooth_closed, bluetooth_connect_fail_title, bluetooth_connect_fail_content, bluetooth_connect_fail, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark from wx_instrument
     </sql>
 
     <select id="selectWxInstrumentList" parameterType="WxInstrument" resultMap="WxInstrumentResult">
@@ -75,8 +82,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPurchase != null "> and is_purchase = #{isPurchase}</if>
             <if test="shoppingAppid != null  and shoppingAppid != ''"> and shopping_appid = #{shoppingAppid}</if>
             <if test="shoppingPath != null  and shoppingPath != ''"> and shopping_path = #{shoppingPath}</if>
+            <if test="bluetoothConnectingTitle != null  and bluetoothConnectingTitle != ''"> and bluetooth_connecting_title = #{bluetoothConnectingTitle}</if>
+            <if test="bluetoothConnectingContent != null  and bluetoothConnectingContent != ''"> and bluetooth_connecting_content = #{bluetoothConnectingContent}</if>
             <if test="bluetoothConnecting != null  and bluetoothConnecting != ''"> and bluetooth_connecting = #{bluetoothConnecting}</if>
+            <if test="bluetoothClosedTitle != null  and bluetoothClosedTitle != ''"> and bluetooth_closed_content = #{bluetoothClosedContent}</if>
+            <if test="bluetoothClosedTitle != null  and bluetoothClosedTitle != ''"> and bluetooth_closed_title = #{bluetoothClosedTitle}</if>
             <if test="bluetoothClosed != null  and bluetoothClosed != ''"> and bluetooth_closed = #{bluetoothClosed}</if>
+            <if test="bluetoothConnectFailTitle != null  and bluetoothConnectFailTitle != ''"> and bluetooth_connect_fail_title = #{bluetoothConnectFailTitle}</if>
+            <if test="bluetoothConnectFailTitle != null  and bluetoothConnectFailTitle != ''"> and bluetooth_connect_fail_content = #{bluetoothConnectFailContent}</if>
+            <if test="bluetoothConnectFail != null  and bluetoothConnectFail != ''"> and bluetooth_connect_fail = #{bluetoothConnectFail}</if>
             <if test="iotVersionUpgrade != null  and iotVersionUpgrade != ''"> and iot_version_upgrade = #{iotVersionUpgrade}</if>
             <if test="sortNo != null "> and sort_no = #{sortNo}</if>
             <if test="status != null "> and status = #{status}</if>
@@ -131,8 +145,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPurchase != null">is_purchase,</if>
             <if test="shoppingAppid != null">shopping_appid,</if>
             <if test="shoppingPath != null">shopping_path,</if>
+            <if test="bluetoothConnectingTitle != null">bluetooth_connecting_title,</if>
+            <if test="bluetoothConnectingContent != null">bluetooth_connecting_Content,</if>
             <if test="bluetoothConnecting != null">bluetooth_connecting,</if>
+            <if test="bluetoothClosedTitle != null">bluetooth_closed_title,</if>
+            <if test="bluetoothClosedContent != null">bluetooth_closed_content,</if>
             <if test="bluetoothClosed != null">bluetooth_closed,</if>
+            <if test="bluetoothConnectFailTitle != null">bluetooth_connect_fail_title,</if>
+            <if test="bluetoothConnectFailContent != null">bluetooth_connect_fail_content,</if>
+            <if test="bluetoothConnectFail != null">bluetooth_connect_fail,</if>
             <if test="iotVersionUpgrade != null">iot_version_upgrade,</if>
             <if test="sortNo != null">sort_no,</if>
             <if test="status != null">status,</if>
@@ -169,8 +190,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPurchase != null">#{isPurchase},</if>
             <if test="shoppingAppid != null">#{shoppingAppid},</if>
             <if test="shoppingPath != null">#{shoppingPath},</if>
+            <if test="bluetoothConnectingTitle != null">#{bluetoothConnectingTitle},</if>
+            <if test="bluetoothConnectingContent != null">#{bluetoothConnectingContent},</if>
             <if test="bluetoothConnecting != null">#{bluetoothConnecting},</if>
+            <if test="bluetoothClosedTitle != null">#{bluetoothClosedTitle},</if>
+            <if test="bluetoothClosedContent != null">#{bluetoothClosedContent},</if>
             <if test="bluetoothClosed != null">#{bluetoothClosed},</if>
+            <if test="bluetoothConnectFailTitle != null">#{bluetoothConnectFailTitle},</if>
+            <if test="bluetoothConnectFailContent != null">#{bluetoothConnectFailContent},</if>
+            <if test="bluetoothConnectFail != null">#{bluetoothConnectFail},</if>
             <if test="iotVersionUpgrade != null">#{iotVersionUpgrade},</if>
             <if test="sortNo != null">#{sortNo},</if>
             <if test="status != null">#{status},</if>
@@ -211,8 +239,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPurchase != null">is_purchase = #{isPurchase},</if>
             <if test="shoppingAppid != null">shopping_appid = #{shoppingAppid},</if>
             <if test="shoppingPath != null">shopping_path = #{shoppingPath},</if>
+            <if test="bluetoothConnectingTitle != null">bluetooth_connecting_title = #{bluetoothConnectingTitle},</if>
+            <if test="bluetoothConnectingContent != null">bluetooth_connecting_content = #{bluetoothConnectingContent},</if>
             <if test="bluetoothConnecting != null">bluetooth_connecting = #{bluetoothConnecting},</if>
+            <if test="bluetoothClosedTitle != null">bluetooth_closed_title = #{bluetoothClosedTitle},</if>
+            <if test="bluetoothClosedContent != null">bluetooth_closed_content = #{bluetoothClosedContent},</if>
             <if test="bluetoothClosed != null">bluetooth_closed = #{bluetoothClosed},</if>
+            <if test="bluetoothConnectFailTitle != null">bluetooth_connect_fail_title = #{bluetoothConnectFailTitle},</if>
+            <if test="bluetoothConnectFailContent != null">bluetooth_connect_fail_content = #{bluetoothConnectFailContent},</if>
+            <if test="bluetoothConnectFail != null">bluetooth_connect_fail = #{bluetoothConnectFail},</if>
             <if test="iotVersionUpgrade != null">iot_version_upgrade = #{iotVersionUpgrade},</if>
             <if test="sortNo != null">sort_no = #{sortNo},</if>
             <if test="status != null">status = #{status},</if>

flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentModeMapper.xml

@@ -9,13 +9,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="instrumentId"    column="instrument_id"    />
         <result property="modeId"    column="mode_id"    />
         <result property="modeSort"    column="mode_sort"    />
+        <result property="isNew"    column="is_new"    />
         <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectWxInstrumentModeVo">
-        select id, instrument_id, mode_id, mode_sort, status, create_by, create_time from wx_instrument_mode
+        select id, instrument_id, mode_id, mode_sort, is_new, status, create_by, create_time from wx_instrument_mode
     </sql>
 
     <select id="selectWxInstrumentModeList" parameterType="WxInstrumentMode" resultMap="WxInstrumentModeResult">
@@ -23,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="instrumentId != null "> and instrument_id = #{instrumentId}</if>
             <if test="modeId != null "> and mode_id = #{modeId}</if>
+            <if test="isNew != null "> and is_new = #{isNew}</if>
             <if test="status != null "> and status = #{status}</if>
         </where>
         order by mode_sort
@@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instrumentId != null">instrument_id,</if>
             <if test="modeId != null">mode_id,</if>
             <if test="modeSort != null">mode_sort,</if>
+            <if test="isNew != null">is_new,</if>
             <if test="status != null">status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -47,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instrumentId != null">#{instrumentId},</if>
             <if test="modeId != null">#{modeId},</if>
             <if test="modeSort != null">#{modeSort},</if>
+            <if test="isNew != null">#{isNew},</if>
             <if test="status != null">#{status},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -59,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instrumentId != null">instrument_id = #{instrumentId},</if>
             <if test="modeId != null">mode_id = #{modeId},</if>
             <if test="modeSort != null">mode_sort = #{modeSort},</if>
+            <if test="isNew != null">isNew = #{isNew},</if>
             <if test="status != null">status = #{status},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java

@@ -182,14 +182,16 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
     public LoginUserVo updateUser(UserMemberUpdateVo userMemberUpdateVo) {
         // 完善用户信息, 判断是否标记完善信息
         WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberByOpenId(SecurityUtils.getLoginUser().getWxUserMember().getOpenid());
-        Boolean isCompleteInformation = false;
+        if (wxUserMember == null) {
+            throw new ServiceException("用户不存在");
+        }
         int floatScore = 0;
         if (wxUserMember.getIsCompleteInformation() == null || wxUserMember.getIsCompleteInformation() == 0) {
-            isCompleteInformation = true;
             // 修改完善状态
             wxUserMember.setIsCompleteInformation(1);
             List<IntegralGlobal> integralGlobalList = integralGlobalMapper.selectIntegralGlobalList(new IntegralGlobal());
             IntegralGlobal integralGlobal = integralGlobalList.get(0);
+            floatScore = integralGlobal.getIntegral().intValue();
             wxUserMember.setCredit(wxUserMember.getCredit() + integralGlobal.getIntegral().intValue());
 
             // 保存积分详情
@@ -210,7 +212,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
 
         // 刷新用户信息
         LoginUserVo loginUserVo = refreshWxUserInfo();
-        if (isCompleteInformation) {
+        if (wxUserMember.getIsCompleteInformation() == 1) {
             loginUserVo.setIntegralText("您已完善个人信息，获得" + floatScore + "积分");
         }
         return loginUserVo;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java

@@ -90,6 +90,13 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                     .map(WxInstrumentMode::getModeId)
                     .map(Long::intValue)
                     .collect(Collectors.toList()));
+
+            wxInstrumentSaveReq.setNewModeIdList(wxInstrumentModes.stream()
+                    .filter(im -> im.getIsNew() == 1)
+                    .map(WxInstrumentMode::getModeId)
+                    .map(Long::intValue)
+                    .collect(Collectors.toList())
+            );
         }
         return wxInstrumentSaveReq;
     }
@@ -183,6 +190,11 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                 wxInstrumentMode.setInstrumentId(wxInstrument.getId());
                 wxInstrumentMode.setModeId(modeIdList.get(i).longValue());
                 wxInstrumentMode.setModeSort(i);
+                if (wxInstrumentSaveReq.getNewModeIdList() != null && wxInstrumentSaveReq.getNewModeIdList().size() > 0) {
+                    if (wxInstrumentSaveReq.getNewModeIdList().contains(modeIdList.get(i))) {
+                        wxInstrumentMode.setIsNew(1);
+                    }
+                }
                 wxInstrumentMode.setStatus(Status.OK.getCode());
                 wxInstrumentMode.setCreateBy(SecurityUtils.getUsername());
                 wxInstrumentMode.setCreateTime(DateUtils.getNowDate());
@@ -285,6 +297,11 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                 wxInstrumentMode.setInstrumentId(wxInstrumentSaveReq.getId());
                 wxInstrumentMode.setModeId(modeIdList.get(i).longValue());
                 wxInstrumentMode.setModeSort(i);
+                if (wxInstrumentSaveReq.getNewModeIdList() != null && wxInstrumentSaveReq.getNewModeIdList().size() > 0) {
+                    if (wxInstrumentSaveReq.getNewModeIdList().contains(modeIdList.get(i))) {
+                        wxInstrumentMode.setIsNew(1);
+                    }
+                }
                 wxInstrumentMode.setStatus(Status.OK.getCode());
                 wxInstrumentMode.setCreateBy(SecurityUtils.getUsername());
                 wxInstrumentMode.setCreateTime(DateUtils.getNowDate());

flossom-ui/src/views/system/instrument/index.vue

@@ -470,7 +470,7 @@
         </el-form-item>
         <el-form-item label="模式" prop="modeIdsValue">
           <template>
-            <el-select v-model="form.modeIdsValue" multiple placeholder="请选择模式">
+            <el-select v-model="form.modeIdsValue" multiple placeholder="请选择模式" @change="modeIdsValueChang">
               <el-option
                 v-for="item in this.mode.modeIdsOptions"
                 :key="item.id"
@@ -483,6 +483,18 @@
             </el-button>
           </template>
         </el-form-item>
+        <el-form-item label="带new标识模式" prop="newModeIdList">
+          <template>
+            <el-select v-model="form.newModeIdList" multiple placeholder="请选择带new标识模式">
+              <el-option
+                v-for="item in newModeOptionList"
+                :key="item.id"
+                :label="item.modeName"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </template>
+        </el-form-item>
         <el-form-item label="生成护理记录最短时间" prop="nursingTime">
           <el-time-picker
             v-model="form.nursingTime"
@@ -716,7 +728,35 @@
             <div slot="tip" class="el-upload__tip">只能上传一个文件</div>
           </el-upload>
         </el-form-item>
-        <el-form-item label="蓝牙关闭图片" prop="bluetoothClosed">
+        <el-form-item label="蓝牙连接中标题" prop="bluetoothConnectingTitle">
+          <el-input v-model="form.bluetoothConnectingTitle" placeholder="请输入蓝牙连接中标题"/>
+        </el-form-item>
+        <el-form-item label="蓝牙连接中文案" prop="bluetoothConnectingContent">
+          <el-input v-model="form.bluetoothConnectingContent" placeholder="请输入蓝牙连接中文案"/>
+        </el-form-item>
+        <el-form-item label="蓝牙连接失败图片" prop="bluetoothConnectFail">
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :headers="headers"
+            :limit="1"
+            :on-exceed="bluetoothFailUploadExceed"
+            :on-success="bluetoothFailUploadSuccess"
+            :on-error="uploadError"
+            :file-list="bluetoothConnectFailFile.fileList"
+            accept=".png,.jpg,.jpeg,.gif,.mpeg,.mp4,.avi,.mov,.wmv"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传一个文件</div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="蓝牙连接失败标题" prop="bluetoothConnectFailTitle">
+          <el-input v-model="form.bluetoothConnectFailTitle" placeholder="请输入蓝牙连接失败标题"/>
+        </el-form-item>
+        <el-form-item label="蓝牙连接失败文案" prop="bluetoothConnectFailContent">
+          <el-input v-model="form.bluetoothConnectFailContent" placeholder="请输入蓝牙连接失败文案"/>
+        </el-form-item>
+        <el-form-item label="蓝牙断开连接图片" prop="bluetoothClosed">
           <el-upload
             class="upload-demo"
             :action="uploadUrl"
@@ -732,6 +772,12 @@
             <div slot="tip" class="el-upload__tip">只能上传一个文件</div>
           </el-upload>
         </el-form-item>
+        <el-form-item label="蓝牙断开连接标题" prop="bluetoothClosedTitle">
+          <el-input v-model="form.bluetoothClosedTitle" placeholder="请输入蓝牙断开连接标题"/>
+        </el-form-item>
+        <el-form-item label="蓝牙断开连接文案" prop="bluetoothClosedContent">
+          <el-input v-model="form.bluetoothClosedContent" placeholder="请输入蓝牙断开连接文案"/>
+        </el-form-item>
         <el-form-item label="iot版本升级说明" prop="iotVersionUpgrade">
           <editor
             v-model="form.iotVersionUpgrade"
@@ -998,6 +1044,11 @@ export default {
         fileList: [],
       },
       /* 蓝牙断开连接文件 */
+      bluetoothConnectFailFile: {
+        uploadHide: false,
+        fileList: [],
+      },
+      /* 蓝牙断开连接文件 */
       bluetoothClosedFile: {
         uploadHide: false,
         fileList: [],
@@ -1123,8 +1174,7 @@ export default {
           instrumentId: null,
           name: null,
           link: null,
-        }
-        ]
+        }]
       },
       /* 模式 */
       mode: {
@@ -1133,6 +1183,7 @@ export default {
         modeIdsOptions: [],
         sortMode: [],
       },
+      newModeOptionList: [],
     }
   },
   created() {
@@ -1199,8 +1250,15 @@ export default {
         isPurchase: 0,
         shoppingAppid: null,
         shoppingPath: null,
+        bluetoothConnectingTitle: null,
+        bluetoothConnectingContent: null,
         bluetoothConnecting: null,
         bluetoothClosed: null,
+        bluetoothClosedTitle: null,
+        bluetoothClosedContent: null,
+        bluetoothConnectFail: null,
+        bluetoothConnectFailTitle: null,
+        bluetoothConnectFailContent: null,
         iotVersionUpgrade: null,
         sortNo: 1000,
         status: null,
@@ -1209,6 +1267,7 @@ export default {
         nurseList: null,
         introduceList: null,
         modeIdsValue: [],
+        newModeIdList: [],
       }
       /* 仪器封面 */
       this.bannerFile = {
@@ -1254,6 +1313,11 @@ export default {
         uploadHide: false,
         fileList: [],
       }
+      /* 蓝牙连接失败文件 */
+      this.bluetoothConnectFailFile = {
+        uploadHide: false,
+        fileList: [],
+      }
       /* 蓝牙断开连接文件 */
       this.bluetoothClosedFile = {
         uploadHide: false,
@@ -1266,6 +1330,7 @@ export default {
         modeIdsOptions: [],
         sortMode: [],
       };
+      this.newModeOptionList = [];
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
@@ -1336,39 +1401,59 @@ export default {
           fileList: [{name: '', url: this.form.serial}],
         }
         /* 手写绑定介绍视频/图片 */
-        this.manualFile = {
-          uploadHide: true,
-          fileList: [
-            {name: '手写绑定介绍视频/图片', url: this.form.manualCodeBinding},
-          ],
+        if (this.form.manualCodeBinding != null) {
+          this.manualFile = {
+            uploadHide: true,
+            fileList: [
+              {name: '手写绑定介绍视频/图片', url: this.form.manualCodeBinding},
+            ],
+          }
         }
         /* 扫码绑定介绍视频/图片 */
-        this.scanFile = {
-          uploadHide: true,
-          fileList: [
-            {name: '扫码绑定介绍视频/图片', url: this.form.scanCodeBinding},
-          ],
+        if (this.form.scanCodeBinding != null) {
+          this.scanFile = {
+            uploadHide: true,
+            fileList: [
+              {name: '扫码绑定介绍视频/图片', url: this.form.scanCodeBinding},
+            ],
+          }
         }
         /* iot升级数据文件 */
-        this.iotUpgradeFile = {
-          uploadHide: true,
-          fileList: [
-            {name: 'iot升级数据文件', url: this.form.iotUpgradeData},
-          ],
+        if (this.form.iotUpgradeData != null) {
+          this.iotUpgradeFile = {
+            uploadHide: true,
+            fileList: [
+              {name: 'iot升级数据文件', url: this.form.iotUpgradeData},
+            ],
+          }
         }
+
         /* 蓝牙连接文件 */
-        this.bluetoothConnectFile = {
-          uploadHide: true,
-          fileList: [
-            {name: '蓝牙连接文件', url: this.form.bluetoothConnecting},
-          ],
+        if (this.form.bluetoothConnecting != null) {
+          this.bluetoothConnectFile = {
+            uploadHide: true,
+            fileList: [
+              {name: '蓝牙连接文件', url: this.form.bluetoothConnecting},
+            ],
+          }
+        }
+        /* 蓝牙连接失败文件 */
+        if (this.form.bluetoothConnectFail != null) {
+          this.bluetoothConnectFailFile = {
+            uploadHide: true,
+            fileList: [
+              {name: '蓝牙连接失败文件', url: this.form.bluetoothConnectFail},
+            ],
+          }
         }
         /* 蓝牙断开连接文件 */
-        this.bluetoothClosedFile = {
-          uploadHide: false,
-          fileList: [
-            {name: '蓝牙断开连接文件', url: this.form.bluetoothClosed},
-          ],
+        if (this.form.bluetoothClosed != null) {
+          this.bluetoothClosedFile = {
+            uploadHide: false,
+            fileList: [
+              {name: '蓝牙断开连接文件', url: this.form.bluetoothClosed},
+            ],
+          }
         }
         // 额外打卡时间
         if (this.form.isExtraClock == 1) {
@@ -1395,7 +1480,17 @@ export default {
           if (response.code != 200) {
             this.$message.error('模式获取失败')
           }
-          this.mode.modeIdsOptions = response.data
+          this.mode.modeIdsOptions = response.data;
+
+          /* 带new标识选项回显 */
+          if (this.form.modeIdsValue != null && this.form.modeIdsValue.length > 0) {
+            let temp = [];
+            for (let i = 0; i < this.form.modeIdsValue.length; i++) {
+              let filterModeArr = this.mode.modeIdsOptions.filter((item) => item.id == this.form.modeIdsValue[i])
+              temp.push(filterModeArr[0]);
+            }
+            this.newModeOptionList = temp;
+          }
         })
       })
     },
@@ -1546,6 +1641,17 @@ export default {
       }
     },
     /*  蓝牙断开连接图片 */
+    bluetoothFailUploadExceed(files, fileList) {
+      this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`)
+    },
+    bluetoothFailUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.bluetoothConnectFail = response.data.url
+      } else {
+        this.$message.error('图片插入失败')
+      }
+    },
+    /*  蓝牙断开连接图片 */
     bluetoothClosedUploadExceed(files, fileList) {
       this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`)
     },
@@ -1862,9 +1968,6 @@ export default {
         this.mode.modeSortVisible = true;
       }
     },
-    openModeIdDialog2() {
-      console.log(this.form.modeIdsValue);
-    },
     handleCloseMode() {
       this.mode.modeIdsValueTemp = [];
       this.mode.sortMode = [];
@@ -1878,6 +1981,18 @@ export default {
       this.form.modeIdsValue = newSort;
       this.handleCloseMode()
     },
+    modeIdsValueChang() {
+      let temp = [];
+      if (this.form.modeIdsValue.length > 0) {
+        for (let i = 0; i < this.form.modeIdsValue.length; i++) {
+          let filterModeArr = this.mode.modeIdsOptions.filter((item) => item.id == this.form.modeIdsValue[i])
+          temp.push(filterModeArr[0]);
+        }
+      }
+      this.newModeOptionList = temp;
+    },
+
+
   },
 }
 </script>