Browse Source

添加发到手机截图接收

DESKTOP-6LTVLN7\Liumouren 1 year ago
parent
commit
2bccb72552
4 changed files with 16 additions and 7 deletions
  1. 7 0
      css/home.css
  2. 2 0
      index.html
  3. 6 6
      js/util.js
  4. 1 1
      pages/map.html

+ 7 - 0
css/home.css

@@ -453,6 +453,13 @@
 	font-size: 14px;
 }
 
+#autoLoginText2 {
+	position: absolute;
+	right: 0;
+	color: #909399;
+	font-size: 14px;
+}
+
 .changeType {
 	position: fixed;
 	bottom: 36px;

+ 2 - 0
index.html

@@ -25,6 +25,8 @@
 				<div class="mui-input-row">
 					<input id="autoLogin" name="checkbox" value="true" type="checkbox" checked><span
 						id="autoLoginText">记住密码</span>
+						<span
+							id="autoLoginText2">忘记密码?</span>
 				</div>
 			</form>
 			<button id='loginButton' class="mui-btn mui-btn-block mui-btn-primary">登录</button>

+ 6 - 6
js/util.js

@@ -29,7 +29,7 @@ mui.plusReady(function() {
 			},
 			// 本地测试环境(政务内网DMS服务)
 			Beta: {
-				DMS_BASE_RUL: "http://117.131.26.69:10081",
+				DMS_BASE_RUL: "https://117.131.26.69:10081",
 				myTaskColumnId: 1794, // 我的任务
 				myTaskInfoColumnId: 1537, // 我的任务详情
 				knowledgeRetrievalColumnId: 1396, // 知识检索
@@ -274,6 +274,8 @@ mui.plusReady(function() {
 				mui.toast('退出成功', '系统提示');
 				localStorage.removeItem("token");
 				mui.openWindow("../index.html", "login");
+			}).on('tap', '#autoLoginText2', function() {
+				mui.alert('忘记密码请联系系统管理员在oauth系统中重置密码!', '系统提示', null, 'div');
 			}).on('tap', '.myTasks', function() {
 				// 我的任务页面跳转
 				clearSearchValue();
@@ -637,12 +639,7 @@ mui.plusReady(function() {
 					imageConversion.compressAccurately(file, {
 						size: 1024
 					}).then(res => {
-						// var file1 = new File([res], file.name, {
-						// 	type: 'application/json',
-						// 	lastModified: Date.now()
-						// });
 						blobToDataURI(res, function(base64) {
-							// fileList[file.name] = base64;
 							// 文件上传
 							let content = {
 								title: "appUploadFile-" + new Date().getTime(),
@@ -813,6 +810,7 @@ mui.plusReady(function() {
 		// 用户登录
 		function apiLogin(setting, funSuccess, funError) {
 			newPostRequest(loginUrl, setting, funSuccess, funError);
+			// functionAsync(loginUrl, setting, funSuccess, funError);
 			// requestSettins.success = funSuccess;
 			// requestSettins.error = funError;
 			// let newSetting = Object.assign(requestSettins, setting);
@@ -997,6 +995,7 @@ mui.plusReady(function() {
 					data: paramData,
 					dataType: "json"
 				}, function success(res, textStatus, xhr) {
+					console.log(res, textStatus, xhr)
 					if (res.code == 200) {
 						// 如果用户选中了记住密码,则保存账户信息
 						if (isActive) {
@@ -1186,6 +1185,7 @@ mui.plusReady(function() {
 									.name :
 									cDoubtfulPoints.id;
 								cDoubtfulPoints.id = resJson.content.data[i].id;
+								cDoubtfulPoints.filePath = resJson.content.data[i].uploadFileUrls;
 								serverDataMap[cDoubtfulPoints.id] = resJson.content.data[i];
 								geometrys.push(cDoubtfulPoints);
 								localStorage.setItem("geometrys", JSON.stringify(geometrys));

+ 1 - 1
pages/map.html

@@ -441,7 +441,7 @@
 						<p class="detailedInformation" data-marker-data='${markerDataPropertiesStr}'>详细信息</p>
 						<div class="arrowdown" data-state="${state}"><span class="mui-icon mui-icon-arrowdown"></span></div>
 						<p>疑点图斑:</p>
-						<div><img class="patternSpot" src="http://47.103.92.60:2102/apps/patternSpot.png"/></div>
+						<div><img class="patternSpot" src="https://117.131.26.69:10081/proxy_dms${markerData.filePath}"/></div>
 						<p>位置:${markerData.properties && markerData.properties['镇域名称'] ? markerData.properties['镇域名称'] : '未知'}</p>
 						<div id="mapImageList">
 							`;