修改布局信息

chuanyi_client2/src/api/datasource.js

@@ -407,6 +407,21 @@ export function getTableTemplateById(id) {
 }
 
 /**
+ * 获取报表通用模板信息
+ * @param id
+ * @returns {AxiosPromise}
+ */
+export function getSysTableTemplateById(id) {
+    return request({
+        url: '/reportTable/getSysTableTemplateById/' + id,
+        headers: {
+            isToken: true
+        },
+        method: 'get'
+    })
+}
+
+/**
  * 获取所有报表列表
  * @param params
  * @returns {AxiosPromise}

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -280,7 +280,7 @@
                        :highlight-current="true"
                        :default-expand-all="true">
               <span class="custom-tree-node" slot-scope="{ node, data }">
-                <svg-icon v-if="!data.children" icon-class="file"/>
+                <svg-icon v-if="!data.children" icon-class="file-bg"/>
                 <svg-icon v-else-if="node.expanded" icon-class="folder-open"/>
                 <svg-icon v-else icon-class="folder"/>
                 <span :title='node.label || data.itemName' style="margin-left: 2px;">{{ node.label || data.itemName }}</span>
@@ -567,6 +567,7 @@ export default {
     },
     /** 数据组组配置点击事件 */
     handleNodeClick(data, node, target) {
+      console.log(data)
       this.closeMenu()
       if (data.id != -1 && !data.itemName) {
         sessionStorage.setItem('GROUP_ID', data.id)
@@ -584,6 +585,7 @@ export default {
     },
     /** 页面跳转 */
     gotoPageByName(path, id) {
+      console.log(new Date().getTime())
       this.$router.push({
         path: path,
         query: {
@@ -705,6 +707,7 @@ export default {
         valueMode: '',
         valuePeriod: ['00:00:00', '23:59:59']
       }
+      this.modeValueTips = '模式值'
       this.chooseItemDataView = false
       this.getDataSourceList()
       this.groupDialogVisible = true
@@ -794,6 +797,14 @@ export default {
         this.groupRateForm.modeValue = item.modeValue
         this.groupRateForm.valueMode = item.valueCondition + ''
         this.groupRateForm.valuePeriod = [item.startReadTime, item.endReadTime]
+        switch (this.groupRateForm.readMode) {
+          case '0':
+            this.modeValueTips = '周期值'
+            break
+          default:
+            this.modeValueTips = '阈值'
+            break
+        }
       }).catch((e) => {
         loading.close()
         this.$alert(e, errorCode[100], {
@@ -1202,6 +1213,7 @@ export default {
       this.groupBasicForm.itemList = this.chooseItemDataList
       this.itemDataStep = 1
       this.filterItemData = ''
+      this.filterChooseItemText = ''
       this.dataLineListSelections = []
       this.dataItemDialogVisible = false
       this.chooseItemDataView = true
@@ -1390,6 +1402,7 @@ export default {
         this.chooseItemDataListByTree = this.tempItemList
         this.groupBasicForm.itemList = this.tempItemList
       }
+      this.filterChooseItemText = ''
       this.filterItemData = ''
       this.itemDataListByTree = []
       this.dataLineListSelections = []

chuanyi_client2/src/views/group_item/index.vue

@@ -110,6 +110,9 @@ export default {
     },
     deep: true
   },
+  created() {
+    this.readParams()
+  },
   beforeDestroy() {
     if (this.timeInterval) {
       clearInterval(this.timeInterval)
@@ -130,6 +133,7 @@ export default {
     },
     /** 读取参数 */
     readParams() {
+      this.filterItemText = ''
       // let groupListStorage = sessionStorage.getItem('GROUP_LIST') ? sessionStorage.getItem('GROUP_LIST') : '[]'
       // this.groupDataList = JSON.parse(groupListStorage)
       let groupId = sessionStorage.getItem('GROUP_ID') ? sessionStorage.getItem('GROUP_ID') : '-1'

chuanyi_client2/src/views/report_template/index.vue

@@ -412,7 +412,7 @@ import RulerView from '@/components/RulerView'
 import { insertEChart } from 'luckytool'
 import {
   getAllDataModel,
-  getAllItemGroup, getAllTableTemplate, getItemGroupById, getSysTableTemplate,
+  getAllItemGroup, getAllTableTemplate, getItemGroupById, getSysTableTemplate, getSysTableTemplateById,
   getTableItemGroupById,
   getTableTemplateById,
   saveReportTemplate,
@@ -1071,7 +1071,7 @@ export default {
         return
       }
       const loading = showLoading(_this, '加载中，请稍候···')
-      getTableTemplateById(_this.commTemplate.id).then(res => {
+      getSysTableTemplateById(_this.commTemplate.id).then(res => {
         if (!res || !res.data) {
           loading.close()
           return