v4

common/uni.scss

@@ -15,4 +15,10 @@
 	
 .data-conponent-style{
 	box-sizing: border-box;
+	// position: absolute;
+}
+.text-style33{
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
 }
\ No newline at end of file

components/my-datetime/my-datetime.vue

@@ -267,7 +267,7 @@
 	}
 	picker-view {
 		width: 100%;
-		height: 300px;
+		height: 200px;
 		margin-top:10px;
 	}
 	.item {

js/data.js

-
 export const menuarr = ['ProcessParaReport', 'EquipmentAccount', 'Formula', 'ProcessConfigure',
 	'User', 'AlarmAnalysis', 'FileManage', 'Journal', 'MaintenanceManage',
 	'NewTrendChart', 'PointInspectionManage', 'QualityMain', 'RepairManage',
 	'Role', 'ScheduleManage', 'SparePartsManage', 'VulnerablePartManage'
-	]
+]
 
+//历史数据源 startTime-开始时间,date-结束时间,variables-变量集合,level-时间层级,skipTime-是否分层
+export const historyApiData = (startTime,date,variables,level,skipTime) => {
+	let getData = {
+		"filterControls": [{
+				"value1": startTime,
+				"controlType": "AssociateDateTimePicker",
+				"pickerType": "BeginTime",
+				"name": "a1"
+			},
+			{
+				"value1": date,
+				"controlType": "AssociateDateTimePicker",
+				"pickerType": "EndTime",
+				"name": "a2"
+			}
+		],
+		"variables":variables,
+		"sourceType": "History",
+		"layoutSettings": level,
+		"skipTime": skipTime,
+		"historySettings": {
+			"timeType": "Recent",
+			"valueMethod": "Origin",
+			"xAxisSetting": "Time",
+		}
+	}
+	return getData
+}

js/interceptor.js

