Browse Source

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue
qianming 1 năm trước cách đây
mục cha
commit
f700f46f25
58 tập tin đã thay đổi với 343 bổ sung95 xóa
  1. 7 0
      report-ui/src/components/AnjiPlus/anji-autocomplete.vue
  2. 7 0
      report-ui/src/components/AnjiPlus/anji-cascader.vue
  3. 7 0
      report-ui/src/components/AnjiPlus/anji-checkbox.vue
  4. 7 0
      report-ui/src/components/AnjiPlus/anji-crud/anji-crud.vue
  5. 7 0
      report-ui/src/components/AnjiPlus/anji-crud/edit-form.vue
  6. 7 0
      report-ui/src/components/AnjiPlus/anji-crud/edit-table.vue
  7. 7 0
      report-ui/src/components/AnjiPlus/anji-crud/edit.vue
  8. 7 0
      report-ui/src/components/AnjiPlus/anji-dialog.vue
  9. 7 0
      report-ui/src/components/AnjiPlus/anji-fourLevel.vue
  10. 7 0
      report-ui/src/components/AnjiPlus/anji-input.vue
  11. 7 0
      report-ui/src/components/AnjiPlus/anji-select.vue
  12. 5 4
      report-ui/src/components/AnjiPlus/anji-tree.vue
  13. 7 0
      report-ui/src/components/AnjiPlus/anji-upload.vue
  14. 7 0
      report-ui/src/components/configForm.vue
  15. 7 0
      report-ui/src/components/eachForm.vue
  16. 6 6
      report-ui/src/router/index.js
  17. 3 3
      report-ui/src/views/accessAuthority/index.vue
  18. 8 0
      report-ui/src/views/accessRole/components/RoleAuthority.vue
  19. 3 3
      report-ui/src/views/accessRole/index.vue
  20. 8 0
      report-ui/src/views/accessUser/components/UserRole.vue
  21. 2 2
      report-ui/src/views/accessUser/index.vue
  22. 7 0
      report-ui/src/views/bigscreenDesigner/designer/components/colorPicker.vue
  23. 7 0
      report-ui/src/views/bigscreenDesigner/designer/components/contentMenu.vue
  24. 7 0
      report-ui/src/views/bigscreenDesigner/designer/components/customColorComponents.vue
  25. 5 4
      report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue
  26. 7 0
      report-ui/src/views/bigscreenDesigner/designer/index.vue
  27. 5 5
      report-ui/src/views/bigscreenDesigner/designer/tools/index.js
  28. 7 0
      report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue
  29. 7 0
      report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue
  30. 7 0
      report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue
  31. 3 3
      report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetHref.vue
  32. 12 16
      report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue
  33. 3 3
      report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue
  34. 7 0
      report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue
  35. 7 7
      report-ui/src/views/bigscreenDesigner/index.vue
  36. 8 0
      report-ui/src/views/bigscreenDesigner/share/shareConfig.vue
  37. 5 4
      report-ui/src/views/bigscreenDesigner/share/shareLink.vue
  38. 3 3
      report-ui/src/views/bigscreenDesigner/viewer/index.vue
  39. 8 0
      report-ui/src/views/datasource/components/EditDataSource.vue
  40. 1 1
      report-ui/src/views/datasource/index.vue
  41. 8 0
      report-ui/src/views/dict/dict-item.vue
  42. 2 2
      report-ui/src/views/dict/index.vue
  43. 7 0
      report-ui/src/views/excelreport/components/colorPicker.vue
  44. 2 2
      report-ui/src/views/excelreport/designer/drag.js
  45. 4 4
      report-ui/src/views/excelreport/designer/index.vue
  46. 7 7
      report-ui/src/views/excelreport/index.vue
  47. 7 0
      report-ui/src/views/excelreport/share/shareConfig.vue
  48. 4 3
      report-ui/src/views/excelreport/share/shareLink.vue
  49. 5 4
      report-ui/src/views/excelreport/viewer/index.vue
  50. 2 2
      report-ui/src/views/fileManagement/index.vue
  51. 2 2
      report-ui/src/views/home/index.vue
  52. 8 0
      report-ui/src/views/reportManage/components/share.vue
  53. 2 2
      report-ui/src/views/reportManage/index.vue
  54. 8 0
      report-ui/src/views/resultset/components/DataView.vue
  55. 8 0
      report-ui/src/views/resultset/components/EditDataSet.vue
  56. 8 0
      report-ui/src/views/resultset/components/MonacoEditor.vue
  57. 3 3
      report-ui/src/views/screenDesigner/widget/texts/widgetText.vue
  58. 7 0
      report-ui/src/views/shareManage/index.vue

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-autocomplete.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 
+ * @Author: qianlishi
+ * @Date: 2021-12-13 10:17:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 10:17:24
+ !-->
 <template>
 <template>
   <el-autocomplete
   <el-autocomplete
     v-model.trim="inputValue"
     v-model.trim="inputValue"

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-cascader.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 
+ * @Author: qianlishi
+ * @Date: 2021-12-13 10:42:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2022-3-9 10:04:24
+ !-->
 <template>
 <template>
   <div>
   <div>
     <el-row>
     <el-row>

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-checkbox.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 
+ * @Author: qianlishi
+ * @Date: 2021-12-13 10:42:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2022-5-4 10:04:24
+ !-->
 <template>
 <template>
   <el-checkbox-group v-model="selectValue" class="filter-item" @change="change">
   <el-checkbox-group v-model="selectValue" class="filter-item" @change="change">
     <el-checkbox
     <el-checkbox

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-crud/anji-crud.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 增删改查列表查询组件
+ * @Author: Devli
+ * @Date: 2021-7-17 10:42:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-3-9 10:04:24
+ !-->
 <template>
 <template>
   <div :class="[hasTreeFieldInQueryForm ? 'page-container' : 'app-container']">
   <div :class="[hasTreeFieldInQueryForm ? 'page-container' : 'app-container']">
     <div v-if="hasTreeFieldInQueryForm" class="left-container">
     <div v-if="hasTreeFieldInQueryForm" class="left-container">

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-crud/edit-form.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 增删改查列表查询页-新增编辑组件
+ * @Author: Devli
+ * @Date: 2021-7-17 10:42:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 10:40:24
+ !-->
 <template>
 <template>
   <div
   <div
     v-if="option['hide'] == null || option['hide'] == false"
     v-if="option['hide'] == null || option['hide'] == false"

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-crud/edit-table.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 增删改查列表查询页-表格行编辑组件
+ * @Author: Devli
+ * @Date: 2021-7-17 10:42:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 11:04:24
+ !-->
 <template>
 <template>
   <div
   <div
     v-if="option['hide'] == null || option['hide'] == false"
     v-if="option['hide'] == null || option['hide'] == false"

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-crud/edit.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 增删改查列表查询页-编辑组件
+ * @Author: Devli
+ * @Date: 2021-7-17 10:42:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 11:20:24
+ !-->
 <template>
 <template>
   <el-dialog
   <el-dialog
     :width="dialogWidth"
     :width="dialogWidth"

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-dialog.vue

