1

chuanyi_client2/src/views/print_config/index.vue

@@ -215,8 +215,8 @@
                 style="width: 250px; margin: 0 20px 20px 0"
                 :disabled="isDisable"
               >
-              <template slot="append">mm</template>
-            </el-input>
+                <template slot="append">mm</template>
+              </el-input>
             </el-col>
             <el-col :span="12">
               右
@@ -227,8 +227,8 @@
                 style="width: 250px; margin: 0 20px 20px 0"
                 :disabled="isDisable"
               >
-              <template slot="append">mm</template>
-            </el-input>
+                <template slot="append">mm</template>
+              </el-input>
             </el-col>
           </el-row>
           <el-row>
@@ -241,8 +241,8 @@
                 style="width: 250px; margin: 0 20px 20px 0"
                 :disabled="isDisable"
               >
-              <template slot="append">mm</template>
-            </el-input>
+                <template slot="append">mm</template>
+              </el-input>
             </el-col>
             <el-col :span="12">
               下
@@ -253,8 +253,8 @@
                 style="width: 250px; margin: 0 20px 20px 0"
                 :disabled="isDisable"
               >
-              <template slot="append">mm</template>
-            </el-input>
+                <template slot="append">mm</template>
+              </el-input>
             </el-col>
           </el-row>
         </el-form-item>
@@ -386,11 +386,17 @@
                 style="width: 250px"
                 :disabled="isDisable"
               ></el-input-number>
+              <span style="position: absolute; right: 81px">%</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item style="text-align: center">
-          <el-button type="primary" @click="saveDataModelEvent" v-if="!isDisable">确定</el-button>
+          <el-button
+            type="primary"
+            @click="saveDataModelEvent"
+            v-if="!isDisable"
+            >确定</el-button
+          >
           <el-button @click="dialogClose">取消</el-button>
         </el-form-item>
       </el-form>
@@ -477,28 +483,56 @@ export default {
         fitToPages: 1,
       },
       dataModelRules: {
-        jobName:[ { required: true, message: '请输入作业名称', trigger: 'blur' }],
-        orientation:[ { required: true, message: '请选择打印方向', trigger: 'change' }],
-        copies:[{  required: true, message: '请输入打印份数', trigger: 'change' }],
-        pageType:[ { required: true, message: '请选择打印页面类型', trigger: 'change' }],
-        marginLeft:[{  required: true, message: '请输入左边距', trigger: 'blur' }],
-        marginTop:[{ required: true, message: '请输入上边距', trigger: 'blur' }],
-        marginRight:[ { required: true, message: '请输入右边距', trigger: 'blur' }],
-        marginBottom:[ {required: true, message: '请输入下边距', trigger: 'blur' }],
-        scale:[{  required: true, message: '请输入缩放比例', trigger: 'blur' }],
-        pageRange:[{  required: true, message: '请选择页码范围类型', trigger: 'change' }],
-        pageRangeStart:[{ required: true, message: '请输入开始页码', trigger: 'change' }],
-        pageRangeEnd:[{  required: true, message: '请输入结束页码', trigger: 'change' }],
-        printArea:[{  required: true, message: '请选择打印区域', trigger: 'change' }],
-        printAreaValue:[ { required: true, message: '请输入打印区域参数', trigger: 'blur' }],
-        fitToPages:[{  required: true, message: '请选择打印缩放', trigger: 'change' }],
+        jobName: [
+          { required: true, message: "请输入作业名称", trigger: "blur" },
+        ],
+        orientation: [
+          { required: true, message: "请选择打印方向", trigger: "change" },
+        ],
+        copies: [
+          { required: true, message: "请输入打印份数", trigger: "change" },
+        ],
+        pageType: [
+          { required: true, message: "请选择打印页面类型", trigger: "change" },
+        ],
+        marginLeft: [
+          { required: true, message: "请输入左边距", trigger: "blur" },
+        ],
+        marginTop: [
+          { required: true, message: "请输入上边距", trigger: "blur" },
+        ],
+        marginRight: [
+          { required: true, message: "请输入右边距", trigger: "blur" },
+        ],
+        marginBottom: [
+          { required: true, message: "请输入下边距", trigger: "blur" },
+        ],
+        scale: [{ required: true, message: "请输入缩放比例", trigger: "blur" }],
+        pageRange: [
+          { required: true, message: "请选择页码范围类型", trigger: "change" },
+        ],
+        pageRangeStart: [
+          { required: true, message: "请输入开始页码", trigger: "change" },
+        ],
+        pageRangeEnd: [
+          { required: true, message: "请输入结束页码", trigger: "change" },
+        ],
+        printArea: [
+          { required: true, message: "请选择打印区域", trigger: "change" },
+        ],
+        printAreaValue: [
+          { required: true, message: "请输入打印区域参数", trigger: "blur" },
+        ],
+        fitToPages: [
+          { required: true, message: "请选择打印缩放", trigger: "change" },
+        ],
       },
       // 查询参数
       queryParams: {
         page: 1,
         limit: 10,
       },
