diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index 97ed532..e51e292 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -39,16 +39,17 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:instrument:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="instrumentList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" fixed="left" width="55" align="center" />
-      <el-table-column label="升序排序" align="center" prop="sortNo" />
-      <el-table-column label="仪器ID" align="center" prop="id" />
-      <el-table-column label="仪器类型" align="center" prop="type" >
+      <el-table-column type="selection" fixed="left" width="55" align="center"/>
+      <el-table-column label="升序排序" align="center" prop="sortNo"/>
+      <el-table-column label="仪器ID" align="center" prop="id"/>
+      <el-table-column label="仪器类型" align="center" prop="type">
         <template slot-scope="scope">
           <span v-show="scope.row.type == 1">普通仪器</span>
           <span v-show="scope.row.type == 2">iot仪器</span>
@@ -65,10 +66,10 @@
         </template>
       </el-table-column>
       <el-table-column label="仪器名称" align="center" prop="name" width="150px"/>
-      <el-table-column label="仪器型号" align="center" prop="model" />
-      <el-table-column label="保修日期" align="center" prop="guarantee" >
+      <el-table-column label="仪器型号" align="center" prop="model"/>
+      <el-table-column label="保修日期" align="center" prop="guarantee">
         <template slot-scope="scope">
-          <span v-show="scope.row.guarantee != null">{{scope.row.guarantee}}年</span>
+          <span v-show="scope.row.guarantee != null">{{ scope.row.guarantee }}年</span>
         </template>
       </el-table-column>
       <el-table-column label="小程序标签" align="center" prop="miniTagNames" width="150px">
@@ -85,8 +86,8 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="日常打卡奖励" align="center" prop="dailyClockCredit" />
-      <el-table-column label="额外打卡奖励" align="center" prop="extraClockCredit" />
+      <el-table-column label="日常打卡奖励" align="center" prop="dailyClockCredit"/>
+      <el-table-column label="额外打卡奖励" align="center" prop="extraClockCredit"/>
       <el-table-column label="操作" align="center" width="200px" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -95,34 +96,40 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:instrument:edit']"
-          >编辑</el-button>
+          >编辑
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-          >设置小程序可见标签</el-button>
+          >设置小程序可见标签
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-          >设置微信可见标签</el-button>
+          >设置微信可见标签
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-          >正品控名称配置</el-button>
+          >正品控名称配置
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-          >配置说明书</el-button>
+          >配置说明书
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:instrument:remove']"
-          >隐藏</el-button>
+          >隐藏
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -136,112 +143,267 @@
     />
 
     <!-- 添加或修改仪器列对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="仪器名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入仪器名称" />
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+        <el-form-item label="排序" prop="sortNo">
+          <el-input-number v-model="form.sortNo" controls-position="right" :min="0" :precision="0"
+                           placeholder="请输入排序:值越大，排序越前"></el-input-number>
+        </el-form-item>
+        <el-form-item label="仪器封面" prop="banner" width="150px">
+          <template>
+            <!-- 仪器封面 -->
+            <el-upload :action="uploadUrl"
+                       :headers="headers"
+                       :file-list="bannerFile.fileList"
+                       list-type="picture-card"
+                       accept=".jpg,.png"
+                       :limit="1"
+                       :class="{hide: bannerFile.uploadHide}"
+                       :on-change="bannerUploadChange"
+                       :on-remove="bannerUploadRemove"
+                       :on-success="bannerUploadSuccess"
+                       :on-error="uploadError"
+            >
+              <i slot="default" class="el-icon-plus"></i>
+              <div slot="file" slot-scope="{file}">
+                <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                <span class="el-upload-list__item-actions">
+                  <span class="el-upload-list__item-preview" @click="bannerPicturePreview(file)">
+                    <i class="el-icon-zoom-in"></i>
+                  </span>
+                  <span v-if="!bannerFile.disabled" class="el-upload-list__item-delete"
+                        @click="bannerUploadRemove(file)">
+                    <i class="el-icon-delete"></i>
+                  </span>
+                </span>
+              </div>
+              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
+            </el-upload>
+            <!-- 预览窗口 -->
+            <el-dialog :visible.sync="bannerFile.dialogVisible" append-to-body>
+              <img width="100%" :src="bannerFile.dialogImageUrl" alt="">
+            </el-dialog>
+          </template>
+        </el-form-item>
+        <!--  仪器LOGO  -->
+        <el-form-item label="仪器LOGO" prop="logo">
+          <template>
+            <el-upload :action="uploadUrl"
+                       :headers="headers"
+                       :file-list="logoFile.fileList"
+                       list-type="picture-card"
+                       accept=".jpg,.png"
+                       :limit="1"
+                       :class="{hide: logoFile.uploadHide}"
+                       :on-change="logoUploadChange"
+                       :on-remove="logoUploadRemove"
+                       :on-success="logoUploadSuccess"
+                       :on-error="uploadError"
+            >
+              <i slot="default" class="el-icon-plus"></i>
+              <div slot="file" slot-scope="{file}">
+                <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                <span class="el-upload-list__item-actions">
+                  <span class="el-upload-list__item-preview" @click="logoPicturePreview(file)">
+                    <i class="el-icon-zoom-in"></i>
+                  </span>
+                  <span v-if="!logoFile.disabled" class="el-upload-list__item-delete" @click="logoUploadRemove(file)">
+                    <i class="el-icon-delete"></i>
+                  </span>
+                </span>
+              </div>
+              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
+            </el-upload>
+            <!-- 预览窗口 -->
+            <el-dialog :visible.sync="logoFile.dialogVisible" append-to-body>
+              <img width="100%" :src="logoFile.dialogImageUrl" alt="">
+            </el-dialog>
+          </template>
         </el-form-item>