@@ -1,3 +1,10 @@
+ <!--
+ * @Descripttion: 
+ * @Author: qianlishi
+ * @Date: 2021-12-13 10:17:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 11:20:24
+ !-->
 <template>
 <template>
   <el-dialog
   <el-dialog
     :width="dialogWidth"
     :width="dialogWidth"

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-fourLevel.vue

@@ -1,3 +1,10 @@
+ <!--
+ * @Descripttion: 
+ * @Author: qianlishi
+ * @Date: 2021-12-13 10:17:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 11:20:24
+ !-->
 <template>
 <template>
   <el-cascader ref="country" v-model="countryValue" size="mini" :props="props" :options="countryOptions" style="width: 100%" clearable @change="handleChange" />
   <el-cascader ref="country" v-model="countryValue" size="mini" :props="props" :options="countryOptions" style="width: 100%" clearable @change="handleChange" />
 </template>
 </template>

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-input.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 
+ * @Author: qianlishi
+ * @Date: 2021-12-13 10:17:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 11:20:24
+ !-->
 <template>
 <template>
   <div class="anji-input">
   <div class="anji-input">
     <el-input v-model="inputValue" type="number" :placeholder="placeholder" :disabled="disabled" clearable @change="change">
     <el-input v-model="inputValue" type="number" :placeholder="placeholder" :disabled="disabled" clearable @change="change">

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-select.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 
+ * @Author: Devli
+ * @Date: 2021-7-17 10:42:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2023-1-10 13:04:24
+ !-->
 <!--element下拉列表封装
 <!--element下拉列表封装
   使用:
   使用:
    <hyb-select ref="hybSelect"
    <hyb-select ref="hybSelect"

+ 5 - 4
report-ui/src/components/AnjiPlus/anji-tree.vue

@@ -1,8 +1,9 @@
 <!--
 <!--
- * @Author: lide1202@hotmail.com
- * @Date: 2021-5-4 11:04:24 
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-5-5 11:04:24 
+ * @Descripttion: 
+ * @Author: Devli
+ * @Date: 2021-7-17 10:45:24 
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 11:04:24 
  !-->
  !-->
 <template>
 <template>
   <div>
   <div>

+ 7 - 0
report-ui/src/components/AnjiPlus/anji-upload.vue

@@ -1,3 +1,10 @@
+ <!--
+ * @Descripttion: 
+ * @Author: qianlishi
+ * @Date: 2021-8-4 10:17:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2022-5-14 11:20:24
+ !-->
 <template>
 <template>
   <div class="uploadImage">
   <div class="uploadImage">
     <el-upload
     <el-upload

