Bladeren bron

修改报表设计表格选择数据项、统计图选择数据项,统计图展示xy轴数据项名,手机端统计图,数据项查询,使用的全路径改为读取名称,

zhoupeng 1 jaar geleden
bovenliggende
commit
ce082f3135

+ 6 - 3
chuanyi_client/src/views/report_template/index.vue

@@ -478,7 +478,8 @@
                      border>
               <u-table-column type="selection" width="55" align="center"/>
               <u-table-column type="index" label="序号" width="60" fixed align="center"/>
-              <u-table-column label="数据项名称" prop="itemName" sortable="custom" align="center"/>
+              <!-- <u-table-column label="数据项名称" prop="itemName" sortable="custom" align="center"/> -->
+              <u-table-column label="数据项名称" prop="itemReadName" sortable="custom" align="center"/>
               <u-table-column prop="valueType" label="取值类型" align="center">
                 <template slot-scope="scope">
                   {{ getValByProp(valueTypeList, scope.row.valueType) }}
@@ -531,7 +532,8 @@
                      border>
               <u-table-column type="selection" width="55" align="center"/>
               <u-table-column type="index" label="序号" width="60" fixed align="center"/>
-              <u-table-column label="数据项名称" prop="itemName" sortable="custom" align="center"/>
+              <!-- <u-table-column label="数据项名称" prop="itemName" sortable="custom" align="center"/> -->
+              <u-table-column label="数据项名称" prop="itemReadName" sortable="custom" align="center"/>
               <u-table-column prop="dataValue" label="值" align="center">
               </u-table-column>
               <u-table-column label="操作" align="center" width="80">
@@ -1717,7 +1719,8 @@ export default {
         let tempList = flag ? this.chooseItemData : this.chooseGroupItemList
         let _data = res.data.itemList ? res.data.itemList : []
         _data.forEach((t) => {
-          t.label = t.itemName
+          // t.label = t.itemName
+          t.label = t.itemReadName
           t.value = t.itemReadName
           t.checked = false
         })

+ 2 - 1
reado-app/pages/reportForm/data-item.vue

@@ -189,7 +189,8 @@
 								valueTimeList
 							} = data.data
 							const service = [{
-								name: this.itemName,
+								// name: this.itemName,
+								name: this.itemReadName,
 								data: valueList
 							}]
 							this.service = service

+ 2 - 1
reado-app/static/webview/bar-wv.html

@@ -188,7 +188,8 @@
 
 						const series = chartData.map(item => {
 							return {
-								name: item.describe ? item.describe : item.itemName,
+								// name: item.describe ? item.describe : item.itemName,
+								name: item.describe ? item.describe : item.itemReadName,
 								data: item.valueList,
 								type: 'bar'
 							}

+ 2 - 1
reado-app/static/webview/line-wv.html

@@ -189,7 +189,8 @@
 
 						const series = chartData.map(item => {
 							return {
-								name: item.describe ? item.describe : item.itemName,
+								// name: item.describe ? item.describe : item.itemName,
+								name: item.describe ? item.describe : item.itemReadName,
 								data: item.valueList,
 								type: 'line'
 							}