From e257ecef7fd22761495f08770550c7b3dec7ac2a Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 10 Jan 2024 11:45:40 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=AF=E8=A7=81=E6=A0=87=E7=AD=BE=E5=92=8C=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=81=E5=BE=AE=E5=8F=AF=E8=A7=81=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WxInstrumentServiceImpl.java |  31 +++++
 flossom-ui/src/api/system/instrument.js       |  22 +++
 .../src/views/system/instrument/index.vue     | 128 ++++++++++++++++--
 3 files changed, 170 insertions(+), 11 deletions(-)

diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
index 28ec5fb..5d545ff 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
@@ -1,9 +1,12 @@
 package com.flossom.system.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
 
+import com.flossom.common.core.domain.entity.SysTag;
 import com.flossom.common.core.domain.entity.WxInstrument;
 import com.flossom.common.core.domain.req.WxInstrumentReq;
+import com.flossom.common.core.mapper.SysTagMapper;
 import com.flossom.common.core.mapper.WxInstrumentMapper;
 import com.flossom.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +25,9 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
     @Autowired
     private WxInstrumentMapper wxInstrumentMapper;
 
+    @Autowired
+    private SysTagMapper sysTagMapper;
+
     /**
      * 查询仪器列
      *
@@ -69,6 +75,31 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
      */
     @Override
     public int updateWxInstrument(WxInstrument wxInstrument) {
+        // 处理小程序标签和企微标签
+        if (wxInstrument.getMiniTagIds() != null) {
+            List<String> tagIdList = Arrays.asList(wxInstrument.getMiniTagIds().split(","));
+            StringBuilder tagNames = new StringBuilder();
+            for (int i = 0; i < tagIdList.size(); i++) {
+                SysTag sysTag = sysTagMapper.selectDeptById(Long.valueOf(tagIdList.get(i)));
+                tagNames.append(sysTag.getTagName());
+                if (i < tagIdList.size() - 1) {
+                    tagNames.append(",");
+                }
+            }
+            wxInstrument.setMiniTagNames(tagNames.toString());
+        }
+        if (wxInstrument.getWecomTagIds() != null) {
+            List<String> tagIdList = Arrays.asList(wxInstrument.getWecomTagIds().split(","));
+            StringBuilder tagNames = new StringBuilder();
+            for (int i = 0; i < tagIdList.size(); i++) {
+                SysTag sysTag = sysTagMapper.selectDeptById(Long.valueOf(tagIdList.get(i)));
+                tagNames.append(sysTag.getTagName());
+                if (i < tagIdList.size() - 1) {
+                    tagNames.append(",");
+                }
+            }
+            wxInstrument.setWecomTagNames(tagNames.toString());
+        }
         wxInstrument.setUpdateTime(DateUtils.getNowDate());
         return wxInstrumentMapper.updateWxInstrument(wxInstrument);
     }
diff --git a/flossom-ui/src/api/system/instrument.js b/flossom-ui/src/api/system/instrument.js
index ef515ff..7cda1b4 100644
--- a/flossom-ui/src/api/system/instrument.js
+++ b/flossom-ui/src/api/system/instrument.js
@@ -42,3 +42,25 @@ export function delInstrument(id) {
     method: 'delete'
   })
 }
+
+/* 获取小程序标签树 */
+export function getMiniProgramTagTree() {
+  return request({
+    url: '/system/tagInfo/tagTree',
+    method: 'get',
+    params: {
+      type: 1
+    }
+  })
+}
+
+/* 获取企微标签树 */
+export function getWecomTagTree() {
+  return request({
+    url: '/system/tagInfo/tagTree',
+    method: 'get',
+    params: {
+      type: 2
+    }
+  })
+}
diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index eb8160d..d768114 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -102,13 +102,15 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="editMiniProgramTags(scope.row)"
           >设置小程序可见标签
           </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-          >设置微信可见标签
+            @click="editWecomTags(scope.row)"
+          >设置企微可见标签
           </el-button>
           <el-button
             size="mini"
@@ -368,7 +370,7 @@
           </el-upload>
         </el-form-item>
         <el-form-item label="扫机身码" prop="isScanCode">
-          <el-switch v-model="form.isScanCode" active-value="1" inactive-value="0" active-color="#13ce66"
+          <el-switch v-model="form.isScanCode" :active-value="1" :inactive-value="0" active-color="#13ce66"
                      inactive-color="#DCDCDC">
           </el-switch>
         </el-form-item>
@@ -421,15 +423,61 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 编辑小程序可见标签   -->
+    <el-dialog title="编辑小程序可见标签" :visible.sync="miniProgramTag.visible" width="50%">
+      <el-form ref="miniProgramTag" :model="miniProgramTag" label-width="150px">
+        <el-row>
+          <el-col :span="100">
+            <el-form-item label="小程序标签" prop="selectTagList" label-width="100px">
+              <treeselect v-model="miniProgramTag.selectTagList" :options="miniProgramTag.optionTree" :multiple="true"
+                          :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="miniProgramTag.visible = false">取 消</el-button>
+        <el-button type="primary" @click="submitMiniProgramTagList">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 编辑企微可见标签   -->
+    <el-dialog title="编辑企微可见标签" :visible.sync="wecomTag.visible" width="50%">
+      <el-form :model="wecomTag" label-width="150px">
+        <el-row>
+          <el-col :span="100">
+            <el-form-item label="小程序标签" prop="tagIdArray" label-width="100px">
+              <treeselect v-model="wecomTag.selectTagList" :options="wecomTag.optionTree" :multiple="true"
+                          :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="wecomTag.visible = false">重 置</el-button>
+        <el-button type="primary" @click="submitWecomTagList">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {listInstrument, getInstrument, delInstrument, addInstrument, updateInstrument} from "@/api/system/instrument";
+import {
+  listInstrument,
+  getInstrument,
+  delInstrument,
+  addInstrument,
+  updateInstrument,
+  getMiniProgramTagTree, getWecomTagTree
+} from "@/api/system/instrument";
 import {getToken} from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Instrument",
+  components: {Treeselect},
   data() {
     return {
       // 遮罩层
@@ -512,6 +560,20 @@ export default {
         uploadHide: false,
         fileList: [],
       },
+      /* 小程序可见标签 */
+      miniProgramTag: {
+        userId: null,
+        selectTagList: null,
+        visible: false,
+        optionTree: [],
+      },
+      /* 企微可见标签 */
+      wecomTag: {
+        userId: null,
+        selectTagList: null,
+        visible: false,
+        optionTree: [],
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -611,7 +673,7 @@ export default {
         iotVersion: null,
         iotUpgradeData: null,
         isScanCode: 0,
-        isPurchase: null,
+        isPurchase: 0,
         shoppingAppid: null,
         shoppingPath: null,
         bluetoothConnecting: null,
@@ -764,12 +826,11 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            this.$modal.msgSuccess("修改成功");
-            // 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 => {
               this.$modal.msgSuccess("新增成功");
@@ -923,12 +984,57 @@ export default {
         this.form.model = "WL200";
       }
     },
+    /* 是否购买切换 */
     isPurchaseChang() {
       if (this.form.isPurchase == 0) {
         this.form.shoppingAppid = null;
         this.form.shoppingPath = null;
       }
-    }
+    },
+    /* 设置小程序可见标签 */
+    editMiniProgramTags(row) {
+      // 小程序标签树
+      getMiniProgramTagTree().then(Response => {
+        this.miniProgramTag.optionTree = Response.data
+        this.miniProgramTag.visible = true;
+        if (row.miniTagIds != null && row.miniTagIds.length > 0) {
+          this.miniProgramTag.selectTagList = row.miniTagIds.split(",").map(Number);
+        }
+        this.miniProgramTag.userId = row.id;
+      })
+    },
+    /* 设置企微可见标签 */
+    editWecomTags(row) {
+      // 企微标签树
+      getWecomTagTree().then(response => {
+        this.wecomTag.optionTree = response.data;
+        this.wecomTag.visible = true;
+        if (row.wecomTagIds != null && row.wecomTagIds.length > 0) {
+          this.wecomTag.selectTagList = row.wecomTagIds.split(",").map(Number);
+        }
+        this.wecomTag.userId = row.id;
+      });
+    },
+    /* 保存小程序标签 */
+    submitMiniProgramTagList() {
+      this.form.id = this.miniProgramTag.userId
+      this.form.miniTagIds = this.miniProgramTag.selectTagList.join(",")
+      updateInstrument(this.form).then(response => {
+        this.$modal.msgSuccess("修改成功");
+        this.miniProgramTag.visible = false;
+        this.getList();
+      });
+    },
+    /* 保存企微标签 */
+    submitWecomTagList() {
+      this.form.id = this.wecomTag.userId
+      this.form.wecomTagIds = this.wecomTag.selectTagList.join(",")
+      updateInstrument(this.form).then(response => {
+        this.$modal.msgSuccess("修改成功");
+        this.wecomTag.visible = false;
+        this.getList();
+      });
+    },
   }
 };
 </script>

From b0cb6631bced0411468b6fa289c362b3973e3fb7 Mon Sep 17 00:00:00 2001
From: blak-kong <546598185@qq.com>
Date: Wed, 10 Jan 2024 12:19:12 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=AA=E5=99=A8?=
 =?UTF-8?q?=EF=BC=9A=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E6=88=96=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flossom-ui/package.json                       |    2 +
 flossom-ui/src/api/upload.js                  |   11 +
 .../src/components/ImagePreview/index.vue     |    4 +-
 .../src/components/VideoPreview/index.vue     |  129 +
 flossom-ui/src/main.js                        |  112 +-
 .../src/views/system/instrument/index.vue     | 2125 ++++++++++-------
 flossom-ui/vue.config.js                      |    7 +-
 7 files changed, 1496 insertions(+), 894 deletions(-)
 create mode 100644 flossom-ui/src/api/upload.js
 create mode 100644 flossom-ui/src/components/VideoPreview/index.vue

diff --git a/flossom-ui/package.json b/flossom-ui/package.json
index 5324c46..9a1075e 100644
--- a/flossom-ui/package.json
+++ b/flossom-ui/package.json
@@ -61,6 +61,7 @@
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
+    "vue-video-player": "^4.0.6",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0"
   },
@@ -75,6 +76,7 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
+    "less-loader": "^5.0.0",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
     "sass": "1.32.13",