-        <el-form-item label="iot仪器特有：仪器型号" prop="model">
-          <el-input v-model="form.model" placeholder="请输入iot仪器特有：仪器型号" />
+        <!--  仪器序列号  -->
+        <el-form-item label="仪器序列号图片" prop="serial">
+          <template>
+            <el-upload :action="uploadUrl"
+                       :headers="headers"
+                       :file-list="serialFile.fileList"
+                       list-type="picture-card"
+                       accept=".jpg,.png"
+                       :limit="1"
+                       :class="{hide: serialFile.uploadHide}"
+                       :on-change="serialUploadChange"
+                       :on-remove="serialUploadRemove"
+                       :on-success="serialUploadSuccess"
+                       :on-error="uploadError"
+            >
+              <i slot="default" class="el-icon-plus"></i>
+              <div slot="file" slot-scope="{file}">
+                <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                <span class="el-upload-list__item-actions">
+                  <span class="el-upload-list__item-preview" @click="serialPicturePreview(file)">
+                    <i class="el-icon-zoom-in"></i>
+                  </span>
+                  <span v-if="!serialFile.disabled" class="el-upload-list__item-delete"
+                        @click="serialUploadRemove(file)">
+                    <i class="el-icon-delete"></i>
+                  </span>
+                </span>
+              </div>
+              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
+            </el-upload>
+            <!-- 预览窗口 -->
+            <el-dialog :visible.sync="serialFile.dialogVisible" append-to-body>
+              <img width="100%" :src="serialFile.dialogImageUrl" alt="">
+            </el-dialog>
+          </template>
         </el-form-item>
-        <el-form-item label="仪器封面" prop="banner">
-          <el-input v-model="form.banner" placeholder="请输入仪器封面" />
+        <el-form-item label="手写绑定介绍视频/图片" prop="manualCodeBinding">
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :headers="headers"
+            :limit="1"
+            :on-exceed="manualUploadExceed"
+            :on-success="manualUploadSuccess"
+            :on-error="uploadError"
+            :file-list="manualFile.fileList">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传一个文件，且视频不超过10M，图片不超过1M</div>
+          </el-upload>
         </el-form-item>
-        <el-form-item label="仪器logo图" prop="logo">
-          <el-input v-model="form.logo" placeholder="请输入仪器logo图" />
+        <el-form-item label="扫码绑定介绍图片" prop="scanCodeBinding">
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :headers="headers"
+            :limit="1"
+            :on-exceed="scanUploadExceed"
+            :on-success="scanUploadSuccess"
+            :on-error="uploadError"
+            :file-list="scanFile.fileList">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传一个文件，且视频不超过10M，图片不超过1M</div>
+          </el-upload>
         </el-form-item>