+ 7 - 0
report-ui/src/components/configForm.vue

@@ -4,6 +4,13 @@
 * @property placeholder
 * @property placeholder
 * @property style
 * @property style
 */
 */
+ <!--
+ * @Descripttion: 动态表单组件
+ * @Author: Devli
+ * @Date: 2021-2-10 10:17:24
+ * @Last Modified by:   yanzili
+ * @Last Modified time: 2021-6-24 11:20:24
+ !-->
 <template>
 <template>
 <span>
 <span>
   <span class="grid-content" v-for="(item, index) in formItemsArr" :key="index" style="">
   <span class="grid-content" v-for="(item, index) in formItemsArr" :key="index" style="">

+ 7 - 0
report-ui/src/components/eachForm.vue

@@ -1,3 +1,10 @@
+ <!--
+ * @Descripttion: 参数-动态表单组件
+ * @Author: Devli
+ * @Date: 2021-2-10 10:17:24
+ * @Last Modified by:   yanzili
+ * @Last Modified time: 2021-6-24 11:20:24
+ !-->
 <template>
 <template>
   <span>
   <span>
     <!-- input 输入框-->
     <!-- input 输入框-->

+ 6 - 6
report-ui/src/router/index.js

@@ -32,12 +32,12 @@ export const constantRouterMap = [
   },
   },
   {
   {
     path: '/aj/**',
     path: '/aj/**',
-    component: () => import('@/views/bigScreenReport/aj'),
+    component: () => import('@/views/bigScreenDesigner/share/shareLink'),
     hidden: true
     hidden: true
   },
   },
   {
   {
     path: '/el/**',
     path: '/el/**',
-    component: () => import('@/views/excelreport/el'),
+    component: () => import('@/views/excelreport/share/shareLink'),
     hidden: true
     hidden: true
   },
   },
   {
   {
@@ -160,7 +160,7 @@ export const constantRouterMap = [
       {
       {
         path: 'bigscreen',
         path: 'bigscreen',
         name: 'bigscreen',
         name: 'bigscreen',
-        component: () => import('@/views/bigScreenReport/index'),
+        component: () => import('@/views/bigScreenDesigner/index'),
         meta: {
         meta: {
           title: '大屏报表',
           title: '大屏报表',
           icon: 'iconchufaqipeizhi-hui',
           icon: 'iconchufaqipeizhi-hui',
@@ -182,9 +182,9 @@ export const constantRouterMap = [
         }
         }
       },
       },
       {
       {
-        path: 'reportshare',
-        name: 'reportshare',
-        component: () => import('@/views/reportShare/index'),
+        path: 'shareManage',
+        name: 'shareManage',
+        component: () => import('@/views/shareManage/index'),
         meta: {
         meta: {
           title: '报表分享',
           title: '报表分享',
           icon: 'iconfenxiang1',
           icon: 'iconfenxiang1',

+ 3 - 3
report-ui/src/views/accessAuthority/index.vue

@@ -1,10 +1,10 @@
 <!--
 <!--
  * @Descripttion: 用户权限--权限管理
  * @Descripttion: 用户权限--权限管理
  * @version:
  * @version:
- * @Author: qianlishi
- * @Date: 2021-12-11 14:48:27
+ * @Author: Devli
+ * @Date: 2021-7-17 10:46:31
  * @LastEditors: qianlishi
  * @LastEditors: qianlishi
- * @LastEditTime: 2022-03-09 09:22:40
+ * @LastEditTime: 2023-11-23 14:52:17
 -->
 -->
 <template>
 <template>
   <anji-crud ref="listPage" :option="crudOption" />
   <anji-crud ref="listPage" :option="crudOption" />

+ 8 - 0
report-ui/src/views/accessRole/components/RoleAuthority.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 为角色分配权限
+ * @version:
+ * @Author: Devli
+ * @Date: 2021-7-17 10:46:31
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-12-13 12:14:58
+-->
 <template>
 <template>
   <el-dialog
   <el-dialog
     class="tree_dialog"
     class="tree_dialog"

+ 3 - 3
report-ui/src/views/accessRole/index.vue

@@ -1,10 +1,10 @@
 <!--
 <!--
  * @Descripttion: 用户权限--角色管理
  * @Descripttion: 用户权限--角色管理
  * @version: 
  * @version: 
- * @Author: qianlishi
- * @Date: 2021-12-11 14:48:27
+ * @Author: Devli
+ * @Date: 2021-7-17 10:46:27
  * @LastEditors: qianlishi
  * @LastEditors: qianlishi
- * @LastEditTime: 2022-03-09 09:40:01
+ * @LastEditTime: 2022-3-9 10:53:57
 -->
 -->
 <template>
 <template>
   <anji-crud ref="listPage" :option="crudOption">
   <anji-crud ref="listPage" :option="crudOption">

+ 8 - 0
report-ui/src/views/accessUser/components/UserRole.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 为用户分配角色
+ * @version:
+ * @Author: Devli
+ * @Date: 2021-7-17 10:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-12-13 14:56:58
+-->
 <template>
 <template>
   <el-dialog
   <el-dialog
     class="tree_dialog"
     class="tree_dialog"

+ 2 - 2
report-ui/src/views/accessUser/index.vue

@@ -1,10 +1,10 @@
 <!--
 <!--
  * @Descripttion: 用户权限--用户管理
  * @Descripttion: 用户权限--用户管理
  * @version:
  * @version:
- * @Author: qianlishi
+ * @Author: Devli
  * @Date: 2021-12-11 14:48:27
  * @Date: 2021-12-11 14:48:27
  * @LastEditors: qianlishi
  * @LastEditors: qianlishi
- * @LastEditTime: 2022-03-09 09:40:56
+ * @LastEditTime: 2022-3-9 14:56:10
 -->
 -->
 <template>
 <template>
   <anji-crud ref="listPage" :option="crudOption">
   <anji-crud ref="listPage" :option="crudOption">

+ 7 - 0
report-ui/src/views/bigscreenDesigner/designer/components/colorPicker.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 报表设计--报表管理
+ * @Author: Devli
+ * @Date: 2021-4-9 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2022-05-17 17:38:44
+-->
 <template>
 <template>
   <el-input
   <el-input
     clearable
     clearable

+ 7 - 0
report-ui/src/views/bigscreenDesigner/designer/components/contentMenu.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 组件右键菜单
+ * @Author: qianlishi
+ * @Date: 2021-6-25 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2023-3-6 17:38:44
+-->
 <template>
 <template>
   <div v-show="visible" class="contentmenu" :style="styleObj">
   <div v-show="visible" class="contentmenu" :style="styleObj">
     <div class="contentmenu__item" @click="deleteLayer">
     <div class="contentmenu__item" @click="deleteLayer">

+ 7 - 0
report-ui/src/views/bigscreenDesigner/designer/components/customColorComponents.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 组件右键菜单
+ * @Author: qianlishi
+ * @Date: 2021-6-25 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-12-13 17:38:44
+-->
 <template>
 <template>
   <div>
   <div>
     <el-button
     <el-button

+ 5 - 4
report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue

@@ -1,8 +1,9 @@
 <!--
 <!--
- * @Author: lide1202@hotmail.com
- * @Date: 2021-4-6 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-3-13 11:04:24
+ * @Descripttion: 大屏设计器-右区动态表单
+ * @Author: Devli
+ * @Date: 2021-3-13 11:04:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2022-3-14 14:04:24
  !-->
  !-->
 <template>
 <template>
   <div class="collapse-input-style">
   <div class="collapse-input-style">

+ 7 - 0
report-ui/src/views/bigscreenDesigner/designer/index.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 大屏报表设计器-主体页面
+ * @Author: Devli
+ * @Date: 2021-3-19 10:23:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2023-03-17 17:38:44
+-->
 <template>
 <template>
   <div class="layout">
   <div class="layout">
     <div
     <div

+ 5 - 5
report-ui/src/views/bigscreenDesigner/designer/tools/index.js

@@ -1,10 +1,10 @@
 /*
 /*
- * @Descripttion: 主文件
+ * @Descripttion: 大屏设置项
  * @version:
  * @version:
- * @Author: qianlishi
- * @Date: 2021-08-29 06:43:07
- * @LastEditors: lide1202
- * @LastEditTime: 2023-11-22 15:00:35
+ * @Author: Devli
+ * @Date: 2021-3-23 13:01:07
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2023-3-9 15:00:35
  */
  */
 import { widgetTool } from "./main"
 import { widgetTool } from "./main"
 const screenConfig = {
 const screenConfig = {

+ 7 - 0
report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 大屏报表设计器-动态组件
+ * @Author: qianming
+ * @Date: 2021-8-24 16:38:27
+ * @LastEditors: qianming
+ * @LastEditTime: 2023-11-21 17:38:44
+-->
 <template>
 <template>
   <div :style="styleObj">
   <div :style="styleObj">
     <v-chart ref="myVChart" :options="options" autoresize/>
     <v-chart ref="myVChart" :options="options" autoresize/>

+ 7 - 0
report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 大屏报表设计器-动态组件
+ * @Author: qianlishi
+ * @Date: 2021-4-15 16:38:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2023-3-9 17:38:44
+-->
 <template>
 <template>
   <div :style="styleObj">
   <div :style="styleObj">
     <v-chart ref="myVChart" :options="options" autoresize/>
     <v-chart ref="myVChart" :options="options" autoresize/>

+ 7 - 0
report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 大屏报表设计器-组件注册
+ * @Author: Devli
+ * @Date: 2021-3-19 10:23:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2023-2-7 17:38:44
+-->
 <template>
 <template>
   <div>
   <div>
     <component
     <component

+ 3 - 3
report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetHref.vue

@@ -1,8 +1,8 @@
 <!--
 <!--
- * @Author: lide1202@hotmail.com
+ * @Author: Devli
  * @Date: 2021-3-13 11:04:24
  * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-3-13 11:04:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2022-3-14 14:04:24
  !-->
  !-->
 <template>
 <template>
   <a
   <a

+ 12 - 16
report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue

@@ -3,24 +3,16 @@
     <superslide v-if="hackReset" :options="options" class="txtScroll-top">
     <superslide v-if="hackReset" :options="options" class="txtScroll-top">
       <!--表头-->
       <!--表头-->
       <div class="title">
       <div class="title">
-        <div
-          v-for="(item, index) in header"
-          :style="[headerTableStyle, tableFiledWidth(index), tableRowHeight()]"
-          :key="index"
-        >
+        <div v-for="(item, index) in header" :key="index"
+          :style="[headerTableStyle, tableFiledWidth(index), tableRowHeight()]">
           {{ item.name }}
           {{ item.name }}
         </div>
         </div>
       </div>
       </div>
       <!--数据-->
       <!--数据-->
       <div class="bd">
       <div class="bd">
         <ul class="infoList">
         <ul class="infoList">
-          <li
-            v-for="(item, index) in list"
-            :key="index"
-            :style="tableRowHeight()"
-          >
-            <div
-              v-for="(itemChild, idx) in header"
+          <li v-for="(item, index) in list" :key="index" :style="tableRowHeight()">
+            <div v-for="(itemChild, idx) in header"
               :key="idx"
               :key="idx"
               :style="[
               :style="[
                 bodyTableStyle,
                 bodyTableStyle,
@@ -106,7 +98,7 @@ export default {
         "border-style": bodyStyle.isLine ? "solid" : "none",
         "border-style": bodyStyle.isLine ? "solid" : "none",
         "border-width": bodyStyle.borderWidth + "px",
         "border-width": bodyStyle.borderWidth + "px",
         "border-color": bodyStyle.borderColor,
         "border-color": bodyStyle.borderColor,
-        color: bodyStyle.bodyColor,
+        "color": bodyStyle.bodyColor,
         "background-color": bodyStyle.tableBgColor
         "background-color": bodyStyle.tableBgColor
       };
       };
     }
     }
@@ -222,10 +214,10 @@ export default {
       styleJson["text-overflow"] = "ellipsis";
       styleJson["text-overflow"] = "ellipsis";
       if (this.optionsSetUp.rowHeight) {
       if (this.optionsSetUp.rowHeight) {
         styleJson["height"] = this.optionsSetUp.rowHeight + "px";
         styleJson["height"] = this.optionsSetUp.rowHeight + "px";
-        styleJson["line-height"] = this.optionsSetUp.rowHeight + "px";
+        //styleJson["line-height"] = this.optionsSetUp.rowHeight + "px";
       } else {
       } else {
         styleJson["height"] = this.options.rowHeight;
         styleJson["height"] = this.options.rowHeight;
-        styleJson["line-height"] = this.optionsSetUp.rowHeight + "px";
+        //styleJson["line-height"] = this.optionsSetUp.rowHeight + "px";
       }
       }
       return styleJson;
       return styleJson;
     },
     },
@@ -264,13 +256,17 @@ export default {
 
 
 .txtScroll-top .infoList li {
 .txtScroll-top .infoList li {
   height: 50px;
   height: 50px;
-  line-height: 50px;
+  //line-height: 50px;
   display: flex;
   display: flex;
   flex-direction: row;
   flex-direction: row;
 }
 }
 
 
 .txtScroll-top .infoList li > div {
 .txtScroll-top .infoList li > div {
   width: 100%;
   width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
 }
 }
 
 
 /*.txtScroll-top .infoList li:nth-child(n) {
 /*.txtScroll-top .infoList li:nth-child(n) {

+ 3 - 3
report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue

@@ -1,8 +1,8 @@
 <!--
 <!--
- * @Author: lide1202@hotmail.com
+ * @Author: Devli
  * @Date: 2021-3-13 11:04:24
  * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-3-13 11:04:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2022-3-14 14:04:24
  !-->
  !-->
 <template>
 <template>
   <div class="text" :style="styleColor">{{ styleColor.text }}</div>
   <div class="text" :style="styleColor">{{ styleColor.text }}</div>

+ 7 - 0
report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 大屏报表设计器-动态组件
+ * @Author: Devli
+ * @Date: 2021-3-26 16:38:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2023-3-9 17:38:44
+-->
 <template>
 <template>
   <avue-draggable
   <avue-draggable
     :step="step"
     :step="step"

+ 7 - 7
report-ui/src/views/bigScreenReport/index.vue → report-ui/src/views/bigscreenDesigner/index.vue

@@ -1,8 +1,8 @@
 <!--
 <!--
- * @Descripttion: 报表设计--大屏报表列表
- * @Author: lide1202@hotmail.com
- * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
+ * @Descripttion: 大屏报表卡片列表
+ * @Author: Devli
+ * @Date: 2021-3-19 10:23:24
+ * @Last Modified by:   qianlishi
  * @Last Modified time: 2021-3-13 11:04:24
  * @Last Modified time: 2021-3-13 11:04:24
  !-->
  !-->
 <template>
 <template>
@@ -97,7 +97,7 @@
         @current-change="handleCurrentChange"
         @current-change="handleCurrentChange"
       />
       />
     </div>
     </div>
-    <Share
+    <ShareConfig
       :visib="visibleForShareDialog"
       :visib="visibleForShareDialog"
       :reportCode="reportCodeForShareDialog"
       :reportCode="reportCodeForShareDialog"
       :reportName="reportNameForShareDialog"
       :reportName="reportNameForShareDialog"
@@ -108,11 +108,11 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import Share from "./components/share";
+import ShareConfig from "./share/shareConfig";
 import { reportPageList } from "@/api/report";
 import { reportPageList } from "@/api/report";
 export default {
 export default {
   name: "Login",
   name: "Login",
-  components: { Share },
+  components: { ShareConfig },
   data() {
   data() {
     return {
     return {
       list: [],
       list: [],

+ 8 - 0
report-ui/src/views/bigScreenReport/components/share.vue → report-ui/src/views/bigscreenDesigner/share/shareConfig.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 分享链接弹框
+ * @Author: Devli
+ * @Date: 2021-7-18 6:19:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 11:04:24
+ !-->
+
 <template>
 <template>
   <el-dialog
   <el-dialog
     class="tree_dialog"
     class="tree_dialog"

+ 5 - 4
report-ui/src/views/bigScreenReport/aj/index.vue → report-ui/src/views/bigscreenDesigner/share/shareLink.vue

@@ -1,8 +1,9 @@
 <!--
 <!--
- * @Author: lide1202@hotmail.com
- * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-3-13 11:04:24
+ * @Descripttion: 大屏分享链接--解析识别入口
+ * @Author: qianlishi
+ * @Date: 2021-12-13 13:04:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2023-9-8 11:04:24
  !-->
  !-->
 <template>
 <template>
   <div>
   <div>

+ 3 - 3
report-ui/src/views/bigscreenDesigner/viewer/index.vue

@@ -1,9 +1,9 @@
 <!--
 <!--
  * @Descripttion: 大屏设计器 -- 预览
  * @Descripttion: 大屏设计器 -- 预览
- * @Author: lide1202@hotmail.com
+ * @Author: Devli
  * @Date: 2021-3-13 11:04:24
  * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-3-13 11:04:24
+ * @Last Modified by:   Raod
+ * @Last Modified time: 2022-5-6 11:04:24
  !-->
  !-->
 <template>
 <template>
   <div class="layout">
   <div class="layout">

+ 8 - 0
report-ui/src/views/datasource/components/EditDataSource.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 报表设计--数据源
+ * @version: 
+ * @Author: yanzili
+ * @Date: 2021-12-11 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2022-03-09 09:43:31
+-->
 <template>
 <template>
   <el-dialog
   <el-dialog
     title="项目基础配置"
     title="项目基础配置"

+ 1 - 1
report-ui/src/views/datasource/index.vue

@@ -1,7 +1,7 @@
 <!--
 <!--
  * @Descripttion: 报表设计--数据源
  * @Descripttion: 报表设计--数据源
  * @version: 
  * @version: 
- * @Author: qianlishi
+ * @Author: yanzili
  * @Date: 2021-12-11 14:48:27
  * @Date: 2021-12-11 14:48:27
  * @LastEditors: qianlishi
  * @LastEditors: qianlishi
  * @LastEditTime: 2022-03-09 09:43:31
  * @LastEditTime: 2022-03-09 09:43:31

+ 8 - 0
report-ui/src/views/dict/dict-item.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 系统设置--字典项
+ * @version: 
+ * @Author: Raod
+ * @Date: 2021-12-11 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2022-3-9 15:00:36
+-->
 <template>
 <template>
   <anji-crud ref="listPage" :option="crudOption" />
   <anji-crud ref="listPage" :option="crudOption" />
 </template>
 </template>

+ 2 - 2
report-ui/src/views/dict/index.vue

@@ -1,10 +1,10 @@
 <!--
 <!--
  * @Descripttion: 系统设置--数字字典
  * @Descripttion: 系统设置--数字字典
  * @version: 
  * @version: 
- * @Author: qianlishi
+ * @Author: Raod
  * @Date: 2021-12-11 14:48:27
  * @Date: 2021-12-11 14:48:27
  * @LastEditors: qianlishi
  * @LastEditors: qianlishi
- * @LastEditTime: 2022-03-09 10:02:26
+ * @LastEditTime: 2022-3-9 14:59:53
 -->
 -->
 <template>
 <template>
   <anji-crud ref="listPage" :option="crudOption">
   <anji-crud ref="listPage" :option="crudOption">

+ 7 - 0
report-ui/src/views/excelreport/components/colorPicker.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 
+ * @Author: yanzili
+ * @Date: 2021-6-24 10:23:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 12:04:24
+ !-->
 <template>
 <template>
   <el-input
   <el-input
     clearable
     clearable

+ 2 - 2
report-ui/src/views/excelreport/designer/drag.js

@@ -15,7 +15,7 @@ Vue.directive('dragx', (el, binding, vnode) => {
   let cfg = Object.assign({}, defaultOpts, binding.value);
   let cfg = Object.assign({}, defaultOpts, binding.value);
 
 
   // 获取目标元素 resize方向
   // 获取目标元素 resize方向
-  function getDirection (e) {
+  function getDirection(e) {
     let el = e.currentTarget;
     let el = e.currentTarget;
     let dir = '';
     let dir = '';
     let rect = el.getBoundingClientRect();
     let rect = el.getBoundingClientRect();
@@ -60,7 +60,7 @@ Vue.directive('dragx', (el, binding, vnode) => {
     }
     }
     let dir = getDirection(e);
     let dir = getDirection(e);
     let style = window.getComputedStyle(el);
     let style = window.getComputedStyle(el);
-    function getStyleNumValue (key) {
+    function getStyleNumValue(key) {
       return parseInt(style.getPropertyValue(key), 10)
       return parseInt(style.getPropertyValue(key), 10)
     }
     }
     let rect = el.getBoundingClientRect();
     let rect = el.getBoundingClientRect();

+ 4 - 4
report-ui/src/views/excelreport/designer/index.vue

@@ -1,8 +1,8 @@
 <!--
 <!--
- * @Author: lide1202@hotmail.com
- * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-3-13 11:04:24
+ * @Author: yanzili
+ * @Date: 2021-6-24 11:04:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 11:04:24
  !-->
  !-->
 <template>
 <template>
   <div class="layout">
   <div class="layout">

+ 7 - 7
report-ui/src/views/excelreport/index.vue

@@ -1,9 +1,9 @@
 <!--
 <!--
  * @Descripttion: 报表设计--表格报表
  * @Descripttion: 报表设计--表格报表
- * @Author: lide1202@hotmail.com
- * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-3-13 11:04:24
+ * @Author: Devli
+ * @Date: 2021-3-19 10:23:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2021-12-13 12:04:24
  !-->
  !-->
 <template>
 <template>
   <div class="main-layout">
   <div class="main-layout">
@@ -97,7 +97,7 @@
         @current-change="handleCurrentChange"
         @current-change="handleCurrentChange"
       />
       />
     </div>
     </div>
-    <Share
+    <ShareConfig
       :visib="visibleForShareDialog"
       :visib="visibleForShareDialog"
       :reportCode="reportCodeForShareDialog"
       :reportCode="reportCodeForShareDialog"
       :reportName="reportNameForShareDialog"
       :reportName="reportNameForShareDialog"
@@ -108,11 +108,11 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import Share from "./components/share";
+import ShareConfig from "./share/shareConfig";
 import { reportPageList } from "@/api/report";
 import { reportPageList } from "@/api/report";
 export default {
 export default {
   name: "Login",
   name: "Login",
-  components: { Share },
+  components: { ShareConfig },
   data() {
   data() {
     return {
     return {
       list: [],
       list: [],

+ 7 - 0
report-ui/src/views/excelreport/components/share.vue → report-ui/src/views/excelreport/share/shareConfig.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 
+ * @Author: Devli
+ * @Date: 2021-7-18 18:23:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2022-8-5 12:04:24
+ !-->
 <template>
 <template>
   <el-dialog
   <el-dialog
     class="tree_dialog"
     class="tree_dialog"

+ 4 - 3
report-ui/src/views/excelreport/el/index.vue → report-ui/src/views/excelreport/share/shareLink.vue

@@ -1,7 +1,8 @@
 <!--
 <!--
- * @Author: lide1202@hotmail.com
- * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
+ * @Descripttion: 
+ * @Author: qianlishi
+ * @Date: 2021-12-13 11:04:24
+ * @Last Modified by:   qianming
  * @Last Modified time: 2021-3-13 11:04:24
  * @Last Modified time: 2021-3-13 11:04:24
  !-->
  !-->
 <template>
 <template>

+ 5 - 4
report-ui/src/views/excelreport/viewer/index.vue

@@ -1,8 +1,9 @@
 <!--
 <!--
- * @Author: lide1202@hotmail.com
- * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-3-13 11:04:24
+ * @Descripttion: 
+ * @Author: qianlishi
+ * @Date: 2021-3-19 10:23:24
+ * @Last Modified by:   Raod
+ * @Last Modified time: 2022-1-26 11:04:24
  !-->
  !-->
 <template>
 <template>
   <div class="layout">
   <div class="layout">

+ 2 - 2
report-ui/src/views/fileManagement/index.vue

@@ -1,8 +1,8 @@
 <!--
 <!--
  * @Descripttion: 系统设置--文件管理
  * @Descripttion: 系统设置--文件管理
  * @version: 
  * @version: 
- * @Author: qianlishi
- * @Date: 2021-12-11 14:48:27
+ * @Author: Raod
+ * @Date: 2021-8-4 14:48:27
  * @LastEditors: qianlishi
  * @LastEditors: qianlishi
  * @LastEditTime: 2022-03-09 09:57:17
  * @LastEditTime: 2022-03-09 09:57:17
 -->
 -->

+ 2 - 2
report-ui/src/views/home/index.vue

@@ -1,8 +1,8 @@
 <!--
 <!--
  * @Descripttion: 首页
  * @Descripttion: 首页
  * @version: 
  * @version: 
- * @Author: qianlishi
- * @Date: 2021-12-11 14:48:27
+ * @Author: yanzili
+ * @Date: 2021-6-24 14:48:27
  * @LastEditors: qianlishi
  * @LastEditors: qianlishi
  * @LastEditTime: 2021-12-13 09:45:44
  * @LastEditTime: 2021-12-13 09:45:44
 -->
 -->

+ 8 - 0
report-ui/src/views/reportManage/components/share.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 
+ * @version:
+ * @Author: Devli
+ * @Date: 2021-7-18 18:19:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2022-8-5 13:31:44
+-->
 <template>
 <template>
   <el-dialog
   <el-dialog
     class="tree_dialog"
     class="tree_dialog"

+ 2 - 2
report-ui/src/views/reportManage/index.vue

@@ -1,8 +1,8 @@
 <!--
 <!--
  * @Descripttion: 报表设计--报表管理
  * @Descripttion: 报表设计--报表管理
  * @version:
  * @version:
- * @Author: qianlishi
- * @Date: 2021-12-11 14:48:27
+ * @Author: yanzili
+ * @Date: 2021-6-24 14:48:27
  * @LastEditors: qianlishi
  * @LastEditors: qianlishi
  * @LastEditTime: 2022-05-17 17:38:44
  * @LastEditTime: 2022-05-17 17:38:44
 -->
 -->

+ 8 - 0
report-ui/src/views/resultset/components/DataView.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: Raod
+ * @Date: 2021-8-4 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-12-13 18:48:24
+-->
 <template>
 <template>
   <el-dialog
   <el-dialog
     :title="caseResultTitle"
     :title="caseResultTitle"

+ 8 - 0
report-ui/src/views/resultset/components/EditDataSet.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: yanzili
+ * @Date: 2021-6-24 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2022-3-14 18:48:24
+-->
 <template>
 <template>
   <div>
   <div>
     <el-dialog
     <el-dialog

+ 8 - 0
report-ui/src/views/resultset/components/MonacoEditor.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: qianlishi
+ * @Date: 2021-8-6 14:48:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-12-13 18:48:24
+-->
 <template>
 <template>
   <div ref="editor" class="main"></div>
   <div ref="editor" class="main"></div>
 </template>
 </template>

+ 3 - 3
report-ui/src/views/screenDesigner/widget/texts/widgetText.vue

@@ -1,8 +1,8 @@
 <!--
 <!--
- * @Author: lide1202@hotmail.com
+ * @Author: Devli
  * @Date: 2021-3-13 11:04:24
  * @Date: 2021-3-13 11:04:24
- * @Last Modified by:   lide1202@hotmail.com
- * @Last Modified time: 2021-3-13 11:04:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2022-3-14 14:04:24
  !-->
  !-->
 <template>
 <template>
   <div class="text" :style="styleColor">{{ styleColor.text }}</div>
   <div class="text" :style="styleColor">{{ styleColor.text }}</div>

+ 7 - 0
report-ui/src/views/reportShare/index.vue → report-ui/src/views/shareManage/index.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Descripttion: 报表分享
+ * @Author: Raod
+ * @Date: 2022-7-30 11:10:24
+ * @Last Modified by:   qianlishi
+ * @Last Modified time: 2022-8-1 11:04:24
+ !-->
 <template>
 <template>
   <anji-crud ref="listPage" :option="crudOption">
   <anji-crud ref="listPage" :option="crudOption">
     <template v-slot:pageSection>
     <template v-slot:pageSection>