diff --git a/flossom-ui/src/api/upload.js b/flossom-ui/src/api/upload.js
new file mode 100644
index 0000000..22003e2
--- /dev/null
+++ b/flossom-ui/src/api/upload.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+
+// 文件上传
+export function upload(data) {
+  return request({
+    url: "/file/upload",
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/flossom-ui/src/components/ImagePreview/index.vue b/flossom-ui/src/components/ImagePreview/index.vue
index 2fa02d7..c3b5bae 100644
--- a/flossom-ui/src/components/ImagePreview/index.vue
+++ b/flossom-ui/src/components/ImagePreview/index.vue
@@ -21,11 +21,11 @@ export default {
     },
     width: {
       type: [Number, String],
-      default: ""
+      default: "80px"
     },
     height: {
       type: [Number, String],
-      default: ""
+      default: "80px"
     }
   },
   computed: {
diff --git a/flossom-ui/src/components/VideoPreview/index.vue b/flossom-ui/src/components/VideoPreview/index.vue
new file mode 100644
index 0000000..5dca5bb
--- /dev/null
+++ b/flossom-ui/src/components/VideoPreview/index.vue
@@ -0,0 +1,129 @@
+<template>
+	<el-dialog :visible.sync="isDialog" width="70%" center class="videoPlayer">
+		<div v-if="isDialog">
+			<video-player
+				style="width: 100%; height: 500px"
+				class="video-player vjs-custom-skin"
+				ref="videoPlayer"
+				:playsline="false"
+				:options="playerOptions"
+				@play="onPlayerPlay($event)"
+				@pause="onPlayerPause($event)"
+				@ended="onPlayerEnded($event)"
+				@waiting="onPlayerWaiting($event)"
+				@playing="onPlayerPlaying($event)"
+				@loadeddata="onPlayerLoadeddata($event)"
+				@timeupdate="onPlayerTimeupdate($event)"
+				@canplay="onPlayerCanplay($event)"
+				@canplaythrough="onPlayerCanplaythrough($event)"
+				@statechanged="playerStateChanged($event)"
+				@ready="playerReadied"
+			></video-player>
+		</div>
+	</el-dialog>
+</template>
+
+<script>
+import 'vue-video-player/src/custom-theme.css'
+import 'video.js/dist/video-js.css'
+
+export default {
+	name: 'VideoPreview',
+	props: {
+		src: {
+			type: String,
+			default: '',
+		},
+		isDialog: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		return {
+			srcList: [],
+			playerOptions: {
+				playbackRates: [0.7, 1.0, 1.5, 2.0], // 播放速度
+				autoplay: false, // 如果true,浏览器准备好时开始回放。
+				controls: true, //  控制条
+				muted: false, // 默认情况下将会消除任何音频。
+				loop: false, // 导致视频一结束就重新开始。
+				preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
+				language: 'zh-CN',
+				aspectRatio: '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
+				fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
+				sources: [
+					{
+						type: 'video/mp4', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
+						src: '', // url地址
+					},
+				],
+				// poster: "../../../../static/full_res.jpg", // 你的封面地址
+				width: document.documentElement.clientWidth, // 播放器宽度
+				notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
+				controlBar: {
+					timeDivider: true,
+					durationDisplay: true,
+					remainingTimeDisplay: false,
+					fullscreenToggle: true, // 全屏按钮
+				},
+			},
+		}
+	},
+	methods: {
+		openVideo(row) {
+			this.videoDialog = true
+			this.row = row
+			this.playerOptions.sources[0].src = row.filesLoc
+		},
+		// 播放回调
+		onPlayerPlay(player) {},
+
+		// 暂停回调
+		onPlayerPause(player) {},
+
+		// 视频播完回调
+		onPlayerEnded($event) {},
+
+		// DOM元素上的readyState更改导致播放停止
+		onPlayerWaiting($event) {},
+
+		// 已开始播放回调
+		onPlayerPlaying($event) {},
+
+		// 当播放器在当前播放位置下载数据时触发
+		onPlayerLoadeddata($event) {},
+
+		// 当前播放位置发生变化时触发。
+		onPlayerTimeupdate($event) {},
+
+		//媒体的readyState为HAVE_FUTURE_DATA或更高
+		onPlayerCanplay(player) {},
+
+		//媒体的readyState为HAVE_ENOUGH_DATA或更高。这意味着可以在不缓冲的情况下播放整个媒体文件。
+		onPlayerCanplaythrough(player) {},
+
+		//播放状态改变回调
+		playerStateChanged(playerCurrentState) {},
+
+		//将侦听器绑定到组件的就绪状态。与事件监听器的不同之处在于，如果ready事件已经发生，它将立即触发该函数。。
+		playerReadied(player) {},
+	},
+}
+</script>
+
+<style lang="less" scoped>
+.video-js .vjs-icon-placeholder {
+	width: 80%;
+	height: 80%;
+	display: block;
+}
+.videoPlayer /deep/ .el-dialog,
+.el-pager li {
+	//background: none !important;
+	margin-top: 6vh !important;
+}
+.my-img:hover {
+	cursor: pointer;
+}
+</style>
diff --git a/flossom-ui/src/main.js b/flossom-ui/src/main.js
index 13c6cf2..205ab09 100644
--- a/flossom-ui/src/main.js
+++ b/flossom-ui/src/main.js
@@ -1,67 +1,81 @@
-import Vue from 'vue'
+import Vue from "vue";
 
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
 
-import Element from 'element-ui'
-import './assets/styles/element-variables.scss'
+import Element from "element-ui";
+import "./assets/styles/element-variables.scss";
 
-import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/ruoyi.scss' // ruoyi css
-import App from './App'
-import store from './store'
-import router from './router'
-import directive from './directive' // directive
-import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
+import "@/assets/styles/index.scss"; // global css
+import "@/assets/styles/ruoyi.scss"; // ruoyi css
+import App from "./App";
+import store from "./store";
+import router from "./router";
+import directive from "./directive"; // directive
+import plugins from "./plugins"; // plugins
+import { download } from "@/utils/request";
 
-import './assets/icons' // icon
-import './permission' // permission control
+import "./assets/icons"; // icon
+import "./permission"; // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import {
+  parseTime,
+  resetForm,
+  addDateRange,
+  selectDictLabel,
+  selectDictLabels,
+  handleTree,
+} from "@/utils/ruoyi";
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
-import RightToolbar from "@/components/RightToolbar"
+import RightToolbar from "@/components/RightToolbar";
 // 富文本组件
-import Editor from "@/components/Editor"
+import Editor from "@/components/Editor";
 // 文件上传组件
-import FileUpload from "@/components/FileUpload"
+import FileUpload from "@/components/FileUpload";
 // 图片上传组件
-import ImageUpload from "@/components/ImageUpload"
+import ImageUpload from "@/components/ImageUpload";
 // 图片预览组件
-import ImagePreview from "@/components/ImagePreview"
+import ImagePreview from "@/components/ImagePreview";
 // 字典标签组件
-import DictTag from '@/components/DictTag'
+import DictTag from "@/components/DictTag";
 // 头部标签组件
-import VueMeta from 'vue-meta'
+import VueMeta from "vue-meta";
 // 字典数据组件
-import DictData from '@/components/DictData'
+import DictData from "@/components/DictData";
+// 视频播放器
+import VideoPlayer from "vue-video-player";
+
+// 视频组件
+import VideoPreview from "@/components/VideoPreview";
 
 // 全局方法挂载
-Vue.prototype.getDicts = getDicts
-Vue.prototype.getConfigKey = getConfigKey
-Vue.prototype.parseTime = parseTime
-Vue.prototype.resetForm = resetForm
-Vue.prototype.addDateRange = addDateRange
-Vue.prototype.selectDictLabel = selectDictLabel
-Vue.prototype.selectDictLabels = selectDictLabels
-Vue.prototype.download = download
-Vue.prototype.handleTree = handleTree
+Vue.prototype.getDicts = getDicts;
+Vue.prototype.getConfigKey = getConfigKey;
+Vue.prototype.parseTime = parseTime;
+Vue.prototype.resetForm = resetForm;
+Vue.prototype.addDateRange = addDateRange;
+Vue.prototype.selectDictLabel = selectDictLabel;
+Vue.prototype.selectDictLabels = selectDictLabels;
+Vue.prototype.download = download;
+Vue.prototype.handleTree = handleTree;
 
 // 全局组件挂载
-Vue.component('DictTag', DictTag)
-Vue.component('Pagination', Pagination)
-Vue.component('RightToolbar', RightToolbar)
-Vue.component('Editor', Editor)
-Vue.component('FileUpload', FileUpload)
-Vue.component('ImageUpload', ImageUpload)
-Vue.component('ImagePreview', ImagePreview)
+Vue.component("DictTag", DictTag);
+Vue.component("Pagination", Pagination);
+Vue.component("RightToolbar", RightToolbar);
+Vue.component("Editor", Editor);
+Vue.component("FileUpload", FileUpload);
+Vue.component("ImageUpload", ImageUpload);
+Vue.component("ImagePreview", ImagePreview);
+Vue.component("VideoPreview", VideoPreview);
 
-Vue.use(directive)
-Vue.use(plugins)
-Vue.use(VueMeta)
-DictData.install()
+Vue.use(directive);
+Vue.use(plugins);
+Vue.use(VueMeta);
+Vue.use(VideoPlayer);
+DictData.install();
 
 /**
  * If you don't want to use mock-server
@@ -73,14 +87,14 @@ DictData.install()
  */
 
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
-})
+  size: Cookies.get("size") || "medium", // set element-ui default size
+});
 