+
+//拦截监听器
 const interceptor = () => {
 	const switchTebInterceptor = () => {
 		uni.addInterceptor('switchTab', {

js/tool.js

 //8位hex颜色转rgba
-export const getRgbaFun = (hex) => {
-	// console.log(hex)
-	let rg = ''
-	if (hex.length > 6) {
-		// let opacity = eval(hex.slice(7, 9).toString()).toString(16)
-		// let opacity = hex.slice(7, 9)
-		let opacity = parseInt("0x" + hex.slice(7, 9))
-		opacity = Number(opacity) / 255
-		rg = "rgba(" + parseInt("0x" + hex.slice(1, 3)) + "," + parseInt("0x" + hex.slice(3, 5)) + "," +
-			parseInt("0x" + hex.slice(5, 7)) + "," + opacity + ")"
+export const getRgbaFun = (sHex,a) => {
+	// 十六进制颜色值的正则表达式
+	var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/
+	/* 16进制颜色转为RGB格式 */
+	var sColor = sHex.toLowerCase()
+	var alpha = 0
+	if (sColor && reg.test(sColor)) {
+		if (sColor.length === 4 || sColor.length === 5) {
+			var sColorNew = '#'
+			for (var i = 1; i < sColor.length; i += 1) {
+				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+			}
+			sColor = sColorNew
+		}
+		// 如果有透明度再执行
+		if (sColor.length === 9) {
+			alpha = (parseInt('0x' + sColor.slice(7, 9)) / 255).toFixed(2)
+		}
+		if (a) {
+			alpha = a / 100
+		}
+		//  处理六位的颜色值
+		var sColorChange = []
+		for (let i = 1; i < 7; i += 2) {
+			sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
+		}
+		return 'rgba(' + sColorChange.join(',') + ',' + alpha + ')'
 	} else {
-		rg = "rgba(" + parseInt("0x" + hex.slice(1, 3)) + "," + parseInt("0x" + hex.slice(3, 5)) + "," +
-			parseInt("0x" + hex.slice(5, 7)) + ",1)"
+		return sColor
 	}
+}
 
-	return rg
+export const colorRgba = (sHex, a) => {
+	// 十六进制颜色值的正则表达式
+	var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/
+	/* 16进制颜色转为RGB格式 */
+	var sColor = sHex.toLowerCase()
+	var alpha = 0
+	if (sColor && reg.test(sColor)) {
+		if (sColor.length === 4 || sColor.length === 5) {
+			var sColorNew = '#'
+			for (var i = 1; i < sColor.length; i += 1) {
+				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+			}
+			sColor = sColorNew
+		}
+		// 如果有透明度再执行
+		if (sColor.length === 9) {
+			alpha = (parseInt('0x' + sColor.slice(7, 9)) / 255).toFixed(2)
+		}
+		if (a) {
+			alpha = a / 100
+		}
+		//  处理六位的颜色值
+		var sColorChange = []
+		for (let i = 1; i < 7; i += 2) {
+			sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
+		}
+		return 'rgba(' + sColorChange.join(',') + ',' + alpha + ')'
+	} else {
+		return sColor
+	}
 }
 
 export const unique = (arr) => {
@@ -50,10 +96,10 @@ export const arrayToString = (arr) => {
 	return stringData;
 }
 //判断是否有相同的变量，并返回个数
-export const getSameStrName = (str,list) => {
+export const getSameStrName = (str, list) => {
 	let num = null
-	for(let i = 0;i<list.length;i++){
-		if(list[i].indexOf(str)>-1){
+	for (let i = 0; i < list.length; i++) {
+		if (list[i].indexOf(str) > -1) {
 			num += 1
 		}
 	}
@@ -129,7 +175,7 @@ export const getTimeSettings = (number, str) => {
 	} else if (str == '年') {
 		type.timeSetting = 'Day'
 		type.recent = Number(number) * 365
-	}else if(str == '最新'){
+	} else if (str == '最新') {
 		type.timeSetting = 'Second'
 		type.recent = 0
 	}
@@ -151,6 +197,8 @@ export const getTimeType = (str) => {
 		type = 'Quarter'
 	} else if (str == '年') {
 		type = 'Year'
+	}else if(str == '最新'){
+		type = 'Second'
 	}
 	return type
 }
@@ -216,6 +264,12 @@ export const heavyCount = (list) => {
 	return list2
 }
 
+export const getBoxShadow = (boxShadow) => {
+	let str = boxShadow.horizontal + ' ' + boxShadow.vertical + ' ' + boxShadow.size + ' ' + boxShadow.color + ' ' +
+		boxShadow.location
+	return str
+}
+
 //表格层级数据分类计算,list-列表、level-层级、statistical-统计方式、timeType-时间范围
 export const setLevelData = (list, level, statistical, timeType) => {
 	// console.log(333+JSON.stringify(timeType))

main.js

@@ -5,6 +5,7 @@ import store from './store'
 import interceptor from './js/interceptor.js'
 import api from './request/api.js'
 import uView from "uview-ui"
+import MyTooltip from './pages/common/tooltip.vue'
 // import VConsole from 'vconsole'
 // const vConsole = new VConsole()
 
@@ -13,9 +14,10 @@ Vue.prototype.$api = api
 Vue.prototype.$store = store
 Vue.config.productionTip = false
 Vue.prototype.$toast = $
-App.mpType = 'app'
 
+App.mpType = 'app'
 
+Vue.component("my-tooltip", MyTooltip);
 const app = new Vue({
     ...App,
 	

manifest.json

 {
-    "name" : "demo2",
+    "name" : "SYC",
     "appid" : "__UNI__630CE47",
     "description" : "",
     "versionName" : "1.0.0",
@@ -10,6 +10,9 @@
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
             "waiting" : true,
@@ -38,13 +41,46 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png",
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
             }
         }
     },

pages.json

@@ -27,7 +27,8 @@
 		{
 			"path": "pages/data/index",
 			"style": {
-				"navigationBarTitleText": "数据"
+				"navigationBarTitleText": "数据",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -73,6 +74,7 @@
 			"path": "pages/data/jump-view/index",
 			"style": {
 				// "navigationBarTitleText": "数据"
+				"enablePullDownRefresh": true
 			}
 		}
 	],

pages/components/collapse/index.vue

@@ -3,9 +3,9 @@
 	<view class="collapse-content">
 		<uni-collapse @change="change">
 			<uni-collapse-item :show-animation="true" :title="data.title" :open="true">
-				<view v-for="(item,index) in data.textList" :key="index" class="collapse-item-view">
+				<view v-for="(item,index) in data.textList" :key="index" class="collapse-item-view" @click="collaspeItemFun(data,item,index)">
 					<image class="collapse-item-img" :src="item.img"></image>
-					<view class="collapse-item-text" @click="collaspeItemFun(data,item,index)">
+					<view class="collapse-item-text" >
 						<view class="text-title"><text>{{item.textTitle}}</text></view>
 						<view class="text-content">
 							<text style="padding-right: 20rpx;">最近预览时间</text>

pages/conponent/Alarm14.vue

@@ -19,9 +19,8 @@
 				<div class="alarm_box2"
 					:style="'width:100%;height:100%;borderRadius:'+item.radiusTop+'px '+item.radiusRight+'px '
             +item.radiusButton+'px '+item.radiusLeft+'px;padding:14px;box-sizing:border-box;background:'+item.Background">
-					<div class="alarm_title clearfix" :style="'margin-bottom:'+(item.IsAlarmDataGridHeadersVisibility==true?14:0)
-                +'px;position:relative;height:'+(item.IsAlarmDataGridHeadersVisibility==true?item.HeaderFontSize:0)
-                +'px;overflow:hidden'">
+			<!-- item.IsAlarmDataGridHeadersVisibility -->
+					<div class="alarm_title clearfix" :style="'margin-bottom:14px;position:relative;height:'+item.HeaderFontSize+'px;overflow:hidden'">
 						<div :class="item.Class+'AlarmTitle'" style="position:absolute;left:0px">
 
 							<div :class="routerName+item.Class+'alarm_title_no'" class="alarm_title_no left"
@@ -97,19 +96,7 @@
 			</div>
 		</div>
 
-		<!-- 权限弹窗 -->
-		<div v-show="commerPopShow1" style="width:100%;height:100%;position:fixed;z-index:2147483647">
-			<div v-if="commerPopShow1" class="commerPop_outPop">
-				<div class="commerPop_outHead">
-					<i class="warning el-icon-warning"></i>
-					<span class="text">提示</span>
-				</div>
-				<div class="commerPop_conter">该账户无操作权限</div>
-				<div class="commerPop_btn">
-					<div class="commerPop_yes" @click="Jurisdiction()" style="width:310px;margin-left:25px">确定</div>
-				</div>
-			</div>
-		</div>
+		
 	</div>
 </template>
 <script>

pages/conponent/CommonLamp16.vue

@@ -219,7 +219,7 @@
 										var Runsymbol
 										var ArrValue
 										var resValueNumber = data[i].Value
-										resValue = data[i].Value.toLowerCase()
+										resValue = data[i].Value
 										ArrValue = TextAnimation.Compare == null ?
 											TextAnimation.Compare : TextAnimation.Compare.toLowerCase()
 										Runsymbol = TextAnimation.Condition

pages/conponent/CornerButton6.vue

@@ -201,7 +201,7 @@
 
 				//字体颜色渐变
 				if (foregoundArr.ColorType == 'SolidColor') {
-					foreColor = '#' + foregoundArr.Data.Color.slice(3) + foregoundArr.Data.Color.slice(1, 3);
+					foreColor = getRgbaFun('#' + foregoundArr.Data.Color.slice(3) + foregoundArr.Data.Color.slice(1, 3));
 					clipText = 'none'
 					backgroundColor = 'none'
 				} else {
@@ -211,35 +211,35 @@
 					lagel1 = foregoundArr.Data.Angel.toFixed(0)
 					for (var g2 = 0; g2 < foregoundArr.Data.GradientStops.length; g2++) {
 						gradient2 = foregoundArr.Data.GradientStops[g2]
-						backgroundColor = backgroundColor + ',' + gradient2.Color + ' ' + (gradient2.Offset * 100).toFixed(
+						backgroundColor = getRgbaFun(backgroundColor) + ',' + getRgbaFun(gradient2.Color) + ' ' + (gradient2.Offset * 100).toFixed(
 							0) + '%'
 					}
 					backgroundColor = '-webkit-linear-gradient(' + lagel1 + 'deg' + backgroundColor + ')';
 				}
 				//边框色渐变
 				if (borderbrushArr.ColorType == 'SolidColor') {
-					borderColor = '#' + borderbrushArr.Data.Color.slice(3) + borderbrushArr.Data.Color.slice(1, 3)
+					borderColor = getRgbaFun('#' + borderbrushArr.Data.Color.slice(3) + borderbrushArr.Data.Color.slice(1, 3))
 				} else {
 					borderColor = ''
 					lagel3 = borderbrushArr.Data.Angel.toFixed(0)
 					for (var f2 = 0; f2 < borderbrushArr.Data.GradientStops.length; f2++) {
 						gradient3 = borderbrushArr.Data.GradientStops[f2]
-						borderColor = borderColor + ',' + gradient3.Color + ' ' + (gradient3.Offset * 100).toFixed(0) + '%'
+						borderColor = getRgbaFun(borderColor) + ',' + getRgbaFun(gradient3.Color) + ' ' + (gradient3.Offset * 100).toFixed(0) + '%'
 					}
 					borderColor = '-webkit-linear-gradient(' + lagel3 + 'deg' + borderColor + ')';
 				}
 				//背景色渐变
 				if (backgroundArr.ColorType == 'SolidColor') {
-					backColor = '#' + backgroundArr.Data.Color.slice(3) + backgroundArr.Data.Color.slice(1, 3)
+					backColor = getRgbaFun('#' + backgroundArr.Data.Color.slice(3) + backgroundArr.Data.Color.slice(1, 3))
 					if (backgroundArr.Data.Color.slice(3) == 'FFFFFF' && backgroundArr.Data.Color.slice(1, 3) != "FF") {
-						borderColor = '#FFFFFF' + backgroundArr.Data.Color.slice(1, 3)
+						borderColor = getRgbaFun('#FFFFFF' + backgroundArr.Data.Color.slice(1, 3))
 					}
 				} else {
 					backColor = ''
 					lagel2 = backgroundArr.Data.Angel.toFixed(0)
 					for (var h2 = 0; h2 < backgroundArr.Data.GradientStops.length; h2++) {
 						gradient1 = backgroundArr.Data.GradientStops[h2]
-						backColor = backColor + ',' + gradient1.Color + ' ' + (gradient1.Offset * 100).toFixed(0) + '%'
+						backColor = getRgbaFun(backColor) + ',' + getRgbaFun(gradient1.Color) + ' ' + (gradient1.Offset * 100).toFixed(0) + '%'
 					}
 					backColor = '-webkit-linear-gradient(' + lagel2 + 'deg' + backColor + ')';
 				}
@@ -248,11 +248,11 @@
 					Shadow2: Shadow2,
 					InnerShadow: InnerShadow,
 					OuterShadow: OuterShadow,
-					foreColor: getRgbaFun(foreColor),
-					backgroundColor: getRgbaFun(backgroundColor),
+					foreColor: foreColor,
+					backgroundColor: backgroundColor,
 					clipText: clipText,
-					borderColor: getRgbaFun(borderColor),
-					backColor: getRgbaFun(backColor)
+					borderColor: borderColor,
+					backColor: backColor
 				}
 				console.log(Shadow)
 				return value
@@ -460,7 +460,7 @@
 		box-sizing: border-box;
 	}
 
-	.CornerButton6aa:hover {
+	/* .CornerButton6aa:hover {
 		background-color: #71A2C7ff !important;
 		background: #71A2C7ff !important;
 	}
@@ -468,7 +468,7 @@
 	.CornerButton6aa:hover .conten {
 		background-color: #71A2C7ff !important;
 		background: #4EBAF3ff !important;
-	}
+	} */
 
 	.CornerButton6aa:active {
 		background-color: #71A2C7ff !important;

pages/conponent/DataTextBlock12.vue

@@ -9,8 +9,7 @@
 <template>
 	<div class="DataTextBlockaa12" @click.stop="partents">
 		<div v-for="(item,index) in dataValue" :key="index">
-			<div class="DataTextBlock121aa1" v-if="show" @dblclick="open(index,item.class,item)" @contextmenu.prevent
-				@mousedown="downClick(item,$event)" @mouseup="seupClick(item,$event)" :style="'width:' + item.width + 'px; height:' + item.height + 'px; position:absolute; left:' 
+			<div class="DataTextBlock121aa1" v-if="show"  :style="'width:' + item.width + 'px; height:' + item.height + 'px; position:absolute; left:' 
       + item.left + 'px; top:' + item.top + 'px; transform:rotate(' + item.rotate + 'deg); opacity:' + item.opacity 
       + '; fontFamily:' + item.fontFamily + '; fontSize:' + item.FontSize + 'px; background:' + item.BorderBrush
       + ';textAlign:center; lineHeight:' + (item.height - item.BorderThickness * 2) 
@@ -590,17 +589,18 @@
 							for(let j = 0;j<data.length;j++){
 								if(data[j].Name == TextAnimation.TagName){
 									//数值字符串显示
+									
 									if(StringIntList.indexOf(TextAnimation.TagDataType) >-1){
 										
 										// console.log(this.textColorFun(data[j].Value,TextAnimation,'','#000'))
-										let Value = data[j].Value
-										
+										let Value =JSON.parse(JSON.stringify(data[j].Value))
+										// console.log(data[j].Value)
 										var result
 										var resValue
 										var Runsymbol
 										var ArrValue
 										var resValueNumber = data[j].Value
-										resValue = data[j].Value.toLowerCase()
+										resValue = data[j].Value
 										ArrValue = TextAnimation.Compare == null ?
 											TextAnimation.Compare : TextAnimation.Compare.toLowerCase()
 										Runsymbol = TextAnimation.Condition
@@ -643,27 +643,25 @@
 										}
 										if (result) {
 											this.ElementNameHas.push(TextAnimation.ElementName)
-											// document.querySelector(Dom).style.color = textColorListArr.Color
-											// return textColorListArr.Color
 											if(item.HasColorEffect){
 												item.Foreground = TextAnimation.Color
 											}
 											
-											// console.log(TextAnimation)
 											item.text = Value
 											 t = 1
 											
 										} else {
 											item.Foreground = '#000'
 											item.text = Value
-											// return DefaultColor
-											// if (DefaultColor != '') {
-											// 	// document.querySelector(Dom).style.color = DefaultColor
-											// } else {
-											// 	// document.querySelector(Dom).style.color = '#000'
-											// }
-										}
 											
+										}
+										if(TextAnimation.TagDataType == '二进制变量' ){
+											if(Value){
+												item.text = 'true'
+											}else{
+												item.text = 'false'
+											}
+										}
 										
 									 }else{
 										 var result
@@ -691,34 +689,20 @@
 										 }
 										 if (result) {
 										 	this.ElementNameHas.push(TextAnimation.ElementName)
-										 	// document.querySelector(Dom).style.color = textColorListArr.Color
-										 	// return textColorListArr.Color
 										 	if(item.HasColorEffect){
 										 		item.Foreground = TextAnimation.Color
 										 	}
-										 	// console.log(TextAnimation)
 										 	item.text = data[j].Value
 										 	 t = 1
-										 	
 										 } else {
 										 	item.Foreground = '#000'
 										 	item.text = data[j].Value
-										 	// return DefaultColor
-										 	// if (DefaultColor != '') {
-										 	// 	// document.querySelector(Dom).style.color = DefaultColor
-										 	// } else {
-										 	// 	// document.querySelector(Dom).style.color = '#000'
-										 	// }
+										 
 										 }
 										 
 									 }
 									break
-									// if(TextAnimation.TagDataType == '二进制变量' || TextAnimation.TagDataType == '有符号8位整型' || )
 								}else{
-									// console.log(444+JSON.stringify(data[j]))
-									// item.text = data[j].Value
-									
-									// break
 								}
 							}
 							if(t==1){

pages/conponent/DateTimePicker282.vue

@@ -7,14 +7,14 @@
  -->
 <template>
 	<div>
-		<div class="time DateTimePicker28a" v-for="(item,index) in dataValue" :key="index">
+		<div class="time DateTimePicker28a" v-for="(item,index) in dataValue" :key="index" @click.stop="partens">
 			<div name="DateTimePicker" :class="item.class"
 				:style="'position:absolute; left:' + item.left + 'px; top:' + item.top 
                 + 'px; boxSizing:border-box; text-align:center;line-height:' + (item.height-1)
                 + 'px; width:'+ item.width + 'px; height:'+ item.height + 'px;'+ ';opacity:' 
                 + item.opacity + 'overflow:hidden;zIndex:'+(Number(item.ZIndex)+1) 
                 + ';padding:'+item.BorderThickness+'px;background:'+item.borderColor+';transform:rotate(' + item.rotate + 'deg);boxShadow:'+item.Shadow">
-				<view  @click.stop="showtime(item,index)" :style="'text-align:center;width:100%; height:100%;'
+				<view  @click="showtime(item,index)" :style="'zIndex:'+(Number(item.ZIndex)+2)+';text-align:center;width:100%; height:100%;'
                 + ';opacity:' + item.opacity + 'overflow:hidden;zIndex:'+item.ZIndex+';background:'+item.backColor+';color:'+item.foreColor">{{item.value}}</view>
 			</div>
 		</div>
@@ -65,6 +65,9 @@
 			}
 		},
 		methods: {
+			partens(){
+				
+			},
 			showtime(item, index) {
 				this.$store.dispatch('jurisdictionShow', {
 					'item': item,

pages/conponent/DynamicText17.vue

@@ -289,111 +289,7 @@
 				
 			},
 
-			//条件判断方法
-			// judgeFun(data) {
-			// 	var TextAnimationListData = this.TextAnimationListData
-			// 	var nullArrtype
-			// 	var aa
-			// 	this.ElementNameHas = ['1']
-			// 	//   //请求数据为空
-			// 	if (data.length == 0) {
-			// 		for (let f = 0; f < this.Starr.length; f++) {
-			// 			aa = '.' + this.Starr[f]
-			// 			nullArrtype = this.nullArr[f].StrokeType
-			// 			this.DynamicTextFun(aa, nullArrtype, f, this.nullArr)
-			// 		}
-			// 	} else {
-			// 		for (let i = 0; i < data.length; i++) {
-			// 			if (data[i].Value != null) {
-			// 				for (let j = 0; j < TextAnimationListData.length; j++) {
-			// 					if (data[i].Name == TextAnimationListData[j].TagName) {
-			// 						var result
-			// 						var resValue
-			// 						var Runsymbol
-			// 						var ArrValue
-			// 						var resValueNumber = data[i].Value
-			// 						resValue = data[i].Value.toLowerCase()
-			// 						ArrValue = TextAnimationListData[j].Compare.toLowerCase()
-			// 						Runsymbol = TextAnimationListData[j].Condition
-			// 						if (resValue == 'TRUE' || resValue == 'True' || resValue == 'true') {
-			// 							resValue = 1
-			// 						} else if (resValue == 'FALSE' || resValue == 'False' || resValue == 'false') {
-			// 							resValue = 0
-			// 						} else if (isNaN(resValueNumber) && !isNaN(Date.parse(resValueNumber))) {
-			// 							resValue = data[i].Value
-			// 						} else if (typeof(Number(resValueNumber)) == 'number') {
-			// 							resValue = Number(data[i].Value)
-			// 						} else {
-			// 							resValue = data[i].Value
-			// 						}
-			// 						if (ArrValue == 'TRUE' || ArrValue == 'True' || ArrValue == 'true') {
-			// 							ArrValue = 1
-			// 						} else if (ArrValue == 'FALSE' || ArrValue == 'False' || ArrValue == 'false') {
-			// 							ArrValue = 0
-			// 						} else if (isNaN(resValueNumber) && !isNaN(Date.parse(resValueNumber))) {
-			// 							ArrValue = TextAnimationListData[j].Compare
-			// 						} else if (typeof(Number(resValueNumber)) == 'number') {
-			// 							ArrValue = Number(TextAnimationListData[j].Compare)
-			// 						} else {
-			// 							ArrValue = TextAnimationListData[j].Compare
-			// 						}
-			// 						if (Runsymbol == '==') {
-			// 							result = resValue == ArrValue ? true : false
-			// 						} else if (Runsymbol == '>') {
-			// 							result = resValue > ArrValue ? true : false
-			// 						} else if (Runsymbol == '<') {
-			// 							result = resValue < ArrValue ? true : false
-			// 						} else if (Runsymbol == '<=') {
-			// 							result = resValue <= ArrValue ? true : false
-			// 						} else if (Runsymbol == ">=") {
-			// 							result = resValue >= ArrValue ? true : false
-			// 						} else if (Runsymbol == '!=') {
-			// 							result = resValue != ArrValue ? true : false
-			// 						}
-			// 						var continue1 = false
-			// 						var dd = this.ElementNameHas.indexOf(TextAnimationListData[j].ElementName)
-			// 						if (dd != -1) {
-			// 							continue;
-			// 						}
-			// 						var cla = TextAnimationListData[j].ElementName
-			// 						if (result) {
-			// 							this.ElementNameHas.push(TextAnimationListData[j].ElementName)
-			// 							var type = TextAnimationListData[j].StrokeType
-			// 							aa = '.' + cla
-			// 							this.DynamicTextFun(aa, type, j, TextAnimationListData)
-			// 							return
-			// 						} else {
-			// 							for (var g = 0; g < this.nullArr.length; g++) {
-			// 								if (cla == this.nullArr[g].ElementName) {
-			// 									aa = '.' + cla
-			// 									nullArrtype = this.nullArr[g].StrokeType
-			// 									this.DynamicTextFun(aa, nullArrtype, j, this.nullArr)
-			// 									break
-			// 								}
-			// 							}
-			// 						}
-
-			// 					}
-			// 				}
 			
-			// 			} else {
-			// 				var dd1 = this.ElementNameHas.indexOf(TextAnimationListData[i].ElementName)
-			// 				if (dd1 != -1) {
-			// 					continue;
-			// 				}
-			// 				for (let q = 0; q < this.nullArr.length; q++) {
-			// 					if (TextAnimationListData[i].ElementName == this.nullArr[q].ElementName) {
-			// 						var cla1 = TextAnimationListData[i].ElementName
-			// 						aa = '.' + cla1
-			// 						nullArrtype = this.nullArr[q].StrokeType
-			// 						this.DynamicTextFun(aa, nullArrtype, q, this.nullArr)
-			// 						break
-			// 					}
-			// 				}
-			// 			}
-			// 		}
-			// 	}
-			// },
 			judgeFun(data) {
 				// console.log(JSON.stringify(333+JSON.stringify(this.TextAnimationListData)))
 				// console.log(JSON.stringify(this.dae))
@@ -484,7 +380,7 @@
 											} else if (type == 4) {
 												item.borderPx = 0
 												item.BorderBrush = 'red'
-												item.background = ''
+												// item.background = ''
 											}
 											item.borPx = borPx
 											stopType = 1
@@ -509,7 +405,7 @@
 													} else if (type == 4) {
 														item.borderPx = 0
 														item.BorderBrush = 'red'
-														item.background = ''
+														// item.background = ''
 													}
 													item.borPx = borPx
 			

pages/conponent/EllipseLamp15.vue

@@ -225,7 +225,7 @@
 										var Runsymbol
 										var ArrValue
 										var resValueNumber = data[i].Value
-										resValue = data[i].Value.toLowerCase()
+										resValue = data[i].Value
 										ArrValue = TextAnimation.Compare == null ?
 											TextAnimation.Compare : TextAnimation.Compare.toLowerCase()
 										Runsymbol = TextAnimation.Condition

pages/conponent/Image18.vue

@@ -10,7 +10,7 @@
 		<div @click.stop="parents" v-for="(item,index) in dataValue" :key="index">
 			<div v-if="show" name="image" :class="item.class" class="Image18e" :style="'width:'+ item.width + 'px; height:' + item.height 
       + 'px; opacity:' + item.opacity + '; position:absolute; left:' + item.left  + 'px; top:' 
-      + item.top + 'px; transform:rotate(' + item.rotate + 'deg);zIndex:'+item.ZIndex+';background:#eee'">
+      + item.top + 'px; transform:rotate(' + item.rotate + 'deg);zIndex:'+item.ZIndex+';'">
 				<img :id="item.class" :src="item.source" :style="'height:' + item.H ">
 			</div>
 		</div>
@@ -190,7 +190,7 @@
 								var Runsymbol
 								var ArrValue
 								var resValueNumber = data[j].Value
-								resValue = data[j].Value.toLowerCase()
+								resValue = data[j].Value
 								ArrValue = TextAnimationListData[i].Compare == null ? TextAnimationListData[i]
 									.Compare :
 									TextAnimationListData[i].Compare.toLowerCase()

pages/conponent/LineChart22.vue

@@ -79,7 +79,6 @@
 
 			},
 			getRefresh(realyData,type) {
-				console.log(realyData)
 				this.dataValue.forEach((item, index) => {
 					for (let i = 0; i < realyData.length; i++) {
 						if (realyData[i].name == item.class) {

pages/conponent/LineVue1.vue

@@ -105,7 +105,7 @@
 						lage = StrokeArr.Data.Angel.toFixed(0)
 						for (var f2 = 0; f2 < StrokeArr.Data.GradientStops.length; f2++) {
 							gradient = StrokeArr.Data.GradientStops[f2]
-							StrokeColor = StrokeColor + ',' + gradient.Color + ' ' + (gradient.Offset * 100).toFixed(0) +
+							StrokeColor = getRgbaFun(StrokeColor) + ',' + getRgbaFun(gradient.Color) + ' ' + (gradient.Offset * 100).toFixed(0) +
 								'%'
 						}
 						StrokeColor = '-webkit-linear-gradient(' + lage + 'deg' + StrokeColor + ')';
@@ -134,7 +134,7 @@
 						StrokeThickness: this.textblockData[i].PropertyList.StrokeThickness,
 						marginTop: Number(this.textblockData[i].PropertyList.Height / 2) - (Number(this.textblockData[
 							i].PropertyList.StrokeThickness) / 2),
-						Stroke: getRgbaFun(StrokeColor),
+						Stroke: StrokeColor,
 						class: this.textblockData[i].Name,
 						ZIndex: this.ZIndex
 					}

pages/conponent/PopupButton10.vue

@@ -17,46 +17,19 @@
           + item.fontSize + 'px; opacity:' + item.opacity + ';boxSizing:border-box;padding:' 
           +item.BorderThickness + 'px;background:' + item.BorderBrush + '; transform:rotate(' 
           + item.rotate + 'deg);overflow:hidden;white-space:nowrap;boxShadow:'+item.Shadow+';zIndex:'+item.ZIndex">
-
 				<span class="contenText" :style="'position:absolute;left:0;top:0;right:0;bottom:0;margin:auto;line-height:'
           +item.height +'px;color:'+item.Foreground + ';fontWeight:'+item.Blod + ';background:'
           +item.backgroundColor+';-webkit-background-clip:'+item.clipText">{{item.text}}</span>
 				<div class="conten"
 					:style="'width:100%;height:100%;background:' + item.Background + ';borderRadius:' 
                 + (Number(item.radiusLeft) -1) + 'px ' + (Number(item.radiusTop) -1) + 'px ' 
-                + (Number(item.radiusRight) -1) + 'px ' + (Number(item.radiusButton) -1) + 'px;boxShadow：'+item.Shadow2">
-				</div>
-			</div>
-			<!-- 权限弹窗 -->
-			<div v-show="commerPopShow1" style="width:100%;height:100%;position:fixed;z-index:99">
-				<div v-if="commerPopShow1" class="commerPop_outPop">
-					<div class="commerPop_outHead">
-						<i class="warning el-icon-warning"></i>
-						<span class="text">提示</span>
-					</div>
-					<div class="commerPop_conter">该账户无操作权限</div>
-					<div class="commerPop_btn">
-						<div class="commerPop_yes" @click="Jurisdiction()" style="width:310px;margin-left:25px">确定</div>
-					</div>
-				</div>
+                + (Number(item.radiusRight) -1) + 'px ' + (Number(item.radiusButton) -1) + 'px;boxShadow:'+item.Shadow2">
 				</div>
 			</div>
 			
-		<!-- 弹窗 -->
-		<div class="Pop10">
-			<div v-drag v-for="(item,index) in PopList22" :key="index" :class="'popbox' +item.ElementName"
-				class="popbox" :style="'width:' + (item.viewWidth) + 'px; height:' 
-              + item.viewHeight + 'px; position:absolute; left:' + item.viewpositionX + 'px; top:'
-              +item.viewpositionY + 'px;background:#fff;zIndex:9999999' ">
-				<div id="Pop_Title" class="title">
-					<span class="title_text">{{item.viewtitle}}</span>
-					<i @click="popshowFun(item)" class="titleIc el-icon-close"></i>
-				</div>
-				<!-- <div class="popconter">
-              <bb ref="chid" :popdata="popdata" v-if="popShow"  class="aa"></bb>
-            </div> -->
-			</div>
 		</div>
+
+		
 	</div>
 </template>
 
@@ -445,7 +418,7 @@
 						for (var g2 = 0; g2 < foregoundArr.Data.GradientStops.length; g2++) {
 							gradient2 = foregoundArr.Data.GradientStops[g2]
 							let color = getRgbaFun( gradient2.Color)
-							backgroundColor = backgroundColor + ',' + color + ' ' + (gradient2.Offset * 100)
+							backgroundColor = getRgbaFun(backgroundColor) + ',' + color + ' ' + (gradient2.Offset * 100)
 								.toFixed(0) + '%'
 						}
 						backgroundColor = '-webkit-linear-gradient(' + lagel1 + 'deg' + backgroundColor + ')';
@@ -460,7 +433,7 @@
 						for (var f2 = 0; f2 < borderbrushArr.Data.GradientStops.length; f2++) {
 							gradient3 = borderbrushArr.Data.GradientStops[f2]
 							let color = getRgbaFun(gradient3.Color)
-							borderColor = borderColor + ',' + color + ' ' + (gradient3.Offset * 100).toFixed(0) +
+							borderColor = getRgbaFun(borderColor) + ',' + color + ' ' + (gradient3.Offset * 100).toFixed(0) +
 								'%'
 						}
 						borderColor = '-webkit-linear-gradient(' + lagel3 + 'deg' + borderColor + ')';
@@ -471,7 +444,7 @@
 						backColor = getRgbaFun(backColor)
 						if (backgroundArr.Data.Color.slice(3) == 'FFFFFF' && backgroundArr.Data.Color.slice(1, 3) !=
 							"FF") {
-							borderColor = '#FFFFFF' + backgroundArr.Data.Color.slice(1, 3)
+							borderColor = getRgbaFun('#FFFFFF' + backgroundArr.Data.Color.slice(1, 3))
 							borderColor = getRgbaFun(borderColor)
 						}
 					} else {
@@ -480,7 +453,7 @@
 						for (var h2 = 0; h2 < backgroundArr.Data.GradientStops.length; h2++) {
 							gradient1 = backgroundArr.Data.GradientStops[h2]
 							let color = getRgbaFun(gradient1.Color)
-							backColor = backColor + ',' + color + ' ' + (gradient1.Offset * 100).toFixed(0) + '%'
+							backColor = getRgbaFun(backColor) + ',' + color + ' ' + (gradient1.Offset * 100).toFixed(0) + '%'
 						}
 						backColor = '-webkit-linear-gradient(' + lagel2 + 'deg' + backColor + ')';
 					}
@@ -524,15 +497,15 @@
 		cursor: pointer;
 	}
 
-	.PopupButton10a:hover {
-		background-color: #71A2C7ff !important;
-		background: #71A2C7ff !important;
-	}
+	// .PopupButton10a:hover {
+	// 	background-color: #71A2C7ff !important;
+	// 	background: #71A2C7ff !important;
+	// }
 
-	.PopupButton10a:hover .conten {
-		background-color: #71A2C7ff !important;
-		background: #4EBAF3ff !important;
-	}
+	// .PopupButton10a:hover .conten {
+	// 	background-color: #71A2C7ff !important;
+	// 	background: #4EBAF3ff !important;
+	// }
 
 	.PopupButton10a:active {
 		background-color: #71A2C7ff !important;

pages/conponent/PressButton7.vue

@@ -626,12 +626,12 @@
 		position: relative;
 	}
 
-	.PressButton7a:hover {
+	.PressButton7a:active {
 		background-color: #71A2C7ff !important;
 		background: #71A2C7ff !important;
 	}
 
-	.PressButton7a:hover .conten {
+	.PressButton7a:active .conten {
 		background-color: #71A2C7ff !important;
 		background: #4EBAF3ff !important;
 	}

pages/conponent/QueryButton25.vue

@@ -760,15 +760,15 @@
 		box-sizing: border-box;
 	}
 
-	.querybutton25a:hover {
-		background-color: #71A2C7ff !important;
-		background: #71A2C7ff !important;
-	}
+	// .querybutton25a:hover {
+	// 	background-color: #71A2C7ff !important;
+	// 	background: #71A2C7ff !important;
+	// }
 
-	.querybutton25a:hover .conten {
-		background-color: #71A2C7ff !important;
-		background: #4EBAF3ff !important;
-	}
+	// .querybutton25a:hover .conten {
+	// 	background-color: #71A2C7ff !important;
+	// 	background: #4EBAF3ff !important;
+	// }
 
 	.querybutton25a:active {
 		background-color: #71A2C7ff !important;

pages/conponent/RWTextBox13.vue

@@ -370,26 +370,10 @@
 				return new Promise((resolve, reject) => {
 					max = max == null ? '' : max
 					min = min == null ? '' : min
-					this.$axios({
-						method: 'post',
-						url: `/api/Base/CheckTag?argType=${type}&argValue=${text}&argMax=${max}&argMin=${min}`,
-						argType: type,
-						argValue: text,
-						argMax: max,
-						argMin: min
-					}).then(res => {
-						if (res.data.code == 0) {
+					this.$api.checkTag(type,text,max,min).then(res=>{
+						if(res.data.code == 0){
 							resolve(true)
-						} else {
-							this.TextBoxShow = true
-							setTimeout(() => {
-								document.querySelector('.TextBoxPop_outPop').style.display =
-									'block'
-								document.querySelector('.TextBoxPop_conter').style.textAlign =
-									'center'
-								document.querySelector('.TextBoxPop_conter').innerHTML =
-									`${res.data.msg}`
-							})
+						}else{
 							resolve(false)
 						}
 					})

pages/conponent/RectangleVue2.vue

@@ -285,7 +285,7 @@
 					if (borderSadow.InnerShadow != undefined) {
 						InnerShadow = borderSadow.InnerShadow.OffsetX + 'px ' + borderSadow.InnerShadow.OffsetY +
 							'px ' + borderSadow.InnerShadow.BlurRadius.toFixed(0) + 'px ' +
-							getRgbaFun(getborderSadow.InnerShadow.Color) + ' inset'
+							getRgbaFun(borderSadow.InnerShadow.Color) + ' inset'
 					} else {
 						InnerShadow = ''
 					}

pages/conponent/StaticImage4.vue

@@ -10,7 +10,7 @@
 		<div v-for="(item,index) in dataValue" :key="index">
 			<div v-if="show" name="staticimage" :class="item.class" class="imgVue"
 				:style="'width:'+ item.width + 'px; height:' + item.height + 'px; opacity:' + item.opacity 
-      + '; position:absolute; left:' + item.left  + 'px; top:' + item.top + 'px; transform:rotate(' + item.rotate + 'deg);zIndex:'+item.ZIndex +';background:#eee'">
+      + '; position:absolute; left:' + item.left  + 'px; top:' + item.top + 'px; transform:rotate(' + item.rotate + 'deg);zIndex:'+item.ZIndex +';'">
 				<img class="boximg" :src="item.source"></image>
 			</div>
 

pages/conponent/StaticTextBlock5.vue

@@ -8,16 +8,17 @@
 <template>
 	<div>
 		<div v-for="(item,index) in dataValue" :key="index" @click.stop="partens">
-			<div v-if="show" name="statictextblock"  :class="item.class"
-				class="StaticTextBlock5aa" :style="'width:' + item.width +'px; height:' + item.height + 'px; fontSize:' +(item.size) 
-    + 'px; background:'+ item.Background+'; fontFamily:'+ item.family + ';display: flex;justify-content: center; align-items:'
+			<view v-if="show" name="statictextblock" :class="item.class" class="StaticTextBlock5aa" :style="'width:' + item.width +'px; height:' + item.height + 'px; fontSize:' +(item.size) 
+    + 'px; background:'+ item.Background+'; fontFamily:'+ item.family + ';display: flex;justify-content: space-between; align-items:'
     + item.alignItems+'; opacity:' + item.opacity + '; position:absolute; left:' + item.left + 'px; top:' + item.top 
     + 'px; text-align:'+item.textAlign+'; transform:rotate(' + item.rotate + 'deg); zIndex:'+item.ZIndex+'; fontWeight:' 
     +  item.Blod + ';white-space:pre-wrap;text-decoration:' + item.TextDecorations 
-    +';overflow:hidden;white-space:pre-wrap;word-break: break-all;color:'+item.Foreground">
-				<span :style="'white-space:pre-wrap;width:'+item.width +'px;'+ ';background:'+item.backgroundColor+';-webkit-background-clip:'
-  +item.clipText + ';color:' + item.Foreground ">{{item.text}}</span>
-			</div>
+    +';white-space:pre-wrap;word-break: break-all;color:'+item.Foreground+';overflow:auto'">
+				<scroll-view scroll-y="true" :style="'white-space:pre-wrap;width:'+item.width +'px;'+ ';background:'+item.backgroundColor+';-webkit-background-clip:'
+  +item.clipText + ';color:' + item.Foreground+';max-height: 100%'">
+					<view>{{item.text}} </view>
+				</scroll-view>
+			</view>
 
 		</div>
 	</div>
@@ -71,7 +72,7 @@
 		},
 
 		methods: {
-			partens(){},
+			partens() {},
 			init() {
 				//数据筛选
 				var dataAll = this.data.Controls.ControlList
@@ -183,7 +184,9 @@
 						ZIndex: this.ZIndex
 					}
 					this.dataValue.push(value)
+
 				}
+				console.log(this.dataValue)
 			}
 
 		}

pages/conponent/TabModuleButton9.vue

@@ -121,171 +121,51 @@
 				this.commerPopShow1 = false
 			},
 			Tab(item) {
-				console.log('4444')
 
 				var tabname = this.data.Data.TabModuleButtonList
 				if (tabname.length == 0) {
 					return
 				}
-				for (let i = 0; i < tabname.length; i++) {
-					if (item.class == tabname[i].ElementName) {
-						var arrId = tabname[i].SCMSChildMenuKey
-						var arr = tabname[i].SCMSChildMenuID
-						if (!menuarr.includes(arrId)) {
+				console.log('4444')
+				console.log(item)
 				this.$store.dispatch('jurisdictionShow', {
 					'item': item,
 					'dataId': this.dataId
 				}).then(res => {
-								if (res.data) {
 					if (res.data.CanExcute == 0) {
 						this.$toast.toast('该账户没有操作权限')
 					} else {
-										let menu = this.$store.state.routerInfo
-										console.log('meue==>'+JSON.stringify(menu))
-										for (let i = 0; i <menu.length; i++) {
-											if (menu[i].id == arrId) {
-												uni.navigateTo({
-													url: '/pages/monitoring/monitoring-view/index?data=' +JSON.stringify(this.$store.state.routerInfo[i])
-												})
-											}
-											if (menu[i].children != null) {
-												for (var y = 0; y < menu[i].children.length; y++) {
-													// console.log(menu[i].children[y].id)
-													if (menu[i].children[y].id == arrId) {
+						// if(res.data)
+						let menu = uni.getStorageSync('routerChildMenusInfo')
+						let projectInfo = uni.getStorageSync('projectInfo')
+						let projectName = projectInfo.projectName
+						for (let i = 0; i < tabname.length; i++) {
+							let item1 = tabname[i]
+							if (item.class == item1.ElementName) {
+								let arrId = tabname[i].SCMSChildMenuKey
+								let arr = tabname[i].SCMSChildMenuID
+								// console.log(arrId)
+								// console.log(arr)
+								for (let j = 0; j < menu.length; j++) {
+									if (menu[j].SCMSChildMenuID == arr) {
+										let title = menu[j].SCMSChildMenuKey
+										let id = menu[j].SCMSChildMenuID
 										console.log('跳转成功')
-														// console.log(JSON.stringifythis.$store.state.routerInfo[i].children[y])
 										uni.navigateTo({
-															url: '/pages/monitoring/monitoring-view/index?data=' +
-																JSON.stringify(this.$store.state.routerInfo[i].children[y])
+											url: '/pages/monitoring/monitoring-view/index?id=' +
+												id + '&title=' + title + '&projectName=' + projectName
 										})
+										return
 									}
 								}
 							}
-
-										}
-
-
-										// this.$api.getViewId(arrId, arr).then(res => {
-										// 	console.log('arrID==>' + res)
-										// 	let menu = this.$store.state.routerInfo
-										// 	for (let i = 0; i < menu.length; i++) {
-										// 		if (menu[i].id == res.data.data) {
-										// 			uni.navigateTo({
-										// 				url: '/pages/monitoring/monitoring-view/index?data=' +
-										// 					JSON.stringify(this.$store.state
-										// 						.routerInfo[i])
-										// 			})
-										// 		}
-										// 		if (menuArr[i].children != null) {
-										// 			for (var y = 0; y < menu[i].children.length; y++) {
-										// 				if (menuArr[i].children[y].id == res.data.data) {
-										// 					uni.navigateTo({
-										// 						url: '/pages/monitoring/monitoring-view/index?data=' +
-										// 							JSON.stringify(this.$store.state
-										// 								.routerInfo[i].children[y])
-										// 					})
-										// 				}
-										// 			}
-										// 		}
-
-										// 	}
-
-
-										// }).catch(error => {
-										// 	console.log(error)
-										// })
-
-
-
 						}
 					}
 				})
 				
 
-						}
-
-					}
-				}
-				// console.log(JSON.stringify(menuarr))
-
-				// console.log(JSON.stringify(item))
-
-				// console.log(JSON.stringify(tabname))
-
 			},
 
-
-			// Tab(item) {
-			// 	this.jurisdictionShow(item).then(val => {
-			// 		if (!this.CanExcuteShow) {
-			// 			const _this = this
-			// 			const CancelToken = this.$axios.CancelToken;
-			// 			this.cancelTokenFn && this.cancelTokenFn();
-			// 			this.cancelTokenFn = null;
-			// 			var tabname = this.data.Data.TabModuleButtonList
-			// 			if (tabname.length == 0) {
-			// 				this.$parent.loding()
-			// 				return
-			// 			}
-			// 			for (let i = 0; i < tabname.length; i++) {
-			// 				if (item.class == tabname[i].ElementName) {
-			// 					var arr = tabname[i].SCMSChildMenuID
-			// 					var arrId = tabname[i].SCMSChildMenuKey
-			// 					this.$axios({
-			// 						method: 'post',
-			// 						url: '/api/HMI/HMI_GstViewId?argChildMenuID=' + arr +
-			// 							'&argChildMenuKey=' + arrId,
-			// 						cancelToken: new CancelToken(function executor(c) {
-			// 							_this.cancelTokenFn = c
-			// 						}),
-			// 						argChildMenuID: arr,
-			// 						argChildMenuKey: arrId,
-			// 					}).then(res => {
-			// 						var menuArr = JSON.parse(sessionStorage.getItem('MenuInfo'))
-			// 						for (var u = 0; u < menuArr.length; u++) {
-
-			// 							if (menuArr[u].id == res.data.data) {
-			// 								this.$parent.loding()
-			// 								this.$router.push({
-			// 									path: menuArr[u].to,
-			// 									query: {
-			// 										id: menuArr[u].id
-			// 									}
-			// 								});
-			// 							}
-			// 							if (menuArr[u].children != null) {
-			// 								for (var y = 0; y < menuArr[u].children.length; y++) {
-			// 									if (menuArr[u].children[y].id == res.data.data) {
-			// 										this.$parent.loding()
-			// 										this.$router.push({
-			// 											path: menuArr[u].children[y].to,
-			// 											query: {
-			// 												id: menuArr[u].children[y].id
-			// 											}
-			// 										})
-			// 									}
-			// 								}
-			// 							}
-
-			// 						}
-			// 					}).catch(function(error) {});
-			// 				} else {
-			// 					var left = this
-			// 					setTimeout(function() {
-			// 						left.$parent.loding()
-			// 					}, 300)
-
-			// 				}
-			// 			}
-
-			// 		} else {
-			// 			this.$parent.loding()
-			// 			this.commerPopShow1 = true
-			// 		}
-			// 	})
-
-			// },
-
 			//赋值
 			gitValue() {
 				this.dataValue = []
@@ -454,15 +334,15 @@
 		display: block;
 	}
 
-	.TabModuleButton90aa:hover {
-		background-color: #71A2C7ff !important;
-		background: #71A2C7ff !important;
-	}
+	// .TabModuleButton90aa:hover {
+	// 	background-color: #71A2C7ff !important;
+	// 	background: #71A2C7ff !important;
+	// }
 
-	.TabModuleButton90aa:hover .conten {
-		background-color: #71A2C7ff !important;
-		background: #4EBAF3ff !important;
-	}
+	// .TabModuleButton90aa:hover .conten {
+	// 	background-color: #71A2C7ff !important;
+	// 	background: #4EBAF3ff !important;
+	// }
 
 	.TabModuleButton90aa:active {
 		background-color: #71A2C7ff !important;

pages/conponent/customreport.vue

@@ -101,19 +101,18 @@
 					this.Name = 'parameterreport';
 					this.data = val;
 					this.init();
-					// if (this.$store.state.isInit) {
-					// 	let i = $(".page2").length
-					// 	for (let c = 0; c < i; c++) {
 					
-					// 		$($(".page2")[0]).remove();
-					// 	}
-					// 	// this.first();
 				}
 			},
 			issearch: {
 				handler(val) {
 					// console.log(1233)
 				}
+			},
+			page:{
+				handler(val) {
+					// console.log(1233)
+				}
 			}
 
 
@@ -129,7 +128,7 @@
 					serviceAddress = 'http://' + projectInfo.serviceAddress
 				}
 				this.baseUrl = apiAddress
-				console.log(112 + JSON.stringify(this.baseUrl))
+				// console.log(112 + JSON.stringify(this.baseUrl))
 				this.init()
 
 			}
@@ -144,13 +143,17 @@
 			}
 			this.baseUrl = apiAddress
 			
+
 		},
 		methods: {
 			searchReport(item) {
 				let cavantable = this.cavantable
+				// console.log(this.cavantable)
 				let searchBtnName = item.class
 				// this.issearch = '哈哈'
+				// this.issearch = 1
 				this.issearch = Math.ceil(Math.random() * 10);
+				// this.gitValue()
 			},
 			changPageData(e, i) {
 				// console.log(333555)
@@ -237,27 +240,7 @@
 					return date
 				}
 
-				// if(fmt){
-				// let ret;
-				// const opt = {
-				// 	"y+": date.getFullYear().toString(), // 年
-				// 	"M+": (date.getMonth() + 1).toString(), // 月
-				// 	"d+": date.getDate().toString(), // 日
-				// 	"H+": date.getHours().toString(), // 时
-				// 	"m+": date.getMinutes().toString(), // 分
-				// 	"s+": date.getSeconds().toString() // 秒
-				// 	// 有其他格式化字符需求可以继续添加，必须转化成字符串
-				// };
-				// for (let k in opt) {
-				// 	ret = new RegExp("(" + k + ")").exec(fmt);
-				// 	if (ret) {
-				// 		fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
-				// 	}
-				// }
-				// return fmt
-				// }else{
-				// return ''
-				// }
+				
 			},
 			init() {
 				//数据筛选
@@ -279,6 +262,7 @@
 				//赋值
 
 				if (this.show) {
+					// this.issearch = Math.ceil(Math.random() * 10);
 
 					this.gitValue();
 				}
@@ -502,7 +486,14 @@
 				nameC: '',
 				data2: '',
 				value3: '',
-				page: []
+				page: [{
+						pageNum: [1, 2, 3, 4, 5],
+						pageIndex: 1
+					},
+					{
+						pageNum: [1, 2, 3, 4, 5],
+						pageIndex: 1
+					},]
 
 			}
 		},
@@ -513,7 +504,16 @@
 				this.baseUrl = newValue
 			},
 			searchDataFun(newValue) {
-				console.log('newValue')
+				console.log('newValue'+newValue)
+				// this.page = [{
+				// 		pageNum: [1, 2, 3, 4, 5],
+				// 		pageIndex: 1
+				// 	},
+				// 	{
+				// 		pageNum: [1, 2, 3, 4, 5],
+				// 		pageIndex: 1
+				// 	},]
+				// this.gitValue1()
 				this.first1()
 			},
 			changData1(e, ownerVm) {
@@ -626,10 +626,15 @@
 			},
 			//表格赋值
 			first1() {
+				console.log(676)
 				var wantnum;
 				var end = {};
 				setTimeout(() => {
 					for (let i = 0; i < this.cavantable.length; i++) {
+						this.page[i] = {
+							pageIndex: 0,
+							pageNum: [1]
+						}
 						var z = 0;
 						if (parseInt(this.cavantable[i].ParameterReportItemtList.dd.startpoy)) {
 							z = parseInt(this.cavantable[i].ParameterReportItemtList.dd.startpoy)
@@ -685,10 +690,12 @@
 						end.kzbanciwd = wantdata.kzbanciwd;
 						
 						end.kzresourcedataitemarray = wantdata.kzresourcedataitemarray;
+						if(wantdata.startkongjian){
 							end.starttime = $($('.' + wantdata.startkongjian)[0]).find('uni-view')[0].innerText;
 							end.endtime = $($('.' + wantdata.endkongjian)[0]).find('uni-view')[0].innerText;
-						end.argwaibuparalist = wantdata.kopngjianarray;
+						}
 						
+						end.argwaibuparalist = wantdata.kopngjianarray;
 						
 
 						if (end.argwaibuparalist.length !== 0) {
@@ -752,10 +759,14 @@
 								end.argwaibuparalist[j].itemshuzhikey = end.argwaibuparalist[j].kjitem;
 							}
 						} else {
+							if(wantdata.startkongjian){
 								end.starttime = $($('.' + wantdata.startkongjian)[0]).find('uni-view')[0].innerText;
 								
 								end.endtime = $($('.' + wantdata.endkongjian)[0]).find('uni-view')[0].innerText;
 							}
+							
+						}
+						
 						let onenum = wantnum.filter(item => {
 							if (item.resource == '历史归档') {
 								return item;
@@ -781,12 +792,7 @@
 							one.paradata = end;
 							one.cellparalist = onenum;
 
-							// this.$axios({
-							//     method: 'post',
-							//     url: `/api/ParameterReport/SearchItemData`,
-							//     data: one
-							// })
-							this.$api.searchItemDataApi(one).then(res => {
+							this.searchItemDataApi(one).then(res => {
 
 								if (res.data.data == '无数据' || res.data.data == "[]") {
 									for (let a2 = 0; a2 < one.cellparalist.length; a2++) {
@@ -850,13 +856,13 @@
 								one.cellresource = '统计归档';
 								one.paradata = end;
 								one.cellparalist = wantarr[cc];
-								console.log('统计', one);
+								// console.log('统计', one);
 								// this.$axios({
 								//     method: 'post',
 								//     url: `/api/ParameterReport/SearchItemData`,
 								//     data: one
 								// })
-								this.$api.searchItemDataApi(one).then(res => {
+								this.searchItemDataApi(one).then(res => {
 									if (res.data.data == '无数据' || res.data.data == "[]") {
 										console.log('无数据');
 										for (let a2 = 0; a2 < one.cellparalist.length; a2++) {
@@ -911,7 +917,7 @@
 								one.cellparalist = wantarr[cc];
 								one.waibuparalist = end.argwaibuparalist;
 
-								this.$api.SearchItemData(one).then(res => {
+								this.searchItemDataApi(one).then(res => {
 									//   console.log(JSON.parse(res.data.data))
 									if (res.data.data == '无数据' || res.data.data == "[]") {
 										for (let a2 = 0; a2 < one.cellparalist.length; a2++) {
@@ -957,15 +963,16 @@
 							}
 						}
 						if (end.argwaibuparalist.length == 0) {
+							// console.log('哈哈1')
+							if(wantdata.startkongjian){
 								end.starttime = $($('.' + wantdata.startkongjian)[0]).find('uni-view')[0].innerText;
 								end.endtime = $($('.' + wantdata.endkongjian)[0]).find('uni-view')[0].innerText;
 							}
 							
+						}
+
 						this.searchExtensionDataApi(end).then(res => {
-							// this.$api.searchExtensionData(end).then(res => {
-							console.log('哈哈1')
 							if (res.data.data == '无数据' || res.data.data == "[]") {
-
 								this.cavantable[i].data = [];
 								let ndata = [];
 								for (let i3 = 0; i3 < this.cavantable[i].ParameterReportItemtList.dd
@@ -4044,8 +4051,9 @@
 
 							if (aaa[0] !== '') {
 								for (let ii = 0; ii < bbb - 1; ii++) {
-									endwidth2 = endwidth2 + parseInt($('#' + this.cavantable[is].Name).find(
-										'.datareadyhead').eq(0).parent().find('.datareadyfoot')[ii].clientWidth);
+									console.log($('#' + this.cavantable[is].Name).find('.datareadyhead').eq(0).parent().find('.datareadyfoot')[ii])
+									// endwidth2 = endwidth2 + parseInt($('#' + this.cavantable[is].Name).find(
+									// 	'.datareadyhead').eq(0).parent().find('.datareadyfoot')[ii].clientWidth);
 								}
 							}
 							if (this.cavantable[is].ParameterReportItemtList.dd.kzsummopos == '分布在后') {
@@ -4781,7 +4789,7 @@
 							// 	data: one
 							// }).
 
-							await this.$api.searchItemDataApi(one).then(res => {
+							await this.searchItemDataApi(one).then(res => {
 								console.log('历史', res);
 								if (res.data.data == '无数据' || res.data.data == "[]") {
 									console.log('无数据');
@@ -4873,7 +4881,7 @@
 								// 	url: `/api/ParameterReport/SearchItemData`,
 								// 	data: one
 								// })
-								await this.$api.searchItemDataApi(one).then(res => {
+								await this.searchItemDataApi(one).then(res => {
 									console.log('历史', res);
 									if (res.data.data == '无数据' || res.data.data == "[]") {
 										console.log('无数据');
@@ -4964,7 +4972,7 @@
 								// 	url: `/api/ParameterReport/SearchItemData`,
 								// 	data: one
 								// })
-								await this.$api.searchItemDataApi(one).then(res => {
+								await this.searchItemDataApi(one).then(res => {
 									if (res.data.data == '无数据' || res.data.data == "[]") {
 
 										console.log('无数据');