-        <el-form-item label="序列号位置图片" prop="serial">
-          <el-input v-model="form.serial" placeholder="请输入序列号位置图片" />
+        <el-form-item label="仪器名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入仪器名称"/>
         </el-form-item>
         <el-form-item label="保修日期" prop="guarantee">
-          <el-input v-model="form.guarantee" placeholder="请输入保修日期" />
+          <el-input-number :min="0" :precision="0" v-model="form.guarantee"></el-input-number>
         </el-form-item>
         <el-form-item label="日常打卡获得积分" prop="dailyClockCredit">
-          <el-input v-model="form.dailyClockCredit" placeholder="请输入日常打卡获得积分" />
+          <el-input-number :min="0" :precision="0" v-model="form.dailyClockCredit"></el-input-number>
         </el-form-item>
-        <el-form-item label="额外打卡奖励积分" prop="extraClockCredit">
-          <el-input v-model="form.extraClockCredit" placeholder="请输入额外打卡奖励积分" />
+        <el-form-item label="开启额外打卡奖励" prop="dailyClockCredit">
+          <el-switch v-model="form.isExtraClock" :active-value="1" :inactive-value="0" active-color="#13ce66"
+                     inactive-color="#DCDCDC">
+          </el-switch>
         </el-form-item>
-        <el-form-item label="额外打卡时间开始" prop="startTime">
-          <el-date-picker clearable
-            v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择额外打卡时间开始">
-          </el-date-picker>
+        <el-form-item v-if="form.isExtraClock == 1" label="额外打卡奖励积分" prop="extraClockCredit">
+          <el-input-number :min="0" :precision="0" v-model="form.extraClockCredit"></el-input-number>
         </el-form-item>
-        <el-form-item label="额外打卡时间结束" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择额外打卡时间结束">
+        <el-form-item v-if="form.isExtraClock == 1" label="额外打卡时间" prop="extraClockTimeRange">
+          <el-date-picker
+            v-model="form.extraClockTimeRange"
+            clearable
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="标签ID(xxxx,xxxx,xxx)" prop="miniTagIds">
-          <el-input v-model="form.miniTagIds" placeholder="请输入标签ID(xxxx,xxxx,xxx)" />
+        <el-form-item label="仪器类型" prop="type">
+          <el-select v-model="form.type" style="width: 50%">
+            <el-option label="非IOT仪器" :value="1"></el-option>
+            <el-option label="IOT仪器" :value="2"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="标签名字(xxx,xxx,xxx)" prop="miniTagNames">
-          <el-input v-model="form.miniTagNames" placeholder="请输入标签名字(xxx,xxx,xxx)" />
+        <el-form-item v-if="form.type == 2" label="仪器型号" prop="model">
+          <el-select v-model="form.model" style="width: 50%">
+            <el-option label="FR200" value="FR200"></el-option>
+            <el-option label="WL200" value="WL200"></el-option>
+            <el-option label="FR380" value="FR380"></el-option>
+            <el-option label="FR390" value="FR390"></el-option>
+            <el-option label="M01" value="M01"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="标签ID(xxxx,xxxx,xxx)" prop="wecomTagIds">
-          <el-input v-model="form.wecomTagIds" placeholder="请输入标签ID(xxxx,xxxx,xxx)" />
+        <el-form-item label="模式ID" prop="sceneIds">
+          <el-input v-model="form.sceneIds" placeholder="请输入模式ID"/>
         </el-form-item>
-        <el-form-item label="标签名称(xxx,xxx,xxx)" prop="wecomTagNames">
-          <el-input v-model="form.wecomTagNames" placeholder="请输入标签名称(xxx,xxx,xxx)" />
+        <el-form-item label="模式名称" prop="sceneNames">
+          <el-input v-model="form.sceneNames" placeholder="请输入模式名称"/>
         </el-form-item>
