diff --git a/flossom-ui/package.json b/flossom-ui/package.json
index 40416b8..361cb23 100644
--- a/flossom-ui/package.json
+++ b/flossom-ui/package.json
@@ -60,7 +60,7 @@
"vue-meta": "2.4.0",
"vue-router": "3.4.9",
"vue-video-player": "^4.0.6",
- "vuedraggable": "2.24.3",
+ "vuedraggable": "^2.24.3",
"vuex": "3.6.0"
},
"devDependencies": {
diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index 2648180..0566b72 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -469,7 +469,16 @@
-
+
+
+
+
+
+ 排序
@@ -864,6 +873,25 @@
+
+
+
+
+
+ {{element}}
+
+
+
+
+
@@ -891,9 +919,11 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {upload} from "@/api/upload";
+import draggable from 'vuedraggable'
+
export default {
name: 'Instrument',
- components: {Treeselect},
+ components: {Treeselect,draggable},
data() {
return {
// 遮罩层
@@ -1097,6 +1127,23 @@ export default {
}
]
},
+
+
+ isSceneIdsVisible: false,
+ sceneIdsValue: [], // value
+ sceneIdsValueTemp: [],
+ sceneIdsOptions: [
+ {
+ value: '黄金糕',
+ label: '黄金糕'
+ }, {
+ value: '双皮奶',
+ label: '双皮奶'
+ }, {
+ value: '蚵仔煎',
+ label: '蚵仔煎'
+ }
+ ]
}
},
created() {
@@ -1790,6 +1837,18 @@ export default {
viewInstrumentInstruction(item) {
window.open(item.link, '_blank');
},
+
+ openSceneDialog() {
+ this.sceneIdsValueTemp = JSON.parse(JSON.stringify(this.sceneIdsValue))
+ this.isSceneIdsVisible = true;
+ },
+ handleCloseScene() {
+ this.isSceneIdsVisible = false;
+ },
+ handleSaveScene() {
+ this.sceneIdsValue = JSON.parse(JSON.stringify(this.sceneIdsValueTemp))
+ this.handleCloseScene()
+ },
},
}
@@ -1810,4 +1869,10 @@ export default {
video {
object-fit: fill;
}
+
+.itemTag {
+ margin-top: 20px;
+ margin-right: 10px;
+ cursor: pointer;
+}