+
+
+
+
+
diff --git a/report-ui/src/views/excelreport/index.vue b/report-ui/src/views/excelreport/index.vue
index fe9a9a95..a8ff8aca 100644
--- a/report-ui/src/views/excelreport/index.vue
+++ b/report-ui/src/views/excelreport/index.vue
@@ -101,6 +101,7 @@
:visib="visibleForShareDialog"
:reportCode="reportCodeForShareDialog"
:reportName="reportNameForShareDialog"
+ :reportType="reportTypeForShareDialog"
@handleClose="visibleForShareDialog = false"
/>
@@ -130,7 +131,8 @@ export default {
// 分享
visibleForShareDialog: false,
reportCodeForShareDialog: "",
- reportNameForShareDialog: ""
+ reportNameForShareDialog: "",
+ reportTypeForShareDialog: ""
};
},
mounted() {},
@@ -174,12 +176,9 @@ export default {
},
// 分享
share(val) {
- //excel暂不支持
- this.$message.warning("暂不支持excel报表分享");
- return;
-
this.reportCodeForShareDialog = val.reportCode;
this.reportNameForShareDialog = val.reportName;
+ this.reportTypeForShareDialog = val.reportType;
this.visibleForShareDialog = true;
},
openDesign(val) {
diff --git a/report-ui/src/views/layout/components/Navbar.vue b/report-ui/src/views/layout/components/Navbar.vue
index e980f7eb..7fd42b9b 100644
--- a/report-ui/src/views/layout/components/Navbar.vue
+++ b/report-ui/src/views/layout/components/Navbar.vue
@@ -7,21 +7,36 @@
class="hamburger-container"
/>
-
- {{ operatorText }}
-
+
+
确 定
+
+
+
+
+
@@ -127,7 +166,10 @@ export default {
confirmPassword: [
{ required: true, validator: validatePass3, trigger: "blur" }
]
- }
+ },
+
+ // 说明
+ centerDialogVisible: false
};
},
components: {
@@ -204,6 +246,8 @@ export default {
line-height: 50px;
border-radius: 0px !important;
background: #fff !important;
+ display: flex;
+ flex-direction: row;
.hamburger-container {
line-height: 57px;
height: 49px;
@@ -217,15 +261,25 @@ export default {
top: 16px;
color: red;
}
+ .right-menu {
+ position: absolute;
+ right: 35px;
+ display: flex;
+ .item-men {
+ display: flex;
+ flex-direction: row;
+ .item {
+ margin-right: 60px;
+ cursor: pointer;
+ }
+ }
+ }
.avatar-container {
height: 50px;
display: inline-block;
- position: absolute;
- right: 35px;
.avatar-wrapper {
line-height: 50px;
cursor: pointer;
- margin-top: 5px;
position: relative;
.user-avatar {
width: 40px;
diff --git a/report-ui/src/views/layout/components/Sidebar/index.vue b/report-ui/src/views/layout/components/Sidebar/index.vue
index 8b1bc139..1aea2547 100644
--- a/report-ui/src/views/layout/components/Sidebar/index.vue
+++ b/report-ui/src/views/layout/components/Sidebar/index.vue
@@ -3,7 +3,7 @@
+ 个人/商业使用须遵循Apache2.0开源协议。
+ 禁止将AJ-Report产品用于违法违规业务。
+
+
+ 
- V0.9.7.3
+ V0.9.8
+ 
+ 
@@ -109,6 +126,29 @@
:img-size="{ width: '400px', height: '200px' }"
@success="verifylogin"
/>
+
+
+ 个人/商业使用须遵循Apache2.0开源协议。
+ 禁止将AJ-Report产品用于违法违规业务。
+
+
+
-
-
-
+
diff --git a/report-ui/src/views/screenDesigner/layout/leftMenu.vue b/report-ui/src/views/screenDesigner/layout/leftMenu.vue
new file mode 100644
index 00000000..3f1fbe46
--- /dev/null
+++ b/report-ui/src/views/screenDesigner/layout/leftMenu.vue
@@ -0,0 +1,144 @@
+
+
+
-
-
-
- 工具栏
-
-
- 图层
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{ it.label }}
-
-
-
- {{ item.label }}
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ it.label }}
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
diff --git a/report-ui/src/views/screenDesigner/layout/rightConfig.vue b/report-ui/src/views/screenDesigner/layout/rightConfig.vue
new file mode 100644
index 00000000..29d2622b
--- /dev/null
+++ b/report-ui/src/views/screenDesigner/layout/rightConfig.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/report-ui/src/views/screenDesigner/layout/topBar.vue b/report-ui/src/views/screenDesigner/layout/topBar.vue
new file mode 100644
index 00000000..a9ebbd58
--- /dev/null
+++ b/report-ui/src/views/screenDesigner/layout/topBar.vue
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
diff --git a/report-ui/src/views/screenDesigner/node.md b/report-ui/src/views/screenDesigner/node.md
index 2e20709c..141ddb24 100644
--- a/report-ui/src/views/screenDesigner/node.md
+++ b/report-ui/src/views/screenDesigner/node.md
@@ -13,6 +13,10 @@
│ │ ├── pieCharts(文件夹) (饼图)
│ │ ├── texts(文件夹) (文本、滚动文本、超链接、当前时间、图片、视频、表格、内联框架)
│ │ ├── wordcloudCharts(文件夹) (词云图)
+│ ├── layout(文件夹)
+│ │ ├── left.vue 大屏左侧工具栏
+│ │ ├── middle.vue 大屏中间配置
+│ │ ├── right.vue 大屏右侧配置
│ ├── util(文件夹) 公共 js
│ ├── widget(文件夹) 图表组件
│ │ ├── barCharts(文件夹) (柱状图)
diff --git a/report-ui/src/views/screenDesigner/util/revoke.js b/report-ui/src/views/screenDesigner/util/revoke.js
new file mode 100644
index 00000000..8cb590c1
--- /dev/null
+++ b/report-ui/src/views/screenDesigner/util/revoke.js
@@ -0,0 +1,92 @@
+export class Revoke {
+ // 历史记录
+ recordList = [];
+
+ // 撤销记录，用于重做
+ redoList = [];
+
+ // 当前记录用currentRecord变量暂时存储，当用户修改时，再存放到recordList
+ currentRecord = null;
+
+ // 上次插入数据时间
+ time = 0;
+
+ /**
+ * @description: 插入历史记录
+ * @param {object}record
+ * @return {boolean}
+ */
+ push(record) {
+ const nowTime = Date.now();
+ // 防止添加重复的时间，当添加间隔小于100ms时，则替换当前记录并取消执行添加
+ if (this.time + 100 > nowTime) {
+ this.currentRecord = JSON.stringify(record);
+ return false;
+ }
+
+ this.time = nowTime;
+ // 判断之前是否已经存在currentRecord记录，有则存储到recordList
+ if (this.currentRecord) {
+ this.recordList.push(this.currentRecord);
+ //（清空记录）增加记录后则应该清空重做记录
+ //splice() 方法向/从数组添加/删除项目，并返回删除的项目。
+ this.redoList.splice(0, this.redoList.length);
+ }
+ // 将json转成字符串存储
+ this.currentRecord = JSON.stringify(record);
+
+ // 最多存储2000条记录，超过2000条记录则删除之前的记录
+ if (this.length > 2000) {
+ //unshift() 方法将新项添加到数组的开头，并返回新的长度。
+ this.recordList.unshift();
+ }
+
+ return true;
+ }
+
+ /**
+ * @description: 撤销操作
+ * @param {*}
+ * @return {object}
+ */
+ undo() {
+ // 没有记录时,返回false
+ // 新建的recordList里面，不知为什么会存在一条记录，未找到原因，所以就判断长度为1时就不能撤销了。
+ if (this.recordList.length === 1 ) {
+ return false;
+ }
+ //pop()： 方法用于删除并返回数组的最后一个元素。
+ const record = this.recordList.pop();
+
+ // 将当前记录添加到重做记录里面
+ if (this.currentRecord) {
+ this.redoList.push(this.currentRecord);
+ }
+ // 丢弃当前记录，防止重复添加
+ this.currentRecord = null;
+ //返回撤销的记录
+ return JSON.parse(record);
+ }
+
+ /**
+ * @description: 重做操作
+ * @param {*}
+ * @return {*}
+ */
+ redo() {
+ // 没有重做记录时,返回false
+ if (this.redoList.length === 0) {
+ return false;
+ }
+ //pop()： 方法用于删除并返回数组的最后一个元素。
+ const record = this.redoList.pop();
+ // 添加到重做记录里面
+ if (this.currentRecord) {
+ this.recordList.push(this.currentRecord);
+ }
+ // 丢弃当前记录，防止重复添加
+ this.currentRecord = null;
+
+ return JSON.parse(record);
+ }
+}
diff --git a/report-ui/src/views/screenDesigner/util/screen.js b/report-ui/src/views/screenDesigner/util/screen.js
index 6a7622cc..01196cb1 100644
--- a/report-ui/src/views/screenDesigner/util/screen.js
+++ b/report-ui/src/views/screenDesigner/util/screen.js
@@ -15,6 +15,7 @@ export const handlerLayerWidget = (val, getToolByCode) => {
}
export const handleBigScreen = (data, getToolByCode, callBcak) => {
+ console.log('aa', getToolByCode("screen"))
const optionScreen = getToolByCode("screen").options;
const setup = optionScreen.setup;
for (const key in data) {