-        <el-form-item label="场景ID(xxxx,xxxx,xxx)" prop="sceneIds">
-          <el-input v-model="form.sceneIds" placeholder="请输入场景ID(xxxx,xxxx,xxx)" />
-        </el-form-item>
-        <el-form-item label="场景名称(xxx,xxx,xxx)" prop="sceneNames">
-          <el-input v-model="form.sceneNames" placeholder="请输入场景名称(xxx,xxx,xxx)" />
-        </el-form-item>
-        <el-form-item label="护理时长" prop="nursingTime">
-          <el-date-picker clearable
+        <el-form-item label="生成护理记录最短时间" prop="nursingTime">
+          <el-time-picker
             v-model="form.nursingTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            value-format="HH:mm:ss"
             placeholder="请选择护理时长">
-          </el-date-picker>
+          </el-time-picker>
         </el-form-item>
         <el-form-item label="iot版本" prop="iotVersion">
-          <el-input v-model="form.iotVersion" placeholder="请输入iot版本" />
+          <el-input v-model="form.iotVersion" placeholder="请输入iot版本"/>
         </el-form-item>
         <el-form-item label="iot升级数据文件" prop="iotUpgradeData">
-          <el-input v-model="form.iotUpgradeData" placeholder="请输入iot升级数据文件" />
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :headers="headers"
+            :limit="1"
+            :on-exceed="iotUpgradeUploadExceed"
+            :on-success="iotUpgradeUploadSuccess"
+            :on-error="uploadError"
+            :file-list="iotUpgradeFile.fileList">
+            <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="是否开启扫机身码：0、关闭 1、开启" prop="isScanCode">
-          <el-input v-model="form.isScanCode" placeholder="请输入是否开启扫机身码：0、关闭 1、开启" />
+        <el-form-item label="扫机身码" prop="isScanCode">
+          <el-switch v-model="form.isScanCode" active-value="1" inactive-value="0" active-color="#13ce66"
+                     inactive-color="#DCDCDC">
+          </el-switch>
         </el-form-item>
-        <el-form-item label="是否支持购买：0、不支持 1、支持" prop="isPurchase">
-          <el-input v-model="form.isPurchase" placeholder="请输入是否支持购买：0、不支持 1、支持" />
+        <el-form-item label="是否支持购买" prop="isPurchase">
+          <el-select v-model="form.isPurchase" style="width: 50%">
+            <el-option label="是" :value="1"></el-option>
+            <el-option label="否" :value="0"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="商城小程序appid" prop="shoppingAppid">
-          <el-input v-model="form.shoppingAppid" placeholder="请输入商城小程序appid" />
+        <el-form-item v-if="form.isPurchase == 1" label="商城小程序appid" prop="shoppingAppid">
+          <el-input v-model="form.shoppingAppid" placeholder="请输入商城小程序appid"/>
         </el-form-item>
-        <el-form-item label="商城小程序path" prop="shoppingPath">
-          <el-input v-model="form.shoppingPath" placeholder="请输入商城小程序path" />
+        <el-form-item v-if="form.isPurchase == 1" label="商城小程序path" prop="shoppingPath">
+          <el-input v-model="form.shoppingPath" placeholder="请输入商城小程序path"/>
         </el-form-item>
         <el-form-item label="蓝牙连接中图片" prop="bluetoothConnecting">
-          <el-input v-model="form.bluetoothConnecting" placeholder="请输入蓝牙连接中图片" />
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :headers="headers"
+            :limit="1"
+            :on-exceed="bluetoothConnectUploadExceed"
+            :on-success="bluetoothConnectUploadSuccess"
+            :on-error="uploadError"
+            :file-list="bluetoothConnectFile.fileList">
+            <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="bluetoothClosed">
-          <el-input v-model="form.bluetoothClosed" placeholder="请输入蓝牙关闭图片" />
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :headers="headers"
+            :limit="1"
+            :on-exceed="bluetoothClosedUploadExceed"
+            :on-success="bluetoothClosedUploadSuccess"
+            :on-error="uploadError"
+            :file-list="bluetoothClosedFile.fileList">
+            <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="iot版本升级说明" prop="iotVersionUpgrade">
-          <el-input v-model="form.iotVersionUpgrade" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="排序:值越大，排序越前" prop="sortNo">
-          <el-input v-model="form.sortNo" placeholder="请输入排序:值越大，排序越前" />
-        </el-form-item>
-        <el-form-item label="手动绑定介绍图片" prop="manualCodeBinding">
-          <el-input v-model="form.manualCodeBinding" placeholder="请输入手动绑定介绍图片" />
-        </el-form-item>
-        <el-form-item label="扫码绑定介绍图片" prop="scanCodeBinding">
-          <el-input v-model="form.scanCodeBinding" placeholder="请输入扫码绑定介绍图片" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入${comment}" />
+          <editor v-model="form.iotVersionUpgrade" placeholder="请输入内容" :min-height="192"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -253,7 +415,8 @@
 </template>
 
 <script>