-Vue.config.productionTip = false
+Vue.config.productionTip = false;
 
 new Vue({
-  el: '#app',
+  el: "#app",
   router,
   store,
-  render: h => h(App)
-})
+  render: (h) => h(App),
+});
diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index e51e292..8aa30e3 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -1,859 +1,1306 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仪器类型" prop="model">
-        <el-select v-model="queryParams.type" @keyup.enter.native="handleQuery" style="width: 50%">
-          <el-option label="全部" :value="null"></el-option>
-          <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="仪器名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入仪器名称进行搜索"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仪器ID" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入仪器ID进行搜索"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+	<div class="app-container">
+		<el-form
+			:model="queryParams"
+			ref="queryForm"
+			size="small"
+			:inline="true"
+			v-show="showSearch"
+			label-width="68px"
+		>
+			<el-form-item label="仪器类型" prop="model">
+				<el-select
+					v-model="queryParams.type"
+					@keyup.enter.native="handleQuery"
+					style="width: 50%"
+				>
+					<el-option label="全部" :value="null"></el-option>
+					<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="仪器名称" prop="name">
+				<el-input
+					v-model="queryParams.name"
+					placeholder="请输入仪器名称进行搜索"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="仪器ID" prop="id">
+				<el-input
+					v-model="queryParams.id"
+					placeholder="请输入仪器ID进行搜索"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					size="mini"
+					@click="handleQuery"
+					>搜索</el-button
+				>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+					>重置</el-button
+				>
+			</el-form-item>
+		</el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:instrument:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['system:instrument:add']"
+					>新增
+				</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">
-        <template slot-scope="scope">
-          <span v-show="scope.row.type == 1">普通仪器</span>
-          <span v-show="scope.row.type == 2">iot仪器</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="仪器封面" align="center" prop="banner" width="150px">
-        <template slot-scope="scope">
-          <el-avatar shape="square" :size="100" :src="scope.row.banner"></el-avatar>
-        </template>
-      </el-table-column>
-      <el-table-column label="仪器LOGO" align="center" prop="logo" width="150px">
-        <template slot-scope="scope">
-          <el-avatar shape="square" :size="100" :src="scope.row.logo"></el-avatar>
-        </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">
-        <template slot-scope="scope">
-          <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">
-        <template slot-scope="scope">
-          <el-tag v-for="item in scope.row.miniTagNames.split(',')">
-            {{ item }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="企微标签" align="center" prop="wecomTagNames" width="150px">
-        <template slot-scope="scope">
-          <el-tag v-for="item in scope.row.wecomTagNames.split(',')">
-            {{ item }}
-          </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" width="200px" fixed="right" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:instrument:edit']"
-          >编辑
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-          >设置小程序可见标签
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-          >设置微信可见标签
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-          >正品控名称配置
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-          >配置说明书
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:instrument:remove']"
-          >隐藏
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+		<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">
+				<template slot-scope="scope">
+					<span v-show="scope.row.type == 1">普通仪器</span>
+					<span v-show="scope.row.type == 2">iot仪器</span>
+				</template>
+			</el-table-column>
+			<el-table-column
+				label="仪器封面"
+				align="center"
+				prop="banner"
+				width="150px"
+			>
+				<template slot-scope="scope">
+					<el-avatar
+						shape="square"
+						:size="100"
+						:src="scope.row.banner"
+					></el-avatar>
+				</template>
+			</el-table-column>
+			<el-table-column
+				label="仪器LOGO"
+				align="center"
+				prop="logo"
+				width="150px"
+			>
+				<template slot-scope="scope">
+					<el-avatar
+						shape="square"
+						:size="100"
+						:src="scope.row.logo"
+					></el-avatar>
+				</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">
+				<template slot-scope="scope">
+					<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"
+			>
+				<template slot-scope="scope">
+					<el-tag
+						v-for="item in getSplitList(scope.row.miniTagNames)"
+						:key="item"
+					>
+						{{ item }}
+					</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column
+				label="企微标签"
+				align="center"
+				prop="wecomTagNames"
+				width="150px"
+			>
+				<template slot-scope="scope">
+					<el-tag
+						v-for="item in getSplitList(scope.row.miniTagNames)"
+						:key="item"
+					>
+						{{ item }}
+					</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"
+				width="200px"
+				fixed="right"
+				class-name="small-padding fixed-width"
+			>
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['system:instrument:edit']"
+						>编辑
+					</el-button>
+					<el-button size="mini" type="text" icon="el-icon-edit"
+						>设置小程序可见标签
+					</el-button>
+					<el-button size="mini" type="text" icon="el-icon-edit"
+						>设置微信可见标签
+					</el-button>
+					<el-button size="mini" type="text" icon="el-icon-edit"
+						>正品控名称配置
+					</el-button>
+					<el-button size="mini" type="text" icon="el-icon-edit"
+						>配置说明书
+					</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['system:instrument:remove']"
+						>隐藏
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
 
-    <!-- 添加或修改仪器列对话框 -->
-    <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="仪器序列号图片" 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="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="扫码绑定介绍图片" 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="name">
-          <el-input v-model="form.name" placeholder="请输入仪器名称"/>
-        </el-form-item>
-        <el-form-item label="保修日期" prop="guarantee">
-          <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-number :min="0" :precision="0" v-model="form.dailyClockCredit"></el-input-number>
-        </el-form-item>
-        <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 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 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="仪器类型" 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 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" prop="sceneIds">
-          <el-input v-model="form.sceneIds" placeholder="请输入模式ID"/>
-        </el-form-item>
-        <el-form-item label="模式名称" prop="sceneNames">
-          <el-input v-model="form.sceneNames" placeholder="请输入模式名称"/>
-        </el-form-item>
-        <el-form-item label="生成护理记录最短时间" prop="nursingTime">
-          <el-time-picker
-            v-model="form.nursingTime"
-            value-format="HH:mm:ss"
-            placeholder="请选择护理时长">
-          </el-time-picker>
-        </el-form-item>
-        <el-form-item label="iot版本" prop="iotVersion">
-          <el-input v-model="form.iotVersion" placeholder="请输入iot版本"/>
-        </el-form-item>
-        <el-form-item label="iot升级数据文件" prop="iotUpgradeData">
-          <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="扫机身码" 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="是否支持购买" 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 v-if="form.isPurchase == 1" label="商城小程序appid" prop="shoppingAppid">
-          <el-input v-model="form.shoppingAppid" placeholder="请输入商城小程序appid"/>
-        </el-form-item>
-        <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-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-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">
-          <editor v-model="form.iotVersionUpgrade" placeholder="请输入内容" :min-height="192"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+		<!-- 添加或修改仪器列对话框 -->
+		<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="仪器序列号图片" 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="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="扫码绑定介绍图片" 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="name">
+					<el-input v-model="form.name" placeholder="请输入仪器名称" />
+				</el-form-item>
+				<el-form-item label="保修日期" prop="guarantee">
+					<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-number
+						:min="0"
+						:precision="0"
+						v-model="form.dailyClockCredit"
+					></el-input-number>
+				</el-form-item>
+				<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
+					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
+					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="仪器类型" 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 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" prop="sceneIds">
+					<el-input v-model="form.sceneIds" placeholder="请输入模式ID" />
+				</el-form-item>
+				<el-form-item label="模式名称" prop="sceneNames">
+					<el-input v-model="form.sceneNames" placeholder="请输入模式名称" />
+				</el-form-item>
+				<el-form-item label="生成护理记录最短时间" prop="nursingTime">
+					<el-time-picker
+						v-model="form.nursingTime"
+						value-format="HH:mm:ss"
+						placeholder="请选择护理时长"
+					>
+					</el-time-picker>
+				</el-form-item>
+				<el-form-item label="iot版本" prop="iotVersion">
+					<el-input v-model="form.iotVersion" placeholder="请输入iot版本" />
+				</el-form-item>
+				<el-form-item label="iot升级数据文件" prop="iotUpgradeData">
+					<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="扫机身码" 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="是否支持购买" 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
+					v-if="form.isPurchase == 1"
+					label="商城小程序appid"
+					prop="shoppingAppid"
+				>
+					<el-input
+						v-model="form.shoppingAppid"
+						placeholder="请输入商城小程序appid"
+					/>
+				</el-form-item>
+				<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="初次护理弹窗">
+					<el-button size="small" type="primary" @click="addNurse()"
+						>添加规则</el-button
+					>
+					<input
+						ref="nurseFile"
+						id="nurseFile"
+						type="file"
+						name="file"
+						accept=".png,.jpg,.jpeg,.gif,.mpeg,.mp4,.avi,.mov,.wmv"
+						@change="nurseFileChange($event)"
+					/>
+					<el-table
+						v-if="nurseList.length"
+						:data="nurseList"
+						border
+						style="width: 100%"
+						v-loading="loading"
+					>
+						<el-table-column label="弹窗提示图片或视频" width="140">
+							<template slot-scope="scope">
+								<template v-if="!scope.row.file">
+									<el-button
+										size="small"
+										type="primary"
+										@click="addNurseFile(scope.$index)"
+										>上传文件</el-button
+									>
+								</template>
+								<template v-else>
+									<template v-if="scope.row.fileType === 'image'">
+										<ImagePreview :src="scope.row.file" />
+									</template>
+									<template v-else>
+										<div style="width: 80px; height: 80px">
+											<video style="width: 100%; height: 100%;" :src="scope.row.file"></video>
+										</div>
+									</template>
+								</template>
+							</template>
+						</el-table-column>
+						<el-table-column prop="message" label="规则提示内容">
+							<template slot-scope="scope">
+								<el-input placeholder="请输入" v-model="scope.row.message" clearable></el-input>
+							</template>
+						</el-table-column>
+						<el-table-column fixed="right" label="操作" width="80">
+							<template slot-scope="scope">
+								<el-popconfirm
+									@confirm="handleNurseDelete(scope)"
+									confirm-button-text="确定"
+									cancel-button-text="取消"
+									icon="el-icon-info"
+									icon-color="red"
+									title="确定删除吗？"
+								>
+									<el-button slot="reference" type="text" size="small"
+										>删除</el-button
+									>
+								</el-popconfirm>
+							</template>
+						</el-table-column>
+					</el-table>
+				</el-form-item>
+
+				<el-form-item label="仪器介绍">
+					<el-button size="small" type="primary" @click="addIntroduce()"
+						>添加介绍</el-button
+					>
+					<input
+						ref="introduceFile"
+						id="introduceFile"
+						type="file"
+						name="file"
+						accept=".png,.jpg,.jpeg,.gif,.mpeg,.mp4,.avi,.mov,.wmv"
+						@change="introduceFileChange($event)"
+					/>
+					<el-table
+						v-if="introduceList.length"
+						:data="introduceList"
+						border
+						style="width: 100%"
+						v-loading="loading"
+					>
+						<el-table-column label="弹窗提示图片或视频" width="140">
+							<template slot-scope="scope">
+								<template v-if="!scope.row.file">
+									<el-button
+										size="small"
+										type="primary"
+										@click="addIntroduceFile(scope.$index)"
+										>上传文件</el-button
+									>
+								</template>
+								<template v-else>
+									<template v-if="scope.row.fileType === 'image'">
+										<ImagePreview :src="scope.row.file" />
+									</template>
+									<template v-else>
+										<div style="width: 80px; height: 80px">
+											<video style="width: 100%; height: 100%;" :src="scope.row.file"></video>
+										</div>
+									</template>
+								</template>
+							</template>
+						</el-table-column>
+						<el-table-column prop="message" label="规则提示内容">
+							<template slot-scope="scope">
+								<el-input placeholder="请输入" v-model="scope.row.message" clearable></el-input>
+							</template>
+						</el-table-column>
+						<el-table-column fixed="right" label="操作" width="80">
+							<template slot-scope="scope">
+								<el-popconfirm
+									@confirm="handleIntroduceDelete(scope)"
+									confirm-button-text="确定"
+									cancel-button-text="取消"
+									icon="el-icon-info"
+									icon-color="red"
+									title="确定删除吗？"
+								>
+									<el-button slot="reference" type="text" size="small"
+										>删除</el-button
+									>
+								</el-popconfirm>
+							</template>
+						</el-table-column>
+					</el-table>
+				</el-form-item>
+
+				<el-form-item label="蓝牙连接中图片" prop="bluetoothConnecting">
+					<el-upload
+						class="upload-demo"
+						:action="uploadUrl"
+						:headers="headers"
+						:limit="1"
+						:on-exceed="bluetoothConnectUploadExceed"
+						:on-success="bluetoothConnectUploadSuccess"
+						:on-error="uploadError"
+						:file-list="bluetoothConnectFile.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="bluetoothClosed">
+					<el-upload
+						class="upload-demo"
+						:action="uploadUrl"
+						:headers="headers"
+						:limit="1"
+						:on-exceed="bluetoothClosedUploadExceed"
+						:on-success="bluetoothClosedUploadSuccess"
+						:on-error="uploadError"
+						:file-list="bluetoothClosedFile.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="iot版本升级说明" prop="iotVersionUpgrade">
+					<editor
+						v-model="form.iotVersionUpgrade"
+						placeholder="请输入内容"
+						:min-height="192"
+					/>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+
+		<!-- <VideoPreview :src="previewSrc" :isDialog="isPreviewDialog" /> -->
+	</div>
 </template>
 
 <script>
-import {listInstrument, getInstrument, delInstrument, addInstrument, updateInstrument} from "@/api/system/instrument";
-import {getToken} from "@/utils/auth";
+import { upload } from '@/api/upload'
+import {
+	listInstrument,
+	getInstrument,
+	delInstrument,
+	addInstrument,
+	updateInstrument,
+} from '@/api/system/instrument'
+import { getToken } from '@/utils/auth'
 
 export default {
-  name: "Instrument",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 仪器列表格数据
-      instrumentList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        id: null,
-        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: {
-        sortNo: [
-          {required: true, message: "排序不能为空", trigger: 'blur'}
-        ],
-        banner: [
-          {required: true, message: "仪器封面不能为空"}
-        ],
-        logo: [
-          {required: true, message: "仪器logo不能为空"}
-        ],
-        serial: [
-          {required: true, message: "序列号图片不能为空"}
-        ],
-        name: [
-          {required: true, message: "仪器名称不能为空", trigger: "blur"}
-        ],
-        guarantee: [
-          {required: true, message: "请选择保修日期", trigger: 'blur'}
-        ],
-        dailyClockCredit: [
-          {required: true, message: "日常打卡奖励积分不能为空", trigger: 'blur'}
-        ],
-        isExtraClock: [
-          {required: true, message: "请选择是否开启额外打卡奖励"}
-        ],
-        extraClockCredit: [
-          {required: true, message: "额外打卡奖励积分不能为空", 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: "change"}
-        ],
-        isPurchase: [
-          {required: true, message: "是否支持购买"}
-        ],
-        shoppingAppid: [
-          {required: true, message: "购买商城APPID不能为空", trigger: "blur"}
-        ],
-        shoppingPath: [
-          {required: true, message: "购买商城PATH不能为空", trigger: "blur"}
-        ],
-      },
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询仪器列列表 */
-    getList() {
-      this.loading = true;
-      listInstrument(this.queryParams).then(response => {
-        this.instrumentList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        name: null,
-        type: 1,
-        model: "WL200",
-        banner: null,
-        logo: null,
-        serial: null,
-        guarantee: 1,
-        dailyClockCredit: 0,
-        isExtraClock: 0,
-        extraClockCredit: 0,
-        /* 额外打卡时间范围 */
-        extraClockTimeRange: [],
-        miniTagIds: null,
-        miniTagNames: null,
-        wecomTagIds: null,
-        wecomTagNames: null,
-        sceneIds: null,
-        sceneNames: null,
-        nursingTime: null,
-        iotVersion: null,
-        iotUpgradeData: null,
-        isScanCode: 0,
-        isPurchase: null,
-        shoppingAppid: null,
-        shoppingPath: null,
-        bluetoothConnecting: null,
-        bluetoothClosed: null,
-        iotVersionUpgrade: null,
-        sortNo: 1000,
-        status: null,
-        manualCodeBinding: null,
-        scanCodeBinding: 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");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加仪器列";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getInstrument(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改仪器列";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-              this.$modal.msgSuccess("修改成功");
-            // updateInstrument(this.form).then(response => {
-            //   this.$modal.msgSuccess("修改成功");
-            //   this.open = false;
-            //   this.getList();
-            // });
-          } else {
-            console.log(this.form)
-            /*addInstrument(this.form).then(response => {
+	name: 'Instrument',
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 仪器列表格数据
+			instrumentList: [],
+			// 弹出层标题
+			title: '',
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				id: null,
+				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: {
+				sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+				banner: [{ required: true, message: '仪器封面不能为空' }],
+				logo: [{ required: true, message: '仪器logo不能为空' }],
+				serial: [{ required: true, message: '序列号图片不能为空' }],
+				name: [
+					{ required: true, message: '仪器名称不能为空', trigger: 'blur' },
+				],
+				guarantee: [
+					{ required: true, message: '请选择保修日期', trigger: 'blur' },
+				],
+				dailyClockCredit: [
+					{
+						required: true,
+						message: '日常打卡奖励积分不能为空',
+						trigger: 'blur',
+					},
+				],
+				isExtraClock: [
+					{ required: true, message: '请选择是否开启额外打卡奖励' },
+				],
+				extraClockCredit: [
+					{
+						required: true,
+						message: '额外打卡奖励积分不能为空',
+						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: 'change',
+					},
+				],
+				isPurchase: [{ required: true, message: '是否支持购买' }],
+				shoppingAppid: [
+					{ required: true, message: '购买商城APPID不能为空', trigger: 'blur' },
+				],
+				shoppingPath: [
+					{ required: true, message: '购买商城PATH不能为空', trigger: 'blur' },
+				],
+			},
+			/** 初次护理规则 */
+			imageFileType: ['png', 'jpg', 'jpeg', 'gif'],
+			nurseIndex: 0,
+			nurseList: [
+				{
+					file: '',
+					fileType: '',
+					message: '',
+				},
+			],
+			/** 仪器介绍规则 */
+			introduceIndex: 0,
+			introduceList: [
+				{
+					file: '',
+					fileType: '',
+					message: '',
+				},
+			],
+
+			// 预览弹窗
+			previewSrc: '', // 预览地址
+			isPreviewVideo: true, // 预览开关
+			// isPreviewImage: true, // 预览开关
+		}
+	},
+	created() {
+		this.getList()
+	},
+	methods: {
+		/** 查询仪器列列表 */
+		getList() {
+			this.loading = true
+			listInstrument(this.queryParams).then((response) => {
+				this.instrumentList = response.rows
+				this.total = response.total
+				this.loading = false
+			})
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false
+			this.reset()
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				id: null,
+				name: null,
+				type: 1,
+				model: 'WL200',
+				banner: null,
+				logo: null,
+				serial: null,
+				guarantee: 1,
+				dailyClockCredit: 0,
+				isExtraClock: 0,
+				extraClockCredit: 0,
+				/* 额外打卡时间范围 */
+				extraClockTimeRange: [],
+				miniTagIds: null,
+				miniTagNames: null,
+				wecomTagIds: null,
+				wecomTagNames: null,
+				sceneIds: null,
+				sceneNames: null,
+				nursingTime: null,
+				iotVersion: null,
+				iotUpgradeData: null,
+				isScanCode: 0,
+				isPurchase: null,
+				shoppingAppid: null,
+				shoppingPath: null,
+				bluetoothConnecting: null,
+				bluetoothClosed: null,
+				iotVersionUpgrade: null,
+				sortNo: 1000,
+				status: null,
+				manualCodeBinding: null,
+				scanCodeBinding: 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')
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1
+			this.getList()
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm')
+			this.handleQuery()
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map((item) => item.id)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset()
+			this.open = true
+			this.title = '添加仪器列'
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset()
+			const id = row.id || this.ids
+			getInstrument(id).then((response) => {
+				this.form = response.data
+				this.open = true
+				this.title = '修改仪器列'
+			})
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					if (this.form.id != null) {
+						this.$modal.msgSuccess('修改成功')
+						// updateInstrument(this.form).then(response => {
+						//   this.$modal.msgSuccess("修改成功");
+						//   this.open = false;
+						//   this.getList();
+						// });
+					} else {
+						console.log(this.form)
+						/*addInstrument(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });*/
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除仪器列编号为"' + ids + '"的数据项？').then(function () {
-        return delInstrument(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).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('图片插入失败')
-      }
-    },
-  }
-};
+					}
+				}
+			})
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const ids = row.id || this.ids
+			this.$modal
+				.confirm('是否确认删除仪器列编号为"' + ids + '"的数据项？')
+				.then(function () {
+					return delInstrument(ids)
+				})
+				.then(() => {
+					this.getList()
+					this.$modal.msgSuccess('删除成功')
+				})
+				.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('图片插入失败')
+			}
+		},
+
+		/* 初次护理弹窗 */
+		addNurse() {
+			this.nurseList.push({
+				file: '',
+				fileType: '',
+				message: '',
+			})
+		},
+		handleNurseDelete(item) {
+			this.nurseList.splice(item.$index, 1)
+			console.log('handleNurseDelete', item)
+		},
+		addNurseFile(index) {
+			this.nurseIndex = index
+			this.$refs.nurseFile.value = ''
+			this.$refs.nurseFile.click()
+		},
+		async nurseFileChange(e) {
+			// 图片选中
+			let files = e.target.files
+			if (files.length) {
+				let data = await this.commonFileUpload(files[0])
+				console.log('data', data)
+				this.nurseList[this.nurseIndex].file = data.url
+				let type = files[0].type
+				let isImage = this.imageFileType.some((item) => type.includes(item))
+				if (isImage) {
+					this.nurseList[this.nurseIndex].fileType = 'image'
+				} else {
+					this.nurseList[this.nurseIndex].fileType = 'video'
+				}
+
+				this.nurseList = JSON.parse(JSON.stringify(this.nurseList))
+			}
+		},
+		/* 仪器介绍 */
+		addIntroduce() {
+			this.introduceList.push({
+				file: '',
+				fileType: '',
+				message: '',
+			})
+		},
+		handleIntroduceDelete(item) {
+			this.introduceList.splice(item.$index, 1)
+			console.log('handleIntroduceDelete', item)
+		},
+		addIntroduceFile(index) {
+			this.introduceIndex = index
+			this.$refs.introduceFile.value = ''
+			this.$refs.introduceFile.click()
+		},
+		async introduceFileChange(e) {
+			// 图片选中
+			if (files.length) {
+				let data = await this.commonFileUpload(files[0])
+				this.introduceList[this.introduceIndex].file = data.url
+				let type = files[0].type
+				let isImage = this.imageFileType.some((item) => type.includes(item))
+				if (isImage) {
+					this.introduceList[this.introduceIndex].fileType = 'image'
+				} else {
+					this.introduceList[this.introduceIndex].fileType = 'video'
+				}
+
+				this.introduceList = JSON.parse(JSON.stringify(this.introduceList))
+			}
+		},
+		/* 文件上传函数 */
+		async commonFileUpload(file) {
+			this.loading = true
+			let formData = new FormData()
+			formData.append('file', file)
+			let res = await upload(formData)
+
+			this.loading = false
+			if (res.code === 200) {
+				return res.data
+			}
+			return false
+		},
+
+		getSplitList(data) {
+			if (data) {
+				return data.split(',')
+			}
+			return []
+		},
+	},
+}
 </script>
 
 <style lang="less" scoped>
 /deep/ .hide .el-upload--picture-card {
-  display: none;
+	display: none;
+}
+
+#nurseFile,
+#introduceFile {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	left: -100px;
 }
+video{
+		object-fit:fill;
+	}
 </style>
