|
@@ -101,6 +101,7 @@
|
|
|
height="420"
|
|
height="420"
|
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
|
:row-class-name="rowClassName"
|
|
:row-class-name="rowClassName"
|
|
|
|
|
+ :row-key="rowKey"
|
|
|
@selection-change="onSelectionChange"
|
|
@selection-change="onSelectionChange"
|
|
|
@select="ItemChange"
|
|
@select="ItemChange"
|
|
|
@select-all="listChange"
|
|
@select-all="listChange"
|
|
@@ -186,7 +187,7 @@ watch(activeId, (newVal, oldVal) => {
|
|
|
if (isOfflineMode()) {
|
|
if (isOfflineMode()) {
|
|
|
let filename = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 'swkk' : 'swss';
|
|
let filename = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 'swkk' : 'swss';
|
|
|
let HtmlName = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 'spg.html' : 'offline.html';
|
|
let HtmlName = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 'spg.html' : 'offline.html';
|
|
|
- activeWebSite.value = `./${filename}/${scene.num}/www/${HtmlName}?m=${scene.num}`
|
|
|
|
|
|
|
+ activeWebSite.value = `./${filename}/${scene.num}/wwwroot/${HtmlName}?m=${scene.num}`
|
|
|
} else {
|
|
} else {
|
|
|
activeWebSite.value = scene.webSite || '';
|
|
activeWebSite.value = scene.webSite || '';
|
|
|
}
|
|
}
|
|
@@ -376,6 +377,8 @@ const listChange = (selection) => {
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
const onSelectionChange = (rows: Scene[]) => {
|
|
const onSelectionChange = (rows: Scene[]) => {
|
|
|
|
|
+ console.log(rows, 'rows', selectedRows.value)
|
|
|
|
|
+
|
|
|
// 保证“已导入”的行始终在选中集合中,并与跨页选中合并
|
|
// 保证“已导入”的行始终在选中集合中,并与跨页选中合并
|
|
|
const map = new Map<string, any>();
|
|
const map = new Map<string, any>();
|
|
|
// 先放入全局已选中的集合(跨页保持)
|
|
// 先放入全局已选中的集合(跨页保持)
|
|
@@ -413,7 +416,8 @@ const onConfirmEdit = async () => {
|
|
|
// 组装 {type, numList},包含当前已有的场景
|
|
// 组装 {type, numList},包含当前已有的场景
|
|
|
const mergedList = mergeScenesWithSelection();
|
|
const mergedList = mergeScenesWithSelection();
|
|
|
const numList = mergedList.map((s: any) => s.num);
|
|
const numList = mergedList.map((s: any) => s.num);
|
|
|
- const oldScene = scenes.value.filter(ele => !numList.includes(ele.num)).map(element => { return { ...element, num: element.num, type: element.sceneType } });
|
|
|
|
|
|
|
+ const oldScene = scenes.value.map(element => { return { ...element, num: element.num, type: element.sceneType } });
|
|
|
|
|
+ console.log(oldScene, 'oldScene', mergedList, scenes.value)
|
|
|
const payload = getCaseScenes([...mergedList, ...oldScene] as any[]);
|
|
const payload = getCaseScenes([...mergedList, ...oldScene] as any[]);
|
|
|
await replaceCaseScenes(caseId.value, payload);
|
|
await replaceCaseScenes(caseId.value, payload);
|
|
|
// 刷新案件场景列表
|
|
// 刷新案件场景列表
|