-import { listInstrument, getInstrument, delInstrument, addInstrument, updateInstrument } from "@/api/system/instrument";
+import {listInstrument, getInstrument, delInstrument, addInstrument, updateInstrument} from "@/api/system/instrument";
+import {getToken} from "@/utils/auth";
 
 export default {
   name: "Instrument",
@@ -285,41 +448,113 @@ export default {
         name: null,
         type: null,
       },
+      /* 文件上传地址 */
+      uploadUrl: process.env.VUE_APP_BASE_API + "/file/upload",
+      headers: {
+        Authorization: 'Bearer ' + getToken(),
+      },
+      /* 仪器封面 */
+      bannerFile: {
+        uploadHide: false,
+        dialogImageUrl: '',
+        dialogVisible: false,
+        disabled: false,
+        fileList: [],
+      },
+      /* 仪器logo */
+      logoFile: {
+        uploadHide: false,
+        dialogImageUrl: '',
+        dialogVisible: false,
+        disabled: false,
+        fileList: [],
+      },
+      /* 序列号图片 */
+      serialFile: {
+        uploadHide: false,
+        dialogImageUrl: '',
+        dialogVisible: false,
+        disabled: false,
+        fileList: [],
+      },
+      /* 手写绑定介绍视频/图片 */
+      manualFile: {
+        uploadHide: false,
+        fileList: [],
+      },
+      /* 扫码绑定介绍视频/图片 */
+      scanFile: {
+        uploadHide: false,
+        fileList: [],
+      },
+      /* iot升级数据文件 */
+      iotUpgradeFile: {
+        uploadHide: false,
+        fileList: [],
+      },
+      /* 蓝牙连接文件 */
+      bluetoothConnectFile: {
+        uploadHide: false,
+        fileList: [],
+      },
+      /* 蓝牙断开连接文件 */
+      bluetoothClosedFile: {
+        uploadHide: false,
+        fileList: [],
+      },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        name: [
-          { required: true, message: "仪器名称不能为空", trigger: "blur" }
-        ],
-        model: [
-          { required: true, message: "iot仪器特有：仪器型号不能为空", trigger: "blur" }
+        sortNo: [
+          {required: true, message: "排序不能为空", trigger: 'blur'}
         ],
         banner: [
-          { required: true, message: "仪器封面不能为空", trigger: "blur" }
+          {required: true, message: "仪器封面不能为空"}
         ],
         logo: [
-          { required: true, message: "仪器logo图不能为空", trigger: "blur" }
+          {required: true, message: "仪器logo不能为空"}
         ],
         serial: [
-          { required: true, message: "序列号位置图片不能为空", trigger: "blur" }
+          {required: true, message: "序列号图片不能为空"}
+        ],
+        name: [
+          {required: true, message: "仪器名称不能为空", trigger: "blur"}
         ],
         guarantee: [
-          { required: true, message: "保修日期不能为空", trigger: "blur" }
+          {required: true, message: "请选择保修日期", trigger: 'blur'}
+        ],
+        dailyClockCredit: [
+          {required: true, message: "日常打卡奖励积分不能为空", trigger: 'blur'}
+        ],
+        isExtraClock: [
+          {required: true, message: "请选择是否开启额外打卡奖励"}
+        ],
+        extraClockCredit: [
+          {required: true, message: "额外打卡奖励积分不能为空", trigger: 'blur'}
         ],
-        sceneIds: [
-          { required: true, message: "场景ID(xxxx,xxxx,xxx)不能为空", trigger: "blur" }
+        extraClockTimeRange: [
+          {required: true, message: "额外打卡时间段不能为空", trigger: "blur"}
+        ],
+        type: [
+          {required: true, message: "仪器类型不能为空", trigger: 'change'}
+        ],
+        model: [
+          {required: true, message: "仪器型号不能为空", trigger: 'change'}
         ],
         nursingTime: [
-          { required: true, message: "护理时长不能为空", trigger: "blur" }
+          {required: true, message: "生成护理记录最短时长不能为空", trigger: "change"}
         ],
-        manualCodeBinding: [
-          { required: true, message: "手动绑定介绍图片不能为空", trigger: "blur" }
+        isPurchase: [
+          {required: true, message: "是否支持购买"}
         ],
-        scanCodeBinding: [
-          { required: true, message: "扫码绑定介绍图片不能为空", trigger: "blur" }
+        shoppingAppid: [
+          {required: true, message: "购买商城APPID不能为空", trigger: "blur"}
         ],
-      }
+        shoppingPath: [
+          {required: true, message: "购买商城PATH不能为空", trigger: "blur"}
+        ],
+      },
     };
   },
   created() {
@@ -345,16 +580,17 @@ export default {
       this.form = {
         id: null,
         name: null,
-        type: null,
-        model: null,
+        type: 1,
+        model: "WL200",
         banner: null,
         logo: null,
         serial: null,
-        guarantee: null,
-        dailyClockCredit: null,
-        extraClockCredit: null,
-        startTime: null,
-        endTime: null,
+        guarantee: 1,
+        dailyClockCredit: 0,
+        isExtraClock: 0,
+        extraClockCredit: 0,
+        /* 额外打卡时间范围 */
+        extraClockTimeRange: [],
         miniTagIds: null,
         miniTagNames: null,
         wecomTagIds: null,
@@ -364,23 +600,68 @@ export default {
         nursingTime: null,
         iotVersion: null,
         iotUpgradeData: null,
-        isScanCode: null,
+        isScanCode: 0,
         isPurchase: null,
         shoppingAppid: null,
         shoppingPath: null,
         bluetoothConnecting: null,
         bluetoothClosed: null,
         iotVersionUpgrade: null,
-        sortNo: null,
+        sortNo: 1000,
         status: null,
         manualCodeBinding: null,
         scanCodeBinding: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null,
       };
+      /* 仪器封面 */
+      this.bannerFile= {
+        uploadHide: false,
+          dialogImageUrl: '',
+          dialogVisible: false,
+          disabled: false,
+          fileList: [],
+      },
+      /* 仪器logo */
+      this.logoFile= {
+        uploadHide: false,
+          dialogImageUrl: '',
+          dialogVisible: false,
+          disabled: false,
+          fileList: [],
+      },
+      /* 序列号图片 */
+      this.serialFile= {
+        uploadHide: false,
+          dialogImageUrl: '',
+          dialogVisible: false,
+          disabled: false,
+          fileList: [],
+      },
+      /* 手写绑定介绍视频/图片 */
+      this.manualFile= {
+        uploadHide: false,
+          fileList: [],
+      },
+      /* 扫码绑定介绍视频/图片 */
+      this.scanFile= {
+        uploadHide: false,
+          fileList: [],
+      },
+      /* iot升级数据文件 */
+      this.iotUpgradeFile= {
+        uploadHide: false,
+          fileList: [],
+      },
+      /* 蓝牙连接文件 */
+      this.bluetoothConnectFile= {
+        uploadHide: false,
+          fileList: [],
+      },
+      /* 蓝牙断开连接文件 */
+      this.bluetoothClosedFile= {
+        uploadHide: false,
+          fileList: [],
+      },
+      // this.form.iotVersionUpgrade = null,
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -396,7 +677,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -420,17 +701,19 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateInstrument(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+            // updateInstrument(this.form).then(response => {
+            //   this.$modal.msgSuccess("修改成功");
+            //   this.open = false;
+            //   this.getList();
+            // });
           } else {
-            addInstrument(this.form).then(response => {
+            console.log(this.form)
+            /*addInstrument(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
-            });
+            });*/
           }
         }
       });
@@ -438,13 +721,139 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除仪器列编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除仪器列编号为"' + ids + '"的数据项？').then(function () {
         return delInstrument(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
+    },
+    /* 文件上传失败 */
+    uploadError() {
+      this.$message.error('文件上传失败')
+    },
+    /** 仪器封面操作 */
+    bannerPicturePreview(file) {
+      this.bannerFile.dialogImageUrl = file.url;
+      this.bannerFile.dialogVisible = true;
+    },
+    bannerUploadRemove(file) {
+      this.bannerFile.fileList = [];
+      this.bannerFile.uploadHide = this.bannerFile.fileList.length >= 1;
+    },
+    bannerUploadChange(file, fileList) {
+      this.bannerFile.fileList = fileList;
+      this.bannerFile.uploadHide = this.bannerFile.fileList.length >= 1;
+    },
+    bannerUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.banner = response.data.url
+      } else {
+        this.$message.error('图片插入失败')
+      }
+    },
+    /** logo 操作 */
+    logoPicturePreview(file) {
+      this.logoFile.dialogImageUrl = file.url;
+      this.logoFile.dialogVisible = true;
+    },
+    logoUploadRemove(file) {
+      this.logoFile.fileList = [];
+      this.logoFile.uploadHide = this.logoFile.fileList.length >= 1;
+    },
+    logoUploadChange(file, fileList) {
+      this.logoFile.fileList = fileList;
+      this.logoFile.uploadHide = this.logoFile.fileList.length >= 1;
+    },
+    logoUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.logo = response.data.url
+      } else {
+        this.$message.error('图片插入失败')
+      }
+    },
+    /** 序列号图片 操作 */
+    serialPicturePreview(file) {
+      this.serialFile.dialogImageUrl = file.url;
+      this.serialFile.dialogVisible = true;
+    },
+    serialUploadRemove(file) {
+      this.serialFile.fileList = [];
+      this.serialFile.uploadHide = this.serialFile.fileList.length >= 1;
+    },
+    serialUploadChange(file, fileList) {
+      this.serialFile.fileList = fileList;
+      this.serialFile.uploadHide = this.serialFile.fileList.length >= 1;
+    },
+    serialUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.serial = response.data.url
+      } else {
+        this.$message.error('图片插入失败')
+      }
+    },
+    /** 手写绑定介绍视频/图片 操作 */
+    manualUploadExceed(files, fileList) {
+      this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`);
+    },
+    manualUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.manualCodeBinding = response.data.url
+      } else {
+        this.$message.error('图片插入失败')
+      }
+    },
+    /** 扫码绑定介绍视频/图片 操作 */
+    scanUploadExceed(files, fileList) {
+      this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`);
+    },
+    scanUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.scanCodeBinding = response.data.url
+      } else {
+        this.$message.error('图片插入失败')
+      }
+    },
+    /*  iot升级数据文件 */
+    iotUpgradeUploadExceed(files, fileList) {
+      this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`);
+    },
+    iotUpgradeUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.iotUpgradeData = response.data.url
+      } else {
+        this.$message.error('图片插入失败')
+      }
+    },
+    /*  蓝牙连接图片 */
+    bluetoothConnectUploadExceed(files, fileList) {
+      this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`);
+    },
+    bluetoothConnectUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.bluetoothConnecting = response.data.url
+      } else {
+        this.$message.error('图片插入失败')
+      }
+    },
+    /*  蓝牙断开连接图片 */
+    bluetoothClosedUploadExceed(files, fileList) {
+      this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`);
+    },
+    bluetoothClosedUploadSuccess(response, file) {
+      if (response.code == 200) {
+        this.form.bluetoothClosed = response.data.url
+      } else {
+        this.$message.error('图片插入失败')
+      }
     },
   }
 };
 </script>
+
+<style lang="less" scoped>
+/deep/ .hide .el-upload--picture-card {
+  display: none;
+}
+</style>