diff --git a/flossom-ui/vue.config.js b/flossom-ui/vue.config.js
index f86123f..c89e41a 100644
--- a/flossom-ui/vue.config.js
+++ b/flossom-ui/vue.config.js
@@ -13,7 +13,7 @@ const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
 function getTargetUrl() {
   if (process.env.NODE_ENV === "local") {
-    return "http://110.41.134.131:8080";
+    return "http://110.41.134.131:8080"; // 纯前端代理地址
   } else {
     return `http://localhost:8080`;
   }
@@ -43,9 +43,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://110.41.134.131:8080`,
-        target: `http://192.168.10.147:8080`,
-
+        target: `http://110.41.134.131:8080`,
+        // target: `http://192.168.10.147:8080`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From 95c47b55656ce5c06e47a2807460fa7c0609aca3 Mon Sep 17 00:00:00 2001
From: blak-kong <546598185@qq.com>
Date: Wed, 10 Jan 2024 13:36:30 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flossom-ui/src/views/system/instrument/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index a6865c8..d9246fa 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -834,6 +834,8 @@ import { getToken } from '@/utils/auth'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
+import { upload } from "@/api/upload";
+
 export default {
 	name: 'Instrument',
 	components: { Treeselect },

From 2e834acce8c42bfe2f38dd638b106f063ed6052c Mon Sep 17 00:00:00 2001
From: blak-kong <546598185@qq.com>
Date: Wed, 10 Jan 2024 14:10:13 +0800
Subject: [PATCH 4/5] =?UTF-8?q?less=E6=9B=BF=E6=8D=A2=E4=B8=BAscss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flossom-ui/package.json                          | 2 --
 flossom-ui/src/components/VideoPreview/index.vue | 4 ++--
 flossom-ui/src/views/system/instrument/index.vue | 8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/flossom-ui/package.json b/flossom-ui/package.json
index 9a1075e..40416b8 100644
--- a/flossom-ui/package.json
+++ b/flossom-ui/package.json
@@ -46,11 +46,9 @@
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
-    "i": "^0.3.7",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
-    "npm": "^10.2.5",
     "nprogress": "0.2.0",
     "quill": "^2.0.0-dev.3",
     "quill-better-table": "^1.2.10",
diff --git a/flossom-ui/src/components/VideoPreview/index.vue b/flossom-ui/src/components/VideoPreview/index.vue
index 5dca5bb..42e3940 100644
--- a/flossom-ui/src/components/VideoPreview/index.vue
+++ b/flossom-ui/src/components/VideoPreview/index.vue
@@ -112,13 +112,13 @@ export default {
 }
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 .video-js .vjs-icon-placeholder {
 	width: 80%;
 	height: 80%;
 	display: block;
 }
-.videoPlayer /deep/ .el-dialog,
+.videoPlayer v-deep .el-dialog,
 .el-pager li {
 	//background: none !important;
 	margin-top: 6vh !important;
diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index d9246fa..9a8e558 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -135,7 +135,7 @@
 				width="150px"
 			>
 				<template slot-scope="scope">
-					<el-tag v-for="item in getSplitList(scope.row.miniTagNames)">
+					<el-tag v-for="item in getSplitList(scope.row.miniTagNames)" :key="item">
 						{{ item }}
 					</el-tag>
 				</template>
@@ -147,7 +147,7 @@
 				width="150px"
 			>
 				<template slot-scope="scope">
-					<el-tag v-for="item in getSplitList(scope.row.wecomTagNames)">
+					<el-tag v-for="item in getSplitList(scope.row.wecomTagNames)" :key="item">
 						{{ item }}
 					</el-tag>
 				</template>
@@ -1536,8 +1536,8 @@ export default {
 }
 </script>
 
-<style lang="less" scoped>
-/deep/ .hide .el-upload--picture-card {
+<style lang="scss" scoped>
+v-deep .hide .el-upload--picture-card {
 	display: none;
 }
 

From dffd37aa064fba98b65fe27098b9db6e655b6f6d Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 10 Jan 2024 20:21:39 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E7=9A=84=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/domain/entity/WxInstrument.java      |    1 -
 .../domain/entity/WxInstrumentFileRelate.java |  128 +
 .../core/domain/req/WxInstrumentSaveReq.java  |   59 +-
 .../core/enums/InstrumentFileClassify.java    |   27 +
 .../mapper/WxInstrumentFileRelateMapper.java  |   72 +
 .../mapper/WxInstrumentFileRelateMapper.xml   |   98 +
 .../resources/mapper/WxInstrumentMapper.xml   |    3 +
 .../controller/WxInstrumentController.java    |   13 +-
 .../system/service/IWxInstrumentService.java  |   20 +-
 .../service/impl/WxInstrumentServiceImpl.java |  150 +-
 .../src/views/system/instrument/index.vue     | 3030 +++++++++--------
 11 files changed, 2078 insertions(+), 1523 deletions(-)
 create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentFileRelate.java
 create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassify.java
 create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentFileRelateMapper.java
 create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentFileRelateMapper.xml

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
index 87004da..6ef167c 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
@@ -2,7 +2,6 @@ package com.flossom.common.core.domain.entity;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.flossom.common.core.web.domain.BaseEntity;
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentFileRelate.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentFileRelate.java
new file mode 100644
index 0000000..6d96eee
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentFileRelate.java
@@ -0,0 +1,128 @@
+package com.flossom.common.core.domain.entity;
+
+import com.flossom.common.core.annotation.Excel;
+import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 仪器关联文件信息对象 wx_instrument_file_relate
+ *
+ * @author flossom
+ * @date 2024-01-10
+ */
+public class WxInstrumentFileRelate extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 分类（1、初次护理、2、仪器介绍规则）
+     */
+    @Excel(name = "分类", readConverterExp = "1=、初次护理、2、仪器介绍规则")
+    private Integer classify;
+
+    /**
+     * 仪器id
+     */
+    @Excel(name = "仪器id")
+    private Long instrumentId;
+
+    /**
+     * 文件地址
+     */
+    @Excel(name = "文件地址")
+    private String file;
+
+    /**
+     * 文件类型
+     */
+    @Excel(name = "文件类型")
+    private String fileType;
+
+    /**
+     * 内容
+     */
+    @Excel(name = "内容")
+    private String message;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private Long status;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setClassify(Integer classify) {
+        this.classify = classify;
+    }
+
+    public Integer getClassify() {
+        return classify;
+    }
+
+    public void setInstrumentId(Long instrumentId) {
+        this.instrumentId = instrumentId;
+    }
+
+    public Long getInstrumentId() {
+        return instrumentId;
+    }
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public String getFile() {
+        return file;
+    }
+
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
+
+    public String getFileType() {
+        return fileType;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("classify", getClassify())
+                .append("instrumentId", getInstrumentId())
+                .append("file", getFile())
+                .append("fileType", getFileType())
+                .append("message", getMessage())
+                .append("status", getStatus())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .toString();
+    }
+}
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java
index 335ab96..c7638d4 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java
@@ -1,16 +1,13 @@
 package com.flossom.common.core.domain.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.flossom.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.flossom.common.core.domain.entity.WxInstrumentFileRelate;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -91,6 +88,17 @@ public class WxInstrumentSaveReq {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private List<LocalDateTime> extraClockTimeRange;
 
+
+    /**
+     * 标签ID(xxxx,xxxx,xxx)
+     */
+    private String miniTagIds;
+
+    /**
+     * 标签ID(xxxx,xxxx,xxx)
+     */
+    private String wecomTagIds;
+
     /**
      * 场景ID(xxxx,xxxx,xxx)
      */
@@ -170,6 +178,17 @@ public class WxInstrumentSaveReq {
      */
     private String scanCodeBinding;
 
+
+    /**
+     * 初次护理介绍视频/图片
+     */
+    private List<WxInstrumentFileRelate> nurseList;
+
+    /**
+     * 仪器介绍规则
+     */
+    private List<WxInstrumentFileRelate> introduceList;
+
     public Long getId() {
         return id;
     }
@@ -385,4 +404,36 @@ public class WxInstrumentSaveReq {
     public void setScanCodeBinding(String scanCodeBinding) {
         this.scanCodeBinding = scanCodeBinding;
     }
+
+    public List<WxInstrumentFileRelate> getNurseList() {
+        return nurseList;
+    }
+
+    public void setNurseList(List<WxInstrumentFileRelate> nurseList) {
+        this.nurseList = nurseList;
+    }
+
+    public List<WxInstrumentFileRelate> getIntroduceList() {
+        return introduceList;
+    }
+
+    public void setIntroduceList(List<WxInstrumentFileRelate> introduceList) {
+        this.introduceList = introduceList;
+    }
+
+    public String getMiniTagIds() {
+        return miniTagIds;
+    }
+
+    public void setMiniTagIds(String miniTagIds) {
+        this.miniTagIds = miniTagIds;
+    }
+
+    public String getWecomTagIds() {
+        return wecomTagIds;
+    }
+
+    public void setWecomTagIds(String wecomTagIds) {
+        this.wecomTagIds = wecomTagIds;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassify.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassify.java
new file mode 100644
index 0000000..f030c06
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassify.java
@@ -0,0 +1,27 @@
+package com.flossom.common.core.enums;
+
+/**
+ * wx_instrument_file_relate: classify
+ * 分类（1、初次护理、2、仪器介绍规则）
+ *
+ * @author flossom
+ */
+public enum InstrumentFileClassify {
+    FIRST_NURSE(1, "初次护理"), INSTRUMENT_INSTRUCTION(2, "仪器介绍");
+
+    private final Integer code;
+    private final String info;
+
+    InstrumentFileClassify(Integer code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentFileRelateMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentFileRelateMapper.java
new file mode 100644
index 0000000..d323b80
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentFileRelateMapper.java
@@ -0,0 +1,72 @@
+package com.flossom.common.core.mapper;
+
+import com.flossom.common.core.domain.entity.WxInstrumentFileRelate;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * 仪器关联文件信息Mapper接口
+ *
+ * @author flossom
+ * @date 2024-01-10
+ */
+public interface WxInstrumentFileRelateMapper {
+    /**
+     * 查询仪器关联文件信息
+     *
+     * @param id 仪器关联文件信息主键
+     * @return 仪器关联文件信息
+     */
+    public WxInstrumentFileRelate selectWxInstrumentFileRelateById(Long id);
+
+    /**
+     * 查询仪器关联文件信息列表
+     *
+     * @param wxInstrumentFileRelate 仪器关联文件信息
+     * @return 仪器关联文件信息集合
+     */
+    public List<WxInstrumentFileRelate> selectWxInstrumentFileRelateList(WxInstrumentFileRelate wxInstrumentFileRelate);
+
+    /**
+     * 新增仪器关联文件信息
+     *
+     * @param wxInstrumentFileRelate 仪器关联文件信息
+     * @return 结果
+     */
+    public int insertWxInstrumentFileRelate(WxInstrumentFileRelate wxInstrumentFileRelate);
+
+    /**
+     * 修改仪器关联文件信息
+     *
+     * @param wxInstrumentFileRelate 仪器关联文件信息
+     * @return 结果
+     */
+    public int updateWxInstrumentFileRelate(WxInstrumentFileRelate wxInstrumentFileRelate);
+
+    /**
+     * 删除仪器关联文件信息
+     *
+     * @param id 仪器关联文件信息主键
+     * @return 结果
+     */
+    public int deleteWxInstrumentFileRelateById(Long id);
+
+    /**
+     * 批量删除仪器关联文件信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteWxInstrumentFileRelateByIds(Long[] ids);
+
+    /**
+     * 删除仪器关联文件信息
+     *
+     * @return 结果
+     */
+    public int deleteByInstrumentIdAndClassify(@Param("instrumentId") Long instrumentId, @Param("classify") Integer classify);
+
+    public List<WxInstrumentFileRelate> selectByInstrumentIdAndClassify(@Param("instrumentId") Long instrumentId, @Param("classify") Integer classify);
+}
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentFileRelateMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentFileRelateMapper.xml
new file mode 100644
index 0000000..b045634
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentFileRelateMapper.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.flossom.common.core.mapper.WxInstrumentFileRelateMapper">
+    
+    <resultMap type="WxInstrumentFileRelate" id="WxInstrumentFileRelateResult">
+        <result property="id"    column="id"    />
+        <result property="classify"    column="classify"    />
+        <result property="instrumentId"    column="instrument_id"    />
+        <result property="file"    column="file"    />
+        <result property="fileType"    column="file_type"    />
+        <result property="message"    column="message"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectWxInstrumentFileRelateVo">
+        select id, classify, instrument_id, file, file_type, message, status, create_by, create_time from wx_instrument_file_relate
+    </sql>
+
+    <select id="selectWxInstrumentFileRelateList" parameterType="WxInstrumentFileRelate" resultMap="WxInstrumentFileRelateResult">
+        <include refid="selectWxInstrumentFileRelateVo"/>
+        <where>  
+            <if test="classify != null "> and classify = #{classify}</if>
+            <if test="instrumentId != null "> and instrument_id = #{instrumentId}</if>
+            <if test="file != null  and file != ''"> and file = #{file}</if>
+            <if test="fileType != null  and fileType != ''"> and file_type = #{fileType}</if>
+            <if test="message != null  and message != ''"> and message = #{message}</if>
+            <if test="status != null "> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectWxInstrumentFileRelateById" parameterType="Long" resultMap="WxInstrumentFileRelateResult">
+        <include refid="selectWxInstrumentFileRelateVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectByInstrumentIdAndClassify" resultMap="WxInstrumentFileRelateResult">
+        <include refid="selectWxInstrumentFileRelateVo"/>
+        where instrument_id = #{instrumentId} and classify = #{classify}
+    </select>
+
+    <insert id="insertWxInstrumentFileRelate" parameterType="WxInstrumentFileRelate" useGeneratedKeys="true" keyProperty="id">
+        insert into wx_instrument_file_relate
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="classify != null">classify,</if>
+            <if test="instrumentId != null">instrument_id,</if>
+            <if test="file != null and file != ''">file,</if>
+            <if test="fileType != null and fileType != ''">file_type,</if>
+            <if test="message != null and message != ''">message,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="classify != null">#{classify},</if>
+            <if test="instrumentId != null">#{instrumentId},</if>
+            <if test="file != null and file != ''">#{file},</if>
+            <if test="fileType != null and fileType != ''">#{fileType},</if>
+            <if test="message != null and message != ''">#{message},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateWxInstrumentFileRelate" parameterType="WxInstrumentFileRelate">
+        update wx_instrument_file_relate
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="classify != null">classify = #{classify},</if>
+            <if test="instrumentId != null">instrument_id = #{instrumentId},</if>
+            <if test="file != null and file != ''">file = #{file},</if>
+            <if test="fileType != null and fileType != ''">file_type = #{fileType},</if>
+            <if test="message != null and message != ''">message = #{message},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteWxInstrumentFileRelateById" parameterType="Long">
+        delete from wx_instrument_file_relate where id = #{id}
+    </delete>
+
+    <delete id="deleteWxInstrumentFileRelateByIds" parameterType="String">
+        delete from wx_instrument_file_relate where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+
+    <delete id="deleteByInstrumentIdAndClassify">
+        delete from wx_instrument_file_relate where instrument_id = #{instrumentId} and classify = #{classify}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
index e8e048f..6df2ceb 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
@@ -104,6 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertWxInstrument" parameterType="WxInstrument" useGeneratedKeys="true" keyProperty="id">
+        <selectKey keyProperty="id" resultType="Long" order="AFTER">
+            SELECT LAST_INSERT_ID()
+        </selectKey>
         insert into wx_instrument
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null and name != ''">name,</if>
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
index 489568b..8c4ac47 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
@@ -56,7 +56,7 @@ public class WxInstrumentController extends BaseController {
     @RequiresPermissions("system:instrument:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(wxInstrumentService.selectWxInstrumentById(id));
+        return success(wxInstrumentService.selectWxInstrumentReqById(id));
     }
 
     /**
@@ -97,12 +97,7 @@ public class WxInstrumentController extends BaseController {
             wxInstrumentSaveReq.setShoppingAppid(null);
             wxInstrumentSaveReq.setShoppingPath(null);
         }
-        WxInstrument wxInstrument = new WxInstrument();
-        BeanUtils.copyProperties(wxInstrumentSaveReq, wxInstrument);
-        wxInstrument.setStartTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(0));
-        wxInstrument.setEndTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(1));
-        wxInstrument.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(wxInstrumentService.insertWxInstrument(wxInstrument));
+        return toAjax(wxInstrumentService.addWxInstrument(wxInstrumentSaveReq));
     }
 
     /**
@@ -111,8 +106,8 @@ public class WxInstrumentController extends BaseController {
     @RequiresPermissions("system:instrument:edit")
     @Log(title = "仪器列", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody WxInstrument wxInstrument) {
-        return toAjax(wxInstrumentService.updateWxInstrument(wxInstrument));
+    public AjaxResult edit(@RequestBody WxInstrumentSaveReq wxInstrumentSaveReq) {
+        return toAjax(wxInstrumentService.updateWxInstrument(wxInstrumentSaveReq));
     }
 
     /**
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java
index 5f26939..67bcf48 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java
@@ -2,6 +2,7 @@ package com.flossom.system.service;
 
 import com.flossom.common.core.domain.entity.WxInstrument;
 import com.flossom.common.core.domain.req.WxInstrumentReq;
+import com.flossom.common.core.domain.req.WxInstrumentSaveReq;
 
 import java.util.List;
 
@@ -44,14 +45,6 @@ public interface IWxInstrumentService {
      */
     public int insertWxInstrument(WxInstrument wxInstrument);
 
-    /**
-     * 修改仪器列
-     *
-     * @param wxInstrument 仪器列
-     * @return 结果
-     */
-    public int updateWxInstrument(WxInstrument wxInstrument);
-
     /**
      * 批量删除仪器列
      *
@@ -67,4 +60,15 @@ public interface IWxInstrumentService {
      * @return 结果
      */
     public int deleteWxInstrumentById(Long id);
+
+    int addWxInstrument(WxInstrumentSaveReq wxInstrumentSaveReq);
+
+    /**
+     * 修改仪器列
+     *
+     * @return 结果
+     */
+    int updateWxInstrument(WxInstrumentSaveReq wxInstrumentSaveReq);
+
+    WxInstrumentSaveReq selectWxInstrumentReqById(Long id);
 }
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
index 5d545ff..e15ba5b 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
@@ -1,17 +1,26 @@
 package com.flossom.system.service.impl;
 
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.SysTag;
 import com.flossom.common.core.domain.entity.WxInstrument;
+import com.flossom.common.core.domain.entity.WxInstrumentFileRelate;
 import com.flossom.common.core.domain.req.WxInstrumentReq;
+import com.flossom.common.core.domain.req.WxInstrumentSaveReq;
+import com.flossom.common.core.enums.InstrumentFileClassify;
 import com.flossom.common.core.mapper.SysTagMapper;
+import com.flossom.common.core.mapper.WxInstrumentFileRelateMapper;
 import com.flossom.common.core.mapper.WxInstrumentMapper;
 import com.flossom.common.core.utils.DateUtils;
+import com.flossom.common.core.utils.StringUtils;
+import com.flossom.common.security.utils.SecurityUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IWxInstrumentService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 仪器列Service业务层处理
@@ -28,6 +37,9 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
     @Autowired
     private SysTagMapper sysTagMapper;
 
+    @Autowired
+    private WxInstrumentFileRelateMapper wxInstrumentFileRelateMapper;
+
     /**
      * 查询仪器列
      *
@@ -39,6 +51,32 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         return wxInstrumentMapper.selectWxInstrumentById(id);
     }
 
+    /**
+     * 查询仪器列
+     *
+     * @param id 仪器列主键
+     * @return 仪器列
+     */
+    @Override
+    public WxInstrumentSaveReq selectWxInstrumentReqById(Long id) {
+        WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(id);
+        WxInstrumentSaveReq wxInstrumentSaveReq = new WxInstrumentSaveReq();
+        BeanUtils.copyProperties(wxInstrument, wxInstrumentSaveReq);
+        // 时间范围
+        if (wxInstrument.getStartTime() != null && wxInstrument.getEndTime() != null) {
+            wxInstrumentSaveReq.setExtraClockTimeRange(Arrays.asList(wxInstrument.getStartTime(), wxInstrument.getEndTime()));
+        }
+        // 获取护理弹窗关联
+        List<WxInstrumentFileRelate> firstNurseRelate = wxInstrumentFileRelateMapper.
+                selectByInstrumentIdAndClassify(wxInstrument.getId(), InstrumentFileClassify.FIRST_NURSE.getCode());
+        wxInstrumentSaveReq.setNurseList(firstNurseRelate);
+        // 获取护理弹窗关联
+        List<WxInstrumentFileRelate> instructionRelate = wxInstrumentFileRelateMapper.
+                selectByInstrumentIdAndClassify(wxInstrument.getId(), InstrumentFileClassify.INSTRUMENT_INSTRUCTION.getCode());
+        wxInstrumentSaveReq.setIntroduceList(instructionRelate);
+        return wxInstrumentSaveReq;
+    }
+
     /**
      * 查询仪器列列表
      *
@@ -67,17 +105,72 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         return wxInstrumentMapper.insertWxInstrument(wxInstrument);
     }
 
+    /**
+     * 新增仪器列
+     *
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int addWxInstrument(WxInstrumentSaveReq wxInstrumentSaveReq) {
+        WxInstrument wxInstrument = new WxInstrument();
+        BeanUtils.copyProperties(wxInstrumentSaveReq, wxInstrument);
+        // 打卡时间处理
+        wxInstrument.setStartTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(0));
+        wxInstrument.setEndTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(1));
+        wxInstrument.setCreateBy(SecurityUtils.getUsername());
+        wxInstrument.setCreateTime(DateUtils.getNowDate());
+
+        int i = wxInstrumentMapper.insertWxInstrument(wxInstrument);
+
+        // 保存初次护理规则
+        List<WxInstrumentFileRelate> nurseList = wxInstrumentSaveReq.getNurseList();
+        if (nurseList != null && nurseList.size() > 0) {
+            Iterator<WxInstrumentFileRelate> nurseIterator = nurseList.iterator();
+            while (nurseIterator.hasNext()) {
+                WxInstrumentFileRelate next = nurseIterator.next();
+                if (StringUtils.isBlank(next.getFile())) {
+                    nurseIterator.remove();
+                    continue;
+                }
+                next.setInstrumentId(wxInstrument.getId());
+                next.setClassify(InstrumentFileClassify.FIRST_NURSE.getCode());
+                wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
+            }
+        }
+
+        // 保存仪器介绍规则
+        List<WxInstrumentFileRelate> introduceList = wxInstrumentSaveReq.getIntroduceList();
+        if (introduceList != null && introduceList.size() > 0) {
+            Iterator<WxInstrumentFileRelate> introduceIterator = introduceList.iterator();
+            while (introduceIterator.hasNext()) {
+                WxInstrumentFileRelate next = introduceIterator.next();
+                if (StringUtils.isBlank(next.getFile())) {
+                    introduceIterator.remove();
+                    continue;
+                }
+                next.setInstrumentId(wxInstrument.getId());
+                next.setClassify(InstrumentFileClassify.INSTRUMENT_INSTRUCTION.getCode());
+                wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
+            }
+        }
+        return i;
+    }
+
     /**
      * 修改仪器列
      *
-     * @param wxInstrument 仪器列
+     * @param wxInstrumentSaveReq 仪器列
      * @return 结果
      */
     @Override
-    public int updateWxInstrument(WxInstrument wxInstrument) {
+    public int updateWxInstrument(WxInstrumentSaveReq wxInstrumentSaveReq) {
+        WxInstrument wxInstrument = new WxInstrument();
+        BeanUtils.copyProperties(wxInstrumentSaveReq, wxInstrument);
+
         // 处理小程序标签和企微标签
-        if (wxInstrument.getMiniTagIds() != null) {
-            List<String> tagIdList = Arrays.asList(wxInstrument.getMiniTagIds().split(","));
+        if (wxInstrumentSaveReq.getMiniTagIds() != null) {
+            List<String> tagIdList = Arrays.asList(wxInstrumentSaveReq.getMiniTagIds().split(","));
             StringBuilder tagNames = new StringBuilder();
             for (int i = 0; i < tagIdList.size(); i++) {
                 SysTag sysTag = sysTagMapper.selectDeptById(Long.valueOf(tagIdList.get(i)));
@@ -87,9 +180,12 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                 }
             }
             wxInstrument.setMiniTagNames(tagNames.toString());
+        } else {
+            wxInstrument.setMiniTagNames(null);
         }
-        if (wxInstrument.getWecomTagIds() != null) {
-            List<String> tagIdList = Arrays.asList(wxInstrument.getWecomTagIds().split(","));
+
+        if (wxInstrumentSaveReq.getWecomTagIds() != null) {
+            List<String> tagIdList = Arrays.asList(wxInstrumentSaveReq.getWecomTagIds().split(","));
             StringBuilder tagNames = new StringBuilder();
             for (int i = 0; i < tagIdList.size(); i++) {
                 SysTag sysTag = sysTagMapper.selectDeptById(Long.valueOf(tagIdList.get(i)));
@@ -99,15 +195,55 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                 }
             }
             wxInstrument.setWecomTagNames(tagNames.toString());
+        } else {
+            wxInstrument.setWecomTagNames(null);
         }
         wxInstrument.setUpdateTime(DateUtils.getNowDate());
+
+        // 打卡时间处理
+        wxInstrument.setStartTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(0));
+        wxInstrument.setEndTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(1));
+
+        // 保存初次护理规则
+        List<WxInstrumentFileRelate> nurseList = wxInstrumentSaveReq.getNurseList();
+        wxInstrumentFileRelateMapper.deleteByInstrumentIdAndClassify(wxInstrumentSaveReq.getId(),
+                InstrumentFileClassify.FIRST_NURSE.getCode());
+        if (nurseList != null && nurseList.size() > 0) {
+            Iterator<WxInstrumentFileRelate> nurseIterator = nurseList.iterator();
+            while (nurseIterator.hasNext()) {
+                WxInstrumentFileRelate next = nurseIterator.next();
+                if (StringUtils.isBlank(next.getFile())) {
+                    nurseIterator.remove();
+                    continue;
+                }
+                next.setInstrumentId(wxInstrument.getId());
+                next.setClassify(InstrumentFileClassify.FIRST_NURSE.getCode());
+                wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
+            }
+        }
+
+        // 保存仪器介绍规则
+        wxInstrumentFileRelateMapper.deleteByInstrumentIdAndClassify(wxInstrumentSaveReq.getId(),
+                InstrumentFileClassify.INSTRUMENT_INSTRUCTION.getCode());
+        List<WxInstrumentFileRelate> introduceList = wxInstrumentSaveReq.getIntroduceList();
+        Iterator<WxInstrumentFileRelate> introduceIterator = introduceList.iterator();
+        while (introduceIterator.hasNext()) {
+            WxInstrumentFileRelate next = introduceIterator.next();
+            if (StringUtils.isBlank(next.getFile())) {
+                introduceIterator.remove();
+                continue;
+            }
+            next.setInstrumentId(wxInstrument.getId());
+            next.setClassify(InstrumentFileClassify.INSTRUMENT_INSTRUCTION.getCode());
+            wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
+        }
+
         return wxInstrumentMapper.updateWxInstrument(wxInstrument);
     }
 
     /**
      * 批量删除仪器列
      *
-     * @param ids 需要删除的仪器列主键
      * @return 结果
      */
     @Override
diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index 9a8e558..6c970b8 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -1,1554 +1,1596 @@
 <template>
-	<div class="app-container">
-		<el-form
-			:model="queryParams"
-			ref="queryForm"
-			size="small"
-			:inline="true"
-			v-show="showSearch"
-			label-width="68px"
-		>
-			<el-form-item label="仪器类型" prop="model">
-				<el-select
-					v-model="queryParams.type"
-					@keyup.enter.native="handleQuery"
-					style="width: 50%"
-				>
-					<el-option label="全部" :value="null"></el-option>
-					<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="仪器名称" prop="name">
-				<el-input
-					v-model="queryParams.name"
-					placeholder="请输入仪器名称进行搜索"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="仪器ID" prop="id">
-				<el-input
-					v-model="queryParams.id"
-					placeholder="请输入仪器ID进行搜索"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item>
-				<el-button
-					type="primary"
-					icon="el-icon-search"
-					size="mini"
-					@click="handleQuery"
-					>搜索</el-button
-				>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-					>重置</el-button
-				>
-			</el-form-item>
-		</el-form>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="仪器类型" prop="model">
+        <el-select
+          v-model="queryParams.type"
+          @keyup.enter.native="handleQuery"
+          style="width: 50%"
+        >
+          <el-option label="全部" :value="null"></el-option>
+          <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="仪器名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入仪器名称进行搜索"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仪器ID" prop="id">
+        <el-input
+          v-model="queryParams.id"
+          placeholder="请输入仪器ID进行搜索"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+        >搜索
+        </el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        >重置
+        </el-button
+        >
+      </el-form-item>
+    </el-form>
 
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['system:instrument:add']"
-					>新增
-				</el-button>
-			</el-col>
-			<right-toolbar
-				:showSearch.sync="showSearch"
-				@queryTable="getList"
-			></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:instrument:add']"
+        >新增
+        </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">
-				<template slot-scope="scope">
-					<span v-show="scope.row.type == 1">普通仪器</span>
-					<span v-show="scope.row.type == 2">iot仪器</span>
-				</template>
-			</el-table-column>
-			<el-table-column
-				label="仪器封面"
-				align="center"
-				prop="banner"
-				width="150px"
-			>
-				<template slot-scope="scope">
-					<el-avatar
-						shape="square"
-						:size="100"
-						:src="scope.row.banner"
-					></el-avatar>
-				</template>
-			</el-table-column>
-			<el-table-column
-				label="仪器LOGO"
-				align="center"
-				prop="logo"
-				width="150px"
-			>
-				<template slot-scope="scope">
-					<el-avatar
-						shape="square"
-						:size="100"
-						:src="scope.row.logo"
-					></el-avatar>
-				</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">
-				<template slot-scope="scope">
+    <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">
+        <template slot-scope="scope">
+          <span v-show="scope.row.type == 1">普通仪器</span>
+          <span v-show="scope.row.type == 2">iot仪器</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="仪器封面"
+        align="center"
+        prop="banner"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          <el-avatar
+            shape="square"
+            :size="100"
+            :src="scope.row.banner"
+          ></el-avatar>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="仪器LOGO"
+        align="center"
+        prop="logo"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          <el-avatar
+            shape="square"
+            :size="100"
+            :src="scope.row.logo"
+          ></el-avatar>
+        </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">
+        <template slot-scope="scope">
 					<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"
-			>
-				<template slot-scope="scope">
-					<el-tag v-for="item in getSplitList(scope.row.miniTagNames)" :key="item">
-						{{ item }}
-					</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column
-				label="企微标签"
-				align="center"
-				prop="wecomTagNames"
-				width="150px"
-			>
-				<template slot-scope="scope">
-					<el-tag v-for="item in getSplitList(scope.row.wecomTagNames)" :key="item">
-						{{ item }}
-					</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"
-				width="200px"
-				fixed="right"
-				class-name="small-padding fixed-width"
-			>
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['system:instrument:edit']"
-						>编辑
-					</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="editMiniProgramTags(scope.row)"
-						>设置小程序可见标签
-					</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="editWecomTags(scope.row)"
-						>设置企微可见标签
-					</el-button>
-					<el-button size="mini" type="text" icon="el-icon-edit"
-						>正品控名称配置
-					</el-button>
-					<el-button size="mini" type="text" icon="el-icon-edit"
-						>配置说明书
-					</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['system:instrument:remove']"
-						v-if="scope.row.status == 0"
-						>隐藏
-					</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['system:instrument:remove']"
-						v-if="scope.row.status == 1"
-						>解除隐藏
-					</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+          >{{ scope.row.guarantee }}年</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="小程序标签"
+        align="center"
+        prop="miniTagNames"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          <el-tag v-for="item in getSplitList(scope.row.miniTagNames)" :key="item">
+            {{ item }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="企微标签"
+        align="center"
+        prop="wecomTagNames"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          <el-tag v-for="item in getSplitList(scope.row.wecomTagNames)" :key="item">
+            {{ item }}
+          </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"
+        width="200px"
+        fixed="right"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:instrument:edit']"
+          >编辑
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="editMiniProgramTags(scope.row)"
+          >设置小程序可见标签
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="editWecomTags(scope.row)"
+          >设置企微可见标签
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit"
+          >正品控名称配置
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit"
+          >配置说明书
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:instrument:remove']"
+            v-if="scope.row.status == 0"
+          >隐藏
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:instrument:remove']"
+            v-if="scope.row.status == 1"
+          >解除隐藏
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-		<!-- 添加或修改仪器列对话框 -->
-		<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">
+    <!-- 添加或修改仪器列对话框 -->
+    <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)"
-									>
+                    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)"
-									>
+                    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">
+              </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)"
-									>
+                    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)"
-									>
+                    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="仪器序列号图片" 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">
+              </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="仪器序列号图片" 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)"
-									>
+                    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)"
-									>
+                    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="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="扫码绑定介绍图片" 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="name">
-					<el-input v-model="form.name" placeholder="请输入仪器名称" />
-				</el-form-item>
-				<el-form-item label="保修日期" prop="guarantee">
-					<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-number
-						:min="0"
-						:precision="0"
-						v-model="form.dailyClockCredit"
-					></el-input-number>
-				</el-form-item>
-				<el-form-item label="开启额外打卡奖励" prop="dailyClockCredit">
-					<el-switch
-						v-model="form.isExtraClock"
-						:active-value="1"
-						:inactive-value="0"
-						active-color="#13ce66"
-						inactive-color="#DCDCDC"
-						@change="isExtraClockChange"
-					>
-					</el-switch>
-				</el-form-item>
-				<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
-					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="仪器类型" prop="type">
-					<el-select
-						v-model="form.type"
-						style="width: 50%"
-						@change="typeChange"
-					>
-						<el-option label="非IOT仪器" :value="1"></el-option>
-						<el-option label="IOT仪器" :value="2"></el-option>
-					</el-select>
-				</el-form-item>
-				<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" prop="sceneIds">
-					<el-input v-model="form.sceneIds" placeholder="请输入模式ID" />
-				</el-form-item>
-				<el-form-item label="模式名称" prop="sceneNames">
-					<el-input v-model="form.sceneNames" placeholder="请输入模式名称" />
-				</el-form-item>
-				<el-form-item label="生成护理记录最短时间" prop="nursingTime">
-					<el-time-picker
-						v-model="form.nursingTime"
-						value-format="HH:mm:ss"
-						placeholder="请选择护理时长"
-					>
-					</el-time-picker>
-				</el-form-item>
-				<el-form-item label="iot版本" prop="iotVersion">
-					<el-input v-model="form.iotVersion" placeholder="请输入iot版本" />
-				</el-form-item>
-				<el-form-item label="iot升级数据文件" prop="iotUpgradeData">
-					<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="扫机身码" 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="是否支持购买" prop="isPurchase">
-					<el-select
-						v-model="form.isPurchase"
-						style="width: 50%"
-						@change="isPurchaseChang"
-					>
-						<el-option label="是" :value="1"></el-option>
-						<el-option label="否" :value="0"></el-option>
-					</el-select>
-				</el-form-item>
-				<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
-					v-if="form.isPurchase == 1"
-					label="商城小程序path"
-					prop="shoppingPath"
-				>
-					<el-input
-						v-model="form.shoppingPath"
-						placeholder="请输入商城小程序path"
-					/>
-				</el-form-item>
+              </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="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="扫码绑定介绍图片" 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="name">
+          <el-input v-model="form.name" placeholder="请输入仪器名称"/>
+        </el-form-item>
+        <el-form-item label="保修日期" prop="guarantee">
+          <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-number
+            :min="0"
+            :precision="0"
+            v-model="form.dailyClockCredit"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="开启额外打卡奖励" prop="dailyClockCredit">
+          <el-switch
+            v-model="form.isExtraClock"
+            :active-value="1"
+            :inactive-value="0"
+            active-color="#13ce66"
+            inactive-color="#DCDCDC"
+            @change="isExtraClockChange"
+          >
+          </el-switch>
+        </el-form-item>
+        <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
+          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="仪器类型" prop="type">
+          <el-select
+            v-model="form.type"
+            style="width: 50%"
+            @change="typeChange"
+          >
+            <el-option label="非IOT仪器" :value="1"></el-option>
+            <el-option label="IOT仪器" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <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" prop="sceneIds">
+          <el-input v-model="form.sceneIds" placeholder="请输入模式ID"/>
+        </el-form-item>
+        <el-form-item label="模式名称" prop="sceneNames">
+          <el-input v-model="form.sceneNames" placeholder="请输入模式名称"/>
+        </el-form-item>
+        <el-form-item label="生成护理记录最短时间" prop="nursingTime">
+          <el-time-picker
+            v-model="form.nursingTime"
+            value-format="HH:mm:ss"
+            placeholder="请选择护理时长"
+          >
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="iot版本" prop="iotVersion">
+          <el-input v-model="form.iotVersion" placeholder="请输入iot版本"/>
+        </el-form-item>
+        <el-form-item label="iot升级数据文件" prop="iotUpgradeData">
+          <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="扫机身码" 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="是否支持购买" prop="isPurchase">
+          <el-select
+            v-model="form.isPurchase"
+            style="width: 50%"
+            @change="isPurchaseChang"
+          >
+            <el-option label="是" :value="1"></el-option>
+            <el-option label="否" :value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <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
+          v-if="form.isPurchase == 1"
+          label="商城小程序path"
+          prop="shoppingPath"
+        >
+          <el-input
+            v-model="form.shoppingPath"
+            placeholder="请输入商城小程序path"
+          />
+        </el-form-item>
 
-				<el-form-item label="初次护理弹窗">
-					<el-button size="small" type="primary" @click="addNurse()"
-						>添加规则</el-button
-					>
-					<input
-						ref="nurseFile"
-						id="nurseFile"
-						type="file"
-						name="file"
-						accept=".png,.jpg,.jpeg,.gif,.mpeg,.mp4,.avi,.mov,.wmv"
-						@change="nurseFileChange($event)"
-					/>
-					<el-table
-						v-if="nurseList.length"
-						:data="nurseList"
-						border
-						style="width: 100%"
-						v-loading="loading"
-					>
-						<el-table-column label="弹窗提示图片或视频" width="140">
-							<template slot-scope="scope">
-								<template v-if="!scope.row.file">
-									<el-button
-										size="small"
-										type="primary"
-										@click="addNurseFile(scope.$index)"
-										>上传文件</el-button
-									>
-								</template>
-								<template v-else>
-									<template v-if="scope.row.fileType === 'image'">
-										<ImagePreview :src="scope.row.file" />
-									</template>
-									<template v-else>
-										<div style="width: 80px; height: 80px">
-											<video
-												style="width: 100%; height: 100%"
-												:src="scope.row.file"
-											></video>
-										</div>
-									</template>
-								</template>
-							</template>
-						</el-table-column>
-						<el-table-column prop="message" label="规则提示内容">
-							<template slot-scope="scope">
-								<el-input
-									placeholder="请输入"
-									v-model="scope.row.message"
-									clearable
-								></el-input>
-							</template>
-						</el-table-column>
-						<el-table-column fixed="right" label="操作" width="80">
-							<template slot-scope="scope">
-								<el-popconfirm
-									@confirm="handleNurseDelete(scope)"
-									confirm-button-text="确定"
-									cancel-button-text="取消"
-									icon="el-icon-info"
-									icon-color="red"
-									title="确定删除吗？"
-								>
-									<el-button slot="reference" type="text" size="small"
-										>删除</el-button
-									>
-								</el-popconfirm>
-							</template>
-						</el-table-column>
-					</el-table>
-				</el-form-item>
+        <el-form-item label="初次护理弹窗">
+          <el-button size="small" type="primary" @click="addNurse()"
+          >添加规则
+          </el-button
+          >
+          <input
+            ref="nurseFile"
+            id="nurseFile"
+            type="file"
+            name="file"
+            accept=".png,.jpg,.jpeg,.gif,.mpeg,.mp4,.avi,.mov,.wmv"
+            @change="nurseFileChange($event)"
+          />
+          <el-table
+            v-if="nurseList.length"
+            :data="nurseList"
+            border
+            style="width: 100%"
+            v-loading="loading"
+          >
+            <el-table-column label="弹窗提示图片或视频" width="140">
+              <template slot-scope="scope">
+                <template v-if="!scope.row.file">
+                  <el-button
+                    size="small"
+                    type="primary"
+                    @click="addNurseFile(scope.$index)"
+                  >上传文件
+                  </el-button
+                  >
+                </template>
+                <template v-else>
+                  <template v-if="scope.row.fileType === 'image'">
+                    <ImagePreview :src="scope.row.file"/>
+                  </template>
+                  <template v-else>
+                    <div style="width: 80px; height: 80px">
+                      <video
+                        style="width: 100%; height: 100%"
+                        :src="scope.row.file"
+                      ></video>
+                    </div>
+                  </template>
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="message" label="规则提示内容">
+              <template slot-scope="scope">
+                <el-input
+                  placeholder="请输入"
+                  v-model="scope.row.message"
+                  clearable
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="80">
+              <template slot-scope="scope">
+                <el-popconfirm
+                  @confirm="handleNurseDelete(scope)"
+                  confirm-button-text="确定"
+                  cancel-button-text="取消"
+                  icon="el-icon-info"
+                  icon-color="red"
+                  title="确定删除吗？"
+                >
+                  <el-button slot="reference" type="text" size="small"
+                  >删除
+                  </el-button
+                  >
+                </el-popconfirm>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
 
-				<el-form-item label="仪器介绍">
-					<el-button size="small" type="primary" @click="addIntroduce()"
-						>添加介绍</el-button
-					>
-					<input
-						ref="introduceFile"
-						id="introduceFile"
-						type="file"
-						name="file"
-						accept=".png,.jpg,.jpeg,.gif,.mpeg,.mp4,.avi,.mov,.wmv"
-						@change="introduceFileChange($event)"
-					/>
-					<el-table
-						v-if="introduceList.length"
-						:data="introduceList"
-						border
-						style="width: 100%"
-						v-loading="loading"
-					>
-						<el-table-column label="弹窗提示图片或视频" width="140">
-							<template slot-scope="scope">
-								<template v-if="!scope.row.file">
-									<el-button
-										size="small"
-										type="primary"
-										@click="addIntroduceFile(scope.$index)"
-										>上传文件</el-button
-									>
-								</template>
-								<template v-else>
-									<template v-if="scope.row.fileType === 'image'">
-										<ImagePreview :src="scope.row.file" />
-									</template>
-									<template v-else>
-										<div style="width: 80px; height: 80px">
-											<video
-												style="width: 100%; height: 100%"
-												:src="scope.row.file"
-											></video>
-										</div>
-									</template>
-								</template>
-							</template>
-						</el-table-column>
-						<el-table-column prop="message" label="规则提示内容">
-							<template slot-scope="scope">
-								<el-input
-									placeholder="请输入"
-									v-model="scope.row.message"
-									clearable
-								></el-input>
-							</template>
-						</el-table-column>
-						<el-table-column fixed="right" label="操作" width="80">
-							<template slot-scope="scope">
-								<el-popconfirm
-									@confirm="handleIntroduceDelete(scope)"
-									confirm-button-text="确定"
-									cancel-button-text="取消"
-									icon="el-icon-info"
-									icon-color="red"
-									title="确定删除吗？"
-								>
-									<el-button slot="reference" type="text" size="small"
-										>删除</el-button
-									>
-								</el-popconfirm>
-							</template>
-						</el-table-column>
-					</el-table>
-				</el-form-item>
+        <el-form-item label="仪器介绍">
+          <el-button size="small" type="primary" @click="addIntroduce()"
+          >添加介绍
+          </el-button
+          >
+          <input
+            ref="introduceFile"
+            id="introduceFile"
+            type="file"
+            name="file"
+            accept=".png,.jpg,.jpeg,.gif,.mpeg,.mp4,.avi,.mov,.wmv"
+            @change="introduceFileChange($event)"
+          />
+          <el-table
+            v-if="introduceList.length"
+            :data="introduceList"
+            border
+            style="width: 100%"
+            v-loading="loading"
+          >
+            <el-table-column label="弹窗提示图片或视频" width="140">
+              <template slot-scope="scope">
+                <template v-if="!scope.row.file">
+                  <el-button
+                    size="small"
+                    type="primary"
+                    @click="addIntroduceFile(scope.$index)"
+                  >上传文件
+                  </el-button
+                  >
+                </template>
+                <template v-else>
+                  <template v-if="scope.row.fileType === 'image'">
+                    <ImagePreview :src="scope.row.file"/>
+                  </template>
+                  <template v-else>
+                    <div style="width: 80px; height: 80px">
+                      <video
+                        style="width: 100%; height: 100%"
+                        :src="scope.row.file"
+                      ></video>
+                    </div>
+                  </template>
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="message" label="规则提示内容">
+              <template slot-scope="scope">
+                <el-input
+                  placeholder="请输入"
+                  v-model="scope.row.message"
+                  clearable
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="80">
+              <template slot-scope="scope">
+                <el-popconfirm
+                  @confirm="handleIntroduceDelete(scope)"
+                  confirm-button-text="确定"
+                  cancel-button-text="取消"
+                  icon="el-icon-info"
+                  icon-color="red"
+                  title="确定删除吗？"
+                >
+                  <el-button slot="reference" type="text" size="small"
+                  >删除
+                  </el-button
+                  >
+                </el-popconfirm>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
 
-				<el-form-item label="蓝牙连接中图片" prop="bluetoothConnecting">
-					<el-upload
-						class="upload-demo"
-						:action="uploadUrl"
-						:headers="headers"
-						:limit="1"
-						:on-exceed="bluetoothConnectUploadExceed"
-						:on-success="bluetoothConnectUploadSuccess"
-						:on-error="uploadError"
-						:file-list="bluetoothConnectFile.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="bluetoothClosed">
-					<el-upload
-						class="upload-demo"
-						:action="uploadUrl"
-						:headers="headers"
-						:limit="1"
-						:on-exceed="bluetoothClosedUploadExceed"
-						:on-success="bluetoothClosedUploadSuccess"
-						:on-error="uploadError"
-						:file-list="bluetoothClosedFile.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="iot版本升级说明" prop="iotVersionUpgrade">
-					<editor
-						v-model="form.iotVersionUpgrade"
-						placeholder="请输入内容"
-						:min-height="192"
-					/>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
+        <el-form-item label="蓝牙连接中图片" prop="bluetoothConnecting">
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :headers="headers"
+            :limit="1"
+            :on-exceed="bluetoothConnectUploadExceed"
+            :on-success="bluetoothConnectUploadSuccess"
+            :on-error="uploadError"
+            :file-list="bluetoothConnectFile.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="bluetoothClosed">
+          <el-upload
+            class="upload-demo"
+            :action="uploadUrl"
+            :headers="headers"
+            :limit="1"
+            :on-exceed="bluetoothClosedUploadExceed"
+            :on-success="bluetoothClosedUploadSuccess"
+            :on-error="uploadError"
+            :file-list="bluetoothClosedFile.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="iot版本升级说明" prop="iotVersionUpgrade">
+          <editor
+            v-model="form.iotVersionUpgrade"
+            placeholder="请输入内容"
+            :min-height="192"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
 
-		<!-- 编辑小程序可见标签   -->
-		<el-dialog
-			title="编辑小程序可见标签"
-			:visible.sync="miniProgramTag.visible"
-			width="50%"
-		>
-			<el-form ref="miniProgramTag" :model="miniProgramTag" label-width="150px">
-				<el-row>
-					<el-col :span="100">
-						<el-form-item
-							label="小程序标签"
-							prop="selectTagList"
-							label-width="100px"
-						>
-							<treeselect
-								v-model="miniProgramTag.selectTagList"
-								:options="miniProgramTag.optionTree"
-								:multiple="true"
-								:show-count="true"
-								placeholder="请选择小程序标签"
-								:disable-branch-nodes="true"
-							/>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click="miniProgramTag.visible = false">取 消</el-button>
-				<el-button type="primary" @click="submitMiniProgramTagList"
-					>确 定</el-button
-				>
-			</div>
-		</el-dialog>
+    <!-- 编辑小程序可见标签   -->
+    <el-dialog
+      title="编辑小程序可见标签"
+      :visible.sync="miniProgramTag.visible"
+      width="50%"
+    >
+      <el-form ref="miniProgramTag" :model="miniProgramTag" label-width="150px">
+        <el-row>
+          <el-col :span="100">
+            <el-form-item
+              label="小程序标签"
+              prop="selectTagList"
+              label-width="100px"
+            >
+              <treeselect
+                v-model="miniProgramTag.selectTagList"
+                :options="miniProgramTag.optionTree"
+                :multiple="true"
+                :show-count="true"
+                placeholder="请选择小程序标签"
+                :disable-branch-nodes="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="miniProgramTag.visible = false">取 消</el-button>
+        <el-button type="primary" @click="submitMiniProgramTagList"
+        >确 定
+        </el-button
+        >
+      </div>
+    </el-dialog>
 
-		<!-- 编辑企微可见标签   -->
-		<el-dialog
-			title="编辑企微可见标签"
-			:visible.sync="wecomTag.visible"
-			width="50%"
-		>
-			<el-form :model="wecomTag" label-width="150px">
-				<el-row>
-					<el-col :span="100">
-						<el-form-item
-							label="小程序标签"
-							prop="tagIdArray"
-							label-width="100px"
-						>
-							<treeselect
-								v-model="wecomTag.selectTagList"
-								:options="wecomTag.optionTree"
-								:multiple="true"
-								:show-count="true"
-								placeholder="请选择小程序标签"
-								:disable-branch-nodes="true"
-							/>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click="wecomTag.visible = false">重 置</el-button>
-				<el-button type="primary" @click="submitWecomTagList">确 定</el-button>
-			</div>
-		</el-dialog>
-	</div>
+    <!-- 编辑企微可见标签   -->
+    <el-dialog
+      title="编辑企微可见标签"
+      :visible.sync="wecomTag.visible"
+      width="50%"
+    >
+      <el-form :model="wecomTag" label-width="150px">
+        <el-row>
+          <el-col :span="100">
+            <el-form-item
+              label="小程序标签"
+              prop="tagIdArray"
+              label-width="100px"
+            >
+              <treeselect
+                v-model="wecomTag.selectTagList"
+                :options="wecomTag.optionTree"
+                :multiple="true"
+                :show-count="true"
+                placeholder="请选择小程序标签"
+                :disable-branch-nodes="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="wecomTag.visible = false">重 置</el-button>
+        <el-button type="primary" @click="submitWecomTagList">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-	listInstrument,
-	getInstrument,
-	delInstrument,
-	addInstrument,
-	updateInstrument,
-	getMiniProgramTagTree,
-	getWecomTagTree,
+  listInstrument,
+  getInstrument,
+  delInstrument,
+  addInstrument,
+  updateInstrument,
+  getMiniProgramTagTree,
+  getWecomTagTree,
 } from '@/api/system/instrument'
-import { getToken } from '@/utils/auth'
+import {getToken} from '@/utils/auth'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
-import { upload } from "@/api/upload";
+import {upload} from "@/api/upload";
 
 export default {
-	name: 'Instrument',
-	components: { Treeselect },
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 仪器列表格数据
-			instrumentList: [],
-			// 弹出层标题
-			title: '',
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				id: null,
-				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: [],
-			},
-			/* 小程序可见标签 */
-			miniProgramTag: {
-				userId: null,
-				selectTagList: null,
-				visible: false,
-				optionTree: [],
-			},
-			/* 企微可见标签 */
-			wecomTag: {
-				userId: null,
-				selectTagList: null,
-				visible: false,
-				optionTree: [],
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-				sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
-				banner: [{ required: true, message: '仪器封面不能为空' }],
-				logo: [{ required: true, message: '仪器logo不能为空' }],
-				serial: [{ required: true, message: '序列号图片不能为空' }],
-				name: [
-					{ required: true, message: '仪器名称不能为空', trigger: 'blur' },
-				],
-				guarantee: [
-					{ required: true, message: '请选择保修日期', trigger: 'blur' },
-				],
-				dailyClockCredit: [
-					{
-						required: true,
-						message: '日常打卡奖励积分不能为空',
-						trigger: 'blur',
-					},
-				],
-				isExtraClock: [
-					{ required: true, message: '请选择是否开启额外打卡奖励' },
-				],
-				extraClockCredit: [
-					{
-						required: true,
-						message: '额外打卡奖励积分不能为空',
-						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: 'change',
-					},
-				],
-				isPurchase: [{ required: true, message: '是否支持购买' }],
-				shoppingAppid: [
-					{ required: true, message: '购买商城APPID不能为空', trigger: 'blur' },
-				],
-				shoppingPath: [
-					{ required: true, message: '购买商城PATH不能为空', trigger: 'blur' },
-				],
-			},
-			/** 初次护理规则 */
-			imageFileType: ['png', 'jpg', 'jpeg', 'gif'],
-			nurseIndex: 0,
-			nurseList: [
-				{
-					file: '',
-					fileType: '',
-					message: '',
-				},
-			],
-			/** 仪器介绍规则 */
-			introduceIndex: 0,
-			introduceList: [
-				{
-					file: '',
-					fileType: '',
-					message: '',
-				},
-			],
+  name: 'Instrument',
+  components: {Treeselect},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 仪器列表格数据
+      instrumentList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        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: [],
+      },
+      /* 小程序可见标签 */
+      miniProgramTag: {
+        userId: null,
+        selectTagList: null,
+        visible: false,
+        optionTree: [],
+      },
+      /* 企微可见标签 */
+      wecomTag: {
+        userId: null,
+        selectTagList: null,
+        visible: false,
+        optionTree: [],
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        sortNo: [{required: true, message: '排序不能为空', trigger: 'blur'}],
+        banner: [{required: true, message: '仪器封面不能为空'}],
+        logo: [{required: true, message: '仪器logo不能为空'}],
+        serial: [{required: true, message: '序列号图片不能为空'}],
+        name: [
+          {required: true, message: '仪器名称不能为空', trigger: 'blur'},
+        ],
+        guarantee: [
+          {required: true, message: '请选择保修日期', trigger: 'blur'},
+        ],
+        dailyClockCredit: [
+          {
+            required: true,
+            message: '日常打卡奖励积分不能为空',
+            trigger: 'blur',
+          },
+        ],
+        isExtraClock: [
+          {required: true, message: '请选择是否开启额外打卡奖励'},
+        ],
+        extraClockCredit: [
+          {
+            required: true,
+            message: '额外打卡奖励积分不能为空',
+            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: 'change',
+          },
+        ],
+        isPurchase: [{required: true, message: '是否支持购买'}],
+        shoppingAppid: [
+          {required: true, message: '购买商城APPID不能为空', trigger: 'blur'},
+        ],
+        shoppingPath: [
+          {required: true, message: '购买商城PATH不能为空', trigger: 'blur'},
+        ],
+      },
+      /** 初次护理规则 */
+      imageFileType: ['png', 'jpg', 'jpeg', 'gif'],
+      nurseIndex: 0,
+      nurseList: [
+        {
+          file: '',
+          fileType: '',
+          message: '',
+        },
+      ],
+      /** 仪器介绍规则 */
+      introduceIndex: 0,
+      introduceList: [
+        {
+          file: '',
+          fileType: '',
+          message: '',
+        },
+      ],
 
-			// 预览弹窗
-			previewSrc: '', // 预览地址
-			isPreviewVideo: true, // 预览开关
-		}
-	},
-	created() {
-		this.getList()
-	},
-	methods: {
-		/** 查询仪器列列表 */
-		getList() {
-			this.loading = true
-			listInstrument(this.queryParams).then((response) => {
-				this.instrumentList = response.rows
-				this.total = response.total
-				this.loading = false
-			})
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false
-			this.reset()
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				id: null,
-				name: null,
-				type: 1,
-				model: 'WL200',
-				banner: null,
-				logo: null,
-				serial: null,
-				guarantee: 1,
-				dailyClockCredit: 0,
-				isExtraClock: 0,
-				extraClockCredit: 0,
-				/* 额外打卡时间范围 */
-				extraClockTimeRange: [],
-				miniTagIds: null,
-				miniTagNames: null,
-				wecomTagIds: null,
-				wecomTagNames: null,
-				sceneIds: null,
-				sceneNames: null,
-				nursingTime: null,
-				iotVersion: null,
-				iotUpgradeData: null,
-				isScanCode: 0,
-				isPurchase: 0,
-				shoppingAppid: null,
-				shoppingPath: null,
-				bluetoothConnecting: null,
-				bluetoothClosed: null,
-				iotVersionUpgrade: null,
-				sortNo: 1000,
-				status: null,
-				manualCodeBinding: null,
-				scanCodeBinding: 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')
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1
-			this.getList()
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm')
-			this.handleQuery()
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map((item) => item.id)
-			this.single = selection.length !== 1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset()
-			this.open = true
-			this.title = '添加仪器列'
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset()
-			const id = row.id || this.ids
-			getInstrument(id).then((response) => {
-				this.form = response.data
-				// 仪器封面回显
-				this.bannerFile = {
-					uploadHide: true,
-					dialogImageUrl: this.form.banner,
-					dialogVisible: false,
-					disabled: false,
-					fileList: [{ name: '', url: this.form.banner }],
-				}
-				/* 仪器logo */
-				this.logoFile = {
-					uploadHide: true,
-					dialogImageUrl: this.form.logo,
-					dialogVisible: false,
-					disabled: false,
-					fileList: [{ name: '', url: this.form.logo }],
-				}
-				/* 序列号图片 */
-				this.serialFile = {
-					uploadHide: true,
-					dialogImageUrl: this.form.serial,
-					dialogVisible: false,
-					disabled: false,
-					fileList: [{ name: '', url: this.form.serial }],
-				}
-				/* 手写绑定介绍视频/图片 */
-				this.manualFile = {
-					uploadHide: true,
-					fileList: [
-						{ name: '手写绑定介绍视频/图片', url: this.form.manualCodeBinding },
-					],
-				}
-				/* 扫码绑定介绍视频/图片 */
-				this.scanFile = {
-					uploadHide: true,
-					fileList: [
-						{ name: '扫码绑定介绍视频/图片', url: this.form.scanCodeBinding },
-					],
-				}
-				/* iot升级数据文件 */
-				this.iotUpgradeFile = {
-					uploadHide: true,
-					fileList: [
-						{ name: 'iot升级数据文件', url: this.form.iotUpgradeData },
-					],
-				}
-				/* 蓝牙连接文件 */
-				this.bluetoothConnectFile = {
-					uploadHide: true,
-					fileList: [
-						{ name: '蓝牙连接文件', url: this.form.bluetoothConnecting },
-					],
-				}
-				/* 蓝牙断开连接文件 */
-				this.bluetoothClosedFile = {
-					uploadHide: false,
-					fileList: [
-						{ name: '蓝牙断开连接文件', url: this.form.bluetoothClosed },
-					],
-				}
-				// 额外打卡时间
-				if (this.form.isExtraClock == 1) {
-					this.form.extraClockTimeRange = [
-						response.data.startTime,
-						response.data.endTime,
-					]
-				}
-				this.open = true
-				this.title = '修改仪器列'
-			})
-		},
-		/** 提交按钮 */
-		submitForm() {
-			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()
-						})
-					} else {
-						addInstrument(this.form).then((response) => {
-							this.$modal.msgSuccess('新增成功')
-							this.open = false
-							this.getList()
-						})
-					}
-				}
-			})
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const ids = row.id
-			this.$modal
-				.confirm('是否确认隐藏仪器列编号为"' + ids + '"的数据项？')
-				.then(function () {
-					return delInstrument(ids)
-				})
-				.then(() => {
-					this.getList()
-					this.$modal.msgSuccess('隐藏成功')
-				})
-				.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('图片插入失败')
-			}
-		},
-		/* 是否开启额外打卡奖励 */
-		isExtraClockChange() {
-			if (this.form.isExtraClock == 0) {
-				this.form.extraClockCredit = 0
-				this.form.extraClockTimeRange = []
-			}
-		},
-		/* 仪器类型切换 */
-		typeChange() {
-			if (this.form.type == 1) {
-				this.form.model = 'WL200'
-			}
-		},
-		/* 是否购买切换 */
-		isPurchaseChang() {
-			if (this.form.isPurchase == 0) {
-				this.form.shoppingAppid = null
-				this.form.shoppingPath = null
-			}
-		},
-		/* 设置小程序可见标签 */
-		editMiniProgramTags(row) {
-			// 小程序标签树
-			getMiniProgramTagTree().then((Response) => {
-				this.miniProgramTag.optionTree = Response.data
-				this.miniProgramTag.visible = true
-				if (row.miniTagIds != null && row.miniTagIds.length > 0) {
-					this.miniProgramTag.selectTagList = row.miniTagIds
-						.split(',')
-						.map(Number)
-				}
-				this.miniProgramTag.userId = row.id
-			})
-		},
-		/* 设置企微可见标签 */
-		editWecomTags(row) {
-			// 企微标签树
-			getWecomTagTree().then((response) => {
-				this.wecomTag.optionTree = response.data
-				this.wecomTag.visible = true
-				if (row.wecomTagIds != null && row.wecomTagIds.length > 0) {
-					this.wecomTag.selectTagList = row.wecomTagIds.split(',').map(Number)
-				}
-				this.wecomTag.userId = row.id
-			})
-		},
-		/* 保存小程序标签 */
-		submitMiniProgramTagList() {
-			this.form.id = this.miniProgramTag.userId
-			this.form.miniTagIds = this.miniProgramTag.selectTagList.join(',')
-			updateInstrument(this.form).then((response) => {
-				this.$modal.msgSuccess('修改成功')
-				this.miniProgramTag.visible = false
-				this.getList()
-			})
-		},
-		/* 保存企微标签 */
-		submitWecomTagList() {
-			this.form.id = this.wecomTag.userId
-			this.form.wecomTagIds = this.wecomTag.selectTagList.join(',')
-			updateInstrument(this.form).then((response) => {
-				this.$modal.msgSuccess('修改成功')
-				this.wecomTag.visible = false
-				this.getList()
-			})
-		},
+      // 预览弹窗
+      previewSrc: '', // 预览地址
+      isPreviewVideo: true, // 预览开关
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询仪器列列表 */
+    getList() {
+      this.loading = true
+      listInstrument(this.queryParams).then((response) => {
+        this.instrumentList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.nurseIndex = 0;
+      this.nurseList = [
+        {
+          file: '',
+          fileType: '',
+          message: '',
+        }
+      ];
+      this.introduceIndex = 0;
+      this.introduceList = [
+        {
+          file: '',
+          fileType: '',
+          message: '',
+        },
+      ];
+      this.form = {
+        id: null,
+        name: null,
+        type: 1,
+        model: 'WL200',
+        banner: null,
+        logo: null,
+        serial: null,
+        guarantee: 1,
+        dailyClockCredit: 0,
+        isExtraClock: 0,
+        extraClockCredit: 0,
+        /* 额外打卡时间范围 */
+        extraClockTimeRange: [],
+        miniTagIds: null,
+        miniTagNames: null,
+        wecomTagIds: null,
+        wecomTagNames: null,
+        sceneIds: null,
+        sceneNames: null,
+        nursingTime: null,
+        iotVersion: null,
+        iotUpgradeData: null,
+        isScanCode: 0,
+        isPurchase: 0,
+        shoppingAppid: null,
+        shoppingPath: null,
+        bluetoothConnecting: null,
+        bluetoothClosed: null,
+        iotVersionUpgrade: null,
+        sortNo: 1000,
+        status: null,
+        manualCodeBinding: null,
+        scanCodeBinding: null,
+        nurseList: null,
+        introduceList: 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')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加仪器列'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getInstrument(id).then((response) => {
+        this.form = response.data
+        // 仪器封面回显
+        this.bannerFile = {
+          uploadHide: true,
+          dialogImageUrl: this.form.banner,
+          dialogVisible: false,
+          disabled: false,
+          fileList: [{name: '', url: this.form.banner}],
+        }
+        /* 仪器logo */
+        this.logoFile = {
+          uploadHide: true,
+          dialogImageUrl: this.form.logo,
+          dialogVisible: false,
+          disabled: false,
+          fileList: [{name: '', url: this.form.logo}],
+        }
+        /* 序列号图片 */
+        this.serialFile = {
+          uploadHide: true,
+          dialogImageUrl: this.form.serial,
+          dialogVisible: false,
+          disabled: false,
+          fileList: [{name: '', url: this.form.serial}],
+        }
+        /* 手写绑定介绍视频/图片 */
+        this.manualFile = {
+          uploadHide: true,
+          fileList: [
+            {name: '手写绑定介绍视频/图片', url: this.form.manualCodeBinding},
+          ],
+        }
+        /* 扫码绑定介绍视频/图片 */
+        this.scanFile = {
+          uploadHide: true,
+          fileList: [
+            {name: '扫码绑定介绍视频/图片', url: this.form.scanCodeBinding},
+          ],
+        }
+        /* iot升级数据文件 */
+        this.iotUpgradeFile = {
+          uploadHide: true,
+          fileList: [
+            {name: 'iot升级数据文件', url: this.form.iotUpgradeData},
+          ],
+        }
+        /* 蓝牙连接文件 */
+        this.bluetoothConnectFile = {
+          uploadHide: true,
+          fileList: [
+            {name: '蓝牙连接文件', url: this.form.bluetoothConnecting},
+          ],
+        }
+        /* 蓝牙断开连接文件 */
+        this.bluetoothClosedFile = {
+          uploadHide: false,
+          fileList: [
+            {name: '蓝牙断开连接文件', url: this.form.bluetoothClosed},
+          ],
+        }
+        // 额外打卡时间
+        if (this.form.isExtraClock == 1) {
+          this.form.extraClockTimeRange = response.data.extraClockTimeRange;
+        }
+        this.open = true
+        this.title = '修改仪器列'
 
-		/* 初次护理弹窗 */
-		addNurse() {
-			this.nurseList.push({
-				file: '',
-				fileType: '',
-				message: '',
-			})
-		},
-		handleNurseDelete(item) {
-			this.nurseList.splice(item.$index, 1)
-			console.log('handleNurseDelete', item)
-		},
-		addNurseFile(index) {
-			this.nurseIndex = index
-			this.$refs.nurseFile.value = ''
-			this.$refs.nurseFile.click()
-		},
-		async nurseFileChange(e) {
-			// 图片选中
-			let files = e.target.files
-			if (files.length) {
-				let data = await this.commonFileUpload(files[0])
-				console.log('data', data)
-				this.nurseList[this.nurseIndex].file = data.url
-				let type = files[0].type
-				let isImage = this.imageFileType.some((item) => type.includes(item))
-				if (isImage) {
-					this.nurseList[this.nurseIndex].fileType = 'image'
-				} else {
-					this.nurseList[this.nurseIndex].fileType = 'video'
-				}
+        /* 首次护理管理视频 */
+          if (response.data.nurseList != null) {
+            this.nurseIndex = response.data.nurseList.length;
+            this.nurseList = response.data.nurseList;
+          }
 
-				this.nurseList = JSON.parse(JSON.stringify(this.nurseList))
-			}
-		},
-		/* 仪器介绍 */
-		addIntroduce() {
-			this.introduceList.push({
-				file: '',
-				fileType: '',
-				message: '',
-			})
-		},
-		handleIntroduceDelete(item) {
-			this.introduceList.splice(item.$index, 1)
-			console.log('handleIntroduceDelete', item)
-		},
-		addIntroduceFile(index) {
-			this.introduceIndex = index
-			this.$refs.introduceFile.value = ''
-			this.$refs.introduceFile.click()
-		},
-		async introduceFileChange(e) {
-			// 图片选中
-			if (files.length) {
-				let data = await this.commonFileUpload(files[0])
-				this.introduceList[this.introduceIndex].file = data.url
-				let type = files[0].type
-				let isImage = this.imageFileType.some((item) => type.includes(item))
-				if (isImage) {
-					this.introduceList[this.introduceIndex].fileType = 'image'
-				} else {
-					this.introduceList[this.introduceIndex].fileType = 'video'
-				}
+        /* 仪器介绍视频 */
+        if (response.data.introduceList != null) {
+          this.introduceIndex = response.data.introduceList.length;
+          this.introduceList = response.data.introduceList;
+        }
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log(this.nurseList);
+      this.form.nurseList = this.nurseList;
+      this.form.introduceList = this.introduceList;
+      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()
+            })
+          } else {
+            addInstrument(this.form).then((response) => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id
+      this.$modal
+        .confirm('是否确认隐藏仪器列编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delInstrument(ids)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('隐藏成功')
+        })
+        .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('图片插入失败')
+      }
+    },
+    /* 是否开启额外打卡奖励 */
+    isExtraClockChange() {
+      if (this.form.isExtraClock == 0) {
+        this.form.extraClockCredit = 0
+        this.form.extraClockTimeRange = []
+      }
+    },
+    /* 仪器类型切换 */
+    typeChange() {
+      if (this.form.type == 1) {
+        this.form.model = 'WL200'
+      }
+    },
+    /* 是否购买切换 */
+    isPurchaseChang() {
+      if (this.form.isPurchase == 0) {
+        this.form.shoppingAppid = null
+        this.form.shoppingPath = null
+      }
+    },
+    /* 设置小程序可见标签 */
+    editMiniProgramTags(row) {
+      // 小程序标签树
+      getMiniProgramTagTree().then((Response) => {
+        this.miniProgramTag.optionTree = Response.data
+        this.miniProgramTag.visible = true
+        if (row.miniTagIds != null && row.miniTagIds.length > 0) {
+          this.miniProgramTag.selectTagList = row.miniTagIds
+            .split(',')
+            .map(Number)
+        }
+        this.miniProgramTag.userId = row.id
+      })
+    },
+    /* 设置企微可见标签 */
+    editWecomTags(row) {
+      // 企微标签树
+      getWecomTagTree().then((response) => {
+        this.wecomTag.optionTree = response.data
+        this.wecomTag.visible = true
+        if (row.wecomTagIds != null && row.wecomTagIds.length > 0) {
+          this.wecomTag.selectTagList = row.wecomTagIds.split(',').map(Number)
+        }
+        this.wecomTag.userId = row.id
+      })
+    },
+    /* 保存小程序标签 */
+    submitMiniProgramTagList() {
+      this.form.id = this.miniProgramTag.userId
+      this.form.miniTagIds = this.miniProgramTag.selectTagList.join(',')
+      updateInstrument(this.form).then((response) => {
+        this.$modal.msgSuccess('修改成功')
+        this.miniProgramTag.visible = false
+        this.getList()
+      })
+    },
+    /* 保存企微标签 */
+    submitWecomTagList() {
+      this.form.id = this.wecomTag.userId
+      this.form.wecomTagIds = this.wecomTag.selectTagList.join(',')
+      updateInstrument(this.form).then((response) => {
+        this.$modal.msgSuccess('修改成功')
+        this.wecomTag.visible = false
+        this.getList()
+      })
+    },
 
-				this.introduceList = JSON.parse(JSON.stringify(this.introduceList))
-			}
-		},
-		/* 文件上传函数 */
-		async commonFileUpload(file) {
-			this.loading = true
-			let formData = new FormData()
-			formData.append('file', file)
-			let res = await upload(formData)
+    /* 初次护理弹窗 */
+    addNurse() {
+      this.nurseList.push({
+        file: '',
+        fileType: '',
+        message: '',
+      })
+    },
+    handleNurseDelete(item) {
+      this.nurseList.splice(item.$index, 1)
+      console.log('handleNurseDelete', item)
+    },
+    addNurseFile(index) {
+      this.nurseIndex = index
+      this.$refs.nurseFile.value = ''
+      this.$refs.nurseFile.click()
+    },
+    async nurseFileChange(e) {
+      // 图片选中
+      let files = e.target.files
+      if (files.length) {
+        let data = await this.commonFileUpload(files[0])
+        console.log('data', data)
+        this.nurseList[this.nurseIndex].file = data.url
+        let type = files[0].type
+        let isImage = this.imageFileType.some((item) => type.includes(item))
+        if (isImage) {
+          this.nurseList[this.nurseIndex].fileType = 'image'
+        } else {
+          this.nurseList[this.nurseIndex].fileType = 'video'
+        }
 
-			this.loading = false
-			if (res.code === 200) {
-				return res.data
-			}
-			return false
-		},
+        this.nurseList = JSON.parse(JSON.stringify(this.nurseList))
+      }
+    },
+    /* 仪器介绍 */
+    addIntroduce() {
+      this.introduceList.push({
+        file: '',
+        fileType: '',
+        message: '',
+      })
+    },
+    handleIntroduceDelete(item) {
+      this.introduceList.splice(item.$index, 1)
+      console.log('handleIntroduceDelete', item)
+    },
+    addIntroduceFile(index) {
+      this.introduceIndex = index
+      this.$refs.introduceFile.value = ''
+      this.$refs.introduceFile.click()
+    },
+    async introduceFileChange(e) {
+      let files = e.target.files
+      // 图片选中
+      if (files.length) {
+        let data = await this.commonFileUpload(files[0])
+        this.introduceList[this.introduceIndex].file = data.url
+        let type = files[0].type
+        let isImage = this.imageFileType.some((item) => type.includes(item))
+        if (isImage) {
+          this.introduceList[this.introduceIndex].fileType = 'image'
+        } else {
+          this.introduceList[this.introduceIndex].fileType = 'video'
+        }
 
-		getSplitList(data) {
-			if (data) {
-				return data.split(',')
-			}
-			return []
-		},
-	},
+        this.introduceList = JSON.parse(JSON.stringify(this.introduceList))
+      }
+    },
+    /* 文件上传函数 */
+    async commonFileUpload(file) {
+      this.loading = true
+      let formData = new FormData()
+      formData.append('file', file)
+      let res = await upload(formData)
+
+      this.loading = false
+      if (res.code === 200) {
+        return res.data
+      }
+      return false
+    },
+
+    getSplitList(data) {
+      if (data) {
+        return data.split(',')
+      }
+      return []
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-v-deep .hide .el-upload--picture-card {
-	display: none;
+::v-deep .hide .el-upload--picture-card {
+  display: none;
 }
 
 #nurseFile,
 #introduceFile {
-	position: absolute;
-	width: 1px;
-	height: 1px;
-	left: -100px;
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  left: -100px;
 }
+
 video {
-	object-fit: fill;
+  object-fit: fill;
 }
 </style>