-      isDisable:false
+      isDisable: false,
     };
   },
   watch: {},
@@ -517,7 +551,7 @@ export default {
     },
     /** 新增打印配置 */
     handleAdd() {
-      this.dataModelForm =  {
+      this.dataModelForm = {
         // 打印份数
         copies: 1,
         // 缩放比例
@@ -549,7 +583,7 @@ export default {
     },
     /** 查看详情打印配置 */
     handleValReplaceDetail(index, row) {
-      this.isDisable=true
+      this.isDisable = true;
       this.dialogDataModelTitle = "详情打印配置";
       const loading = showLoading(this, "加载中，请稍候···");
       getPrintConfigById({ id: row.id })
@@ -610,14 +644,12 @@ export default {
             });
             return;
           }
-          this.dataModelForm.marginTop = Number(this.dataModelForm.marginTop);
-          this.dataModelForm.marginRight = Number(
-            this.dataModelForm.marginRight
-          );
-          this.dataModelForm.marginLeft = Number(this.dataModelForm.marginLeft);
-          this.dataModelForm.marginBottom = Number(
-            this.dataModelForm.marginBottom
-          );
+          this.dataModelForm.marginTop = this.dataModelForm.marginTop;
+          this.dataModelForm.marginRight = this.dataModelForm.marginRight;
+
+          this.dataModelForm.marginLeft = this.dataModelForm.marginLeft;
+          this.dataModelForm.marginBottom = this.dataModelForm.marginBottom;
+
           if (this.dataModelForm.printArea === 1) {
             this.dataModelForm.printAreaValue = "";
           }
@@ -628,9 +660,9 @@ export default {
           if (this.dataModelForm.fitToPages !== 4) {
             this.dataModelForm.scale = null;
           }
-          if(this.dataModelForm.pageRange===1){
-            delete this.dataModelForm.pageRangeEnd
-            delete this.dataModelForm.pageRangeStart
+          if (this.dataModelForm.pageRange === 1) {
+            delete this.dataModelForm.pageRangeEnd;
+            delete this.dataModelForm.pageRangeStart;
           }
           addPrintConfig(this.dataModelForm).then((res) => {
             if (res.code === 200) {
@@ -662,7 +694,7 @@ export default {
     /** 弹出层关闭事件 */
     dialogClose(done) {
       this.dialogDataModelVisible = false;
-      this.isDisable=false
+      this.isDisable = false;
       this.$refs["dataModelForm"].resetFields();
     },
     /** 获取打印区域宽高 */
@@ -745,7 +777,7 @@ export default {
       } else if (val === 12) {
         return "Legal";
       }
-    }
+    },
   },
 };
 </script>

reado-app/components/ecahrts/bar-echarts.vue

@@ -51,15 +51,6 @@
 							min: 0
 						}]
 					},
-					extra: {
-						column: {
-							type: "group",
-							width: 30,
-							activeBgColor: "#000000",
-							activeBgOpacity: 0.08,
-							seriesGap: 10
-						}
-					},
 					tooltip: {
 						trigger: 'axis',
 						position:'inside'
@@ -120,7 +111,10 @@
 				const series = chartData.map(item => {
 					return {
 						name: item.describe ? item.describe : item.itemName,
-						data: item.valueList
+						data: item.valueList,
+						label:{
+							show:false
+						}
 					}
 				})
 				this.opts.xAxis.data = time

reado-app/pages/homePage/index.vue

@@ -19,7 +19,7 @@
 			<view v-for="(item,index) in echartsData" :key="item.id" style="padding-right:20rpx">
 				<view v-if="item.chartType==='line'" :style="{top:item.top}"
 					style="position:absolute;width:100%;height:640rpx;display: block;margin-bottom:30px">
-					<view class="title" v-if="echartsData.length">
+					<view class="title" v-if="echartsData.length" style="margin-bottom:20px">
 						{{item.chartName}}
 					</view>
 					<web-view :src="item.src" style="width:100%;height:640rpx;"></web-view>
@@ -158,21 +158,28 @@
 						const {
 							reportTableList
 						} = data.data
-						this.reportTableList = reportTableList
+						this.reportTableList = reportTableList.reverse()
 
 						let array = []
 						for (let i = 0; i < this.reportTableList.length; i++) {
 							array.push(this.getChartData(this.reportTableList[i].id))
 						}
 						Promise.all(array).then((res) => {
-							res.map(item => {
+							let lineData = []
+							res.map((item, index) => {
 								const {
 									data
 								} = item
 								if (data.chartType === 'line') {
+									lineData.push({
+										data: data,
+										i: index
+									})
 									data.src =
 										`/static/webview/line-wv.html?id=${data.id}&startTime=${this.startTime}`
-									data.top = this.reportTableList.length * 31 + 'vh'
+									lineData.map((it, i) => {
+										data.top = (this.reportTableList.length - lineData.length) * 40 + i * 100 + '%'
+									})
 								}
 								this.echartsData.push(data)
 							})

reado-app/pages/reportForm/data-item.vue

@@ -5,8 +5,8 @@
 				<text>筛选</text>
 		</view>
 		<view class="echarts">
-			<dataQuery v-if="service.length" :service="service" :serviceTime="serviceTime" />
-			<!-- <web-view :src="src" style="top:5vh;width:100%;height:640rpx;"></web-view> -->
+			<!-- <dataQuery v-if="service.length" :service="service" :serviceTime="serviceTime" /> -->
+			<web-view :src="src" style="top:5vh;width:100%;height:1000rpx;"></web-view>
 			<view v-if="monthQuery" class="query-screen">
 				<view>
 					数据项选择
@@ -259,7 +259,7 @@
 <style lang="scss" scoped>
 	.data {
 		margin-top: 40rpx;
-		height:50vh;
+		height: 50vh;
 
 		.data-screen {
 			text-align: right;

reado-app/static/webview/dataItem-wv.html

@@ -6,10 +6,12 @@
 		<title>Document</title>
 	</head>
 	<body>
-		<div id="main" style="width:100%;height:100%;margin:auto"></div>
+		<div id="main" style="width:100%;height:400px;margin:auto"></div>
 
 		<script src="./echarts.min.js"></script>
-
+        <script type="text/javascript" src="../luckysheet/dist/plugins/js/uni-webview-js0.0.3_index.js"></script>
+		<script src="../jquery.min.js"></script>
+		
 		<script>
 			function GetQueryString(name) {
 				var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
@@ -101,7 +103,7 @@
 						type: 'GET',
 						beforeSend: function(xhr) {
 							this.url =
-								`http://192.168.0.40:8081/itemGroup/itemDataQuery?id=${id}&startTime=${startTime}&endTime=${endTime}&valueType=${valueType}`
+								`http://192.168.0.41:8081/itemGroup/itemDataQuery?id=${id}&startTime=${startTime}&endTime=${endTime}&valueType=${valueType}`
 							// this.url = window.location.origin +
 							// 	`/itemGroup/itemDataQuery?id=${id}&startTime=${startTime}&endTime=${endTime}&valueType=${valueType}` 
 							xhr.setRequestHeader("Authorization", "Bearer " +

reado-app/static/webview/line-wv.html

@@ -74,7 +74,7 @@
 				},
 				legend: {
 					type: 'scroll',
-					top: 0
+					top: 10
 				},
 				tooltip: {
 					trigger: 'axis',
@@ -135,7 +135,7 @@
 						type: 'GET',
 						beforeSend: function(xhr) {
 							this.url =
-								`http://192.168.0.40:8081/chart/getChartById?id=${id}&startTime=${startTime}&endTime=${endTime}`
+								`http://192.168.0.41:8081/chart/getChartById?id=${id}&startTime=${startTime}&endTime=${endTime}`
 							// this.url = window.location.origin +
 							// 	`/chart/getChartById?id=${id}&startTime=${startTime}&endTime=${endTime}` 
 							xhr.setRequestHeader("Authorization", "Bearer " +