Signed-off-by: zhaobao <528046418@qq.com>

config/index.js

@@ -5,11 +5,14 @@ export default {
 	  // dev: 'http://192.168.3.253:7001',	
 	  // dev:"http://192.168.3.5:7001",
       // pro: 'https://api.xazhyc.com',
-	  pro: 'http://192.168.3.5:7001',
+	  pro: 'http://1.15.92.205:7001',	
+	  // pro: 'http://192.168.3.5:7001',
     },
 	appID: '10007',
 	appKey: '82a8bf439373e311',
 	appSecret: '82a8bf439373e311',
 	permitTplId: 7,
-	TokenKey:"Authorization"
+	TokenKey:"Authorization",
+	// minih5:"http://h5.xazhyc.com",//h5 地址【合阳医院】
+	minih5:"http://mini.xazhyc.com/dev"//h5 测试地址
 }

main.js

@@ -1,10 +1,11 @@
 import App from './App'
-
+import config from "@/config/index.js"
 // #ifndef VUE3
 import Vue from 'vue'
 import './uni.promisify.adaptor'
 Vue.config.productionTip = false
 App.mpType = 'app'
+Vue.prototype.$h5= config.minih5
 const app = new Vue({
   ...App
 })

pages/history/history.vue

@@ -80,10 +80,10 @@
 					this.total=res.total
 				})  				
 			},
-			showDetail(){
-				let baseUrl="http://h5.xazhyc.com"
+			showDetail(item){
+				let baseUrl=this.$h5
 				uni.navigateTo({
-					url:`/pages/webview/webview?href=${baseUrl}/art/views/detail.html&artId=473700&name=通讯录`
+					url:`/pages/webview/webview?href=${baseUrl}/art/views/detail.html&artId=${item.artId}&name=${item.artCatTitle}`
 				})		
 			}
 		},

pages/index/detail/detail.vue

@@ -259,9 +259,11 @@
 			},
 			handle(type,item){			
 				let url=""
-				if(type==='danger'){
-					if(item.curAccountId!==this.user.userId) return;
-					url=`/pages/index/handle/danger/index/index?type=${type}&id=${item.dangerId}`
+				if(type==='danger'){				
+					uni.navigateTo({
+						url:`/pages/webview/webview?href=${this.$h5}/danger/views/detail.html&dangerId=539241&name=隐患处理`
+					})						
+					return
 				}
 				if(type==='task'){this.handTask(item);return};
 				if(type==='warn'){	

pages/index/handle/task/hazardRecord/hazardRecord.vue

@@ -13,7 +13,7 @@
 											<text style="padding-right: 5px;">{{measureIdx+1}})</text>
 											<text>{{measure.measureContent}}</text>
 									</view>
-									<view class="status">{{measure.checkResult|checkResultFilter}}</view>
+									<view class="status">【<span class="text">{{measure.checkResult|checkResultFilter}}</span>】</view>
 								</view>
 							</view>
 						</view>				
@@ -21,9 +21,9 @@
 				</view>
 				<view class="handle-container">	
 					<view class="handle" @click="handleSubmit(1)">全部通过</view>
-					<view class="handle" @click="handleSubmit(2)">全不通过</view>	
-					<view class="handle submit" @click="handleSubmit(3)">提交</view>
-					<view class="handle danger" @click="handleSubmit('danger')">登记隐患</view>
+					<view class="handle" @click="handleSubmit(2)">全不通过</view>
+					<view class="handle submit" @click="handleSubmit(3)" v-if="submit_bt_state">提交</view>
+<!-- 					<view class="handle danger" @click="handleSubmit('danger')" v-if="danger_bt_state">登记隐患</view> -->
 					<view class="more" @mouseenter="hover(1)" @mouseleave="hover">
 						<text class="text">更多</text>
 						<view class="list" v-if="showMore">
@@ -54,6 +54,8 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 				accountInfo:{},
 				divider: false,
 				edit: true,
+				danger_bt_state:false,
+				submit_bt_state:false,
 				itemList:[],
 				recordId:undefined,
 				checklistId:undefined,
@@ -94,7 +96,21 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 				getChecklistHazardRecordView(recordId).then((res)=>{
 					if(!res.data.hazardList)return					
 					this.itemList=res.data.hazardList
-					this.status=res.data.status				
+					this.status=res.data.status		
+					let items=[]						
+					for(let i=0;i<this.itemList.length;i++){
+						if(this.itemList[i].riskList){
+							this.itemList[i].riskList.map(child=>{
+								child.recordList.map(measure=>{
+									items.push(measure)
+								})
+							})
+						}						
+					}
+					let index=items.findIndex(item=>item.checkResult===-1)
+					let _index=items.findIndex(item=>item.checkResult===0)	
+					this.submit_bt_state=_index<0								
+					this.danger_bt_state=index>-1?true:false
 				})
 			},
 			check(measure){		
@@ -106,6 +122,7 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 			handleSubmit(type){
 				let recordId=this.recordId;
 				let checklistId=this.checklistId;
+				const self=this;				
 				if(type===1){
 					batchUpdateChecklistHazardRecordDoing(recordId,1).then(()=>{
 						this.getchecklistRecord(recordId)
@@ -117,16 +134,21 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 					})
 				}				
 				if(type===3){//完成
-					completeCheckTask(recordId).then(()=>{				
-						uni.switchTab({
-							url:'/pages/index/index'
-						})
-					}).catch(()=>{
-						uni.showToast({
-							icon:"none",
-							title:"操作失败"
-						})
-					})
+					if(this.danger_bt_state){
+						uni.showModal({
+							title: '提示',
+							content: '本次检查有未通过项，是否需要登记隐患？',
+							success: function (res) {
+								if (res.confirm) {
+									self.submitDanger(recordId)
+								} else if (res.cancel) {
+									self.completeTask(recordId)
+								}
+							}
+						});
+					}else{
+						this.completeTask(recordId)
+					}
 				}
 				if(type===4){//放弃
 					cancelCheckTask(recordId).then(()=>{
@@ -147,7 +169,7 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 					})
 				}
 				if(type==="danger"){
-					let href="http://h5.xazhyc.com/danger/views/create.html";
+					let href=`${this.$h5}/danger/views/create.html`;
 					let name= '登记隐患'
 					completeCheckTask(recordId).then(()=>{
 						uni.redirectTo({
@@ -161,6 +183,26 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 					})
 				}
 			},
+			completeTask(recordId){
+				completeCheckTask(recordId).then(()=>{				
+					uni.reLaunch({
+						url:'/pages/index/index'
+					})
+				}).catch(()=>{
+					uni.showToast({
+						icon:"none",
+						title:"操作失败"
+					})
+				})					
+			},
+			submitDanger(recordId){
+				let href=`${this.$h5}/danger/views/create.html`;
+				let name= '登记隐患'	
+				completeCheckTask(recordId)								
+				uni.redirectTo({
+					url:`/pages/webview/webview?href=${href}&name=${name}`
+				})
+			},
 			hover(state){
 				this.showMore=state===1
 			}
@@ -235,6 +277,12 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 						.pointContent{
 							flex: 1;
 						}
+						.status{
+							.text{
+								color: #3384FF;
+								font-weight: 800;
+							}
+						}
 					}
 				}
 			}
@@ -268,6 +316,7 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 				&.submit{
 					background-color: #3384FF;	
 					color: #fff;
+				   padding: 18rpx 38rpx;
 				}
 			}
 			.more{

pages/index/handle/task/task.vue

@@ -14,8 +14,8 @@
 							<view  class="point-cont" v-if="checklistItem.recordList&&checklistItem.recordList.length>0">
 								<view class="point" v-for="(point,pointIdx) in checklistItem.recordList" :key="pointIdx" @click="check(point)">
 									<view class="pointContent">{{point.pointContent}}</view>
-									<view class="status" v-if="point.checkResult===1">【通过】</view>
-									<view class="status" v-if="point.checkResult===-1">【不通过】</view>
+									<view class="status" v-if="point.checkResult===1">【<span class="text">通过</span>】</view>
+									<view class="status" v-if="point.checkResult===-1">【<span class="text">不通过</span>】</view>
 								</view>
 							</view>
 						</view>				
@@ -25,8 +25,8 @@
 							<view  class="point-cont">
 								<view class="point" @click="check(checklistItem)">
 									<view class="pointContent">{{checklistItem.pointContent}}</view>
-									<view class="status" v-if="checklistItem.checkResult===1">【通过】</view>
-									<view class="status" v-if="checklistItem.checkResult===-1">【不通过】</view>
+									<view class="status" v-if="checklistItem.checkResult===1">【<span class="text">通过</span>】</view>
+									<view class="status" v-if="checklistItem.checkResult===-1">【<span class="text">不通过</span>】</view>
 								</view>
 							</view>
 						</view>				
@@ -35,8 +35,8 @@
 				<view class="handle-container" v-if="handleVisiable">
 					<view class="handle" @click="handleSubmit(1)">全部通过</view>
 					<view class="handle" @click="handleSubmit(2)">全不通过</view>	
-					<view class="handle submit" @click="handleSubmit(3)">提交</view>
-					<view class="handle danger" @click="handleSubmit('danger')">登记隐患</view>
+					<view class="handle submit" @click="handleSubmit(3)" v-if="submit_bt_state">提交</view>
+<!-- 					<view class="handle danger" @click="handleSubmit('danger')">登记隐患</view> -->
 					<view class="more" @mouseenter="hover(1)" @mouseleave="hover">
 						<text class="text">更多</text>
 						<view class="list" v-if="showMore">
@@ -68,6 +68,8 @@
 					children: 'children',
 					label: 'itemTitle'
 				},
+				danger_bt_state:false,
+				submit_bt_state:false,
 				accountInfo:{},
 				divider: false,
 				edit: true,
@@ -96,6 +98,24 @@
 					this.itemList=res.data.itemList
 					this.status=res.data.status
 					this.handleVisiable=(res.data.status===0||res.data.status===1)&&(res.data.accountId===this.accountInfo.userId)
+					let items=[]
+					for(let i=0;i<itemList.length;i++){
+						if(itemList[i].children){
+							itemList[i].children.map(child=>{
+								child.recordList.map(pointitem=>{
+									items.push(point)
+								})
+							})
+						}else{
+							itemList[i].recordList.map(pointitem=>{
+								items.push(pointitem)
+							})							
+						}						
+					}
+					let index=items.findIndex(item=>item.checkResult===-1)
+					let _index=items.findIndex(item=>item.checkResult===0)
+					this.submit_bt_state=_index<0
+					this.danger_bt_state=index>-1?true:false
 				})
 			},
 			check(point){		
@@ -108,6 +128,7 @@
 			handleSubmit(type){
 				let recordId=this.recordId;
 				let checklistId=this.checklistId;
+				const self=this;
 				if(type===1){
 					checklistBatchUpdate(recordId,1).then(()=>{
 						this.getchecklistRecord(checklistId,recordId)
@@ -119,16 +140,21 @@
 					})
 				}				
 				if(type===3){//完成
-					completeCheckTask(recordId).then(()=>{				
-						uni.switchTab({
-							url:'/pages/index/index'
-						})
-					}).catch(()=>{
-						uni.showToast({
-							icon:"none",
-							title:"操作失败"
-						})
-					})
+					if(this.danger_bt_state){
+						uni.showModal({
+							title: '提示',
+							content: '本次检查有未通过项，是否需要登记隐患？',
+							success: function (res) {
+								if (res.confirm) {
+									self.submitDanger(recordId)
+								} else if (res.cancel) {
+									self.completeTask(recordId)
+								}
+							}
+						});
+					}else{
+						this.completeTask(recordId)
+					}
 				}
 				if(type===4){//放弃
 					cancelCheckTask(recordId).then(()=>{
@@ -149,21 +175,29 @@
 					})
 				}
 				if(type==="danger"){
-					let href="http://h5.xazhyc.com/danger/views/create.html";
-					let name= '登记隐患'
-					completeCheckTask(recordId).then(()=>{
-						uni.redirectTo({
-							url:`/pages/webview/webview?href=${href}&name=${name}`
-						})
-					}).catch(()=>{
-						uni.showToast({
-							icon:"none",
-							title:"操作失败"
-						})
-					})
-
+					this.submitDanger(recordId)
 				}
 			},
+			completeTask(recordId){
+				completeCheckTask(recordId).then(()=>{				
+					uni.switchTab({
+						url:'/pages/index/index'
+					})
+				}).catch(()=>{
+					uni.showToast({
+						icon:"none",
+						title:"操作失败"
+					})
+				})					
+			},
+			submitDanger(recordId){
+				let href=`${this.$h5}/danger/views/create.html`;
+				let name= '登记隐患'	
+				completeCheckTask(recordId)								
+				uni.redirectTo({
+					url:`/pages/webview/webview?href=${href}&name=${name}`
+				})
+			},
 			hover(state){
 				this.showMore=state===1
 			}
@@ -238,6 +272,12 @@
 						.pointContent{
 							flex: 1;
 						}
+						.status{
+							.text{
+								color: #3384FF;
+								font-weight: 800;
+							}
+						}
 					}
 				}
 			}

pages/index/index.vue

@@ -344,7 +344,7 @@
 			linkTo(type,name){
 				uni.navigateTo({
 					url:`/pages/index/detail/detail?type=${type}&name=${name}`
-				})
+				})							
 			},
 			handle(type,item){
 				let url=""

pages/myCenter/myCenter.vue

@@ -149,7 +149,7 @@
 				})
 			},
 			linkToContacts(){
-				let baseUrl="http://h5.xazhyc.com"
+				let baseUrl=this.$h5
 				uni.navigateTo({
 					url:`/pages/webview/webview?href=${baseUrl}/profile/views/addressBook.html&name=通讯录`
 				})
@@ -181,7 +181,7 @@
 				})
 			},
 			downloadApk(){
-				const apkUrl="http://h5.xazhyc.com/app.apk"
+				const apkUrl=`${this.$h5}/app.apk`
 				uni.showModal({
 					title: "发现新版本",
 					content: "是否下载新版本",
@@ -221,7 +221,7 @@
 				})
 			},
 			updateApp(){
-				const apkUrl="http://h5.xazhyc.com/app.apk"
+				const apkUrl=`${this.$h5}/app.apk`
 				this.downloadVisable=true
 				const downloadTask = uni.downloadFile({
 					url: apkUrl,

pages/webview/webview.vue

@@ -17,11 +17,10 @@
 			init(options){
 				let t=new Date().getTime();
 				if(options.type==='scan'){
-					let href="http://h5.xazhyc.com/scanApp/#/pages/index/index"
+					let href=`${this.$h5}/scanApp/#/pages/index/index`
 					let qrcode=uni.getStorageSync('qrcode')
 					qrcode=qrcode.split('?')[1]
 					this.webViewSrc=`${href}?token=${getToken()}&${qrcode}&v=${t}`
-					console.log(`${href}?token=${getToken()}&${qrcode}&v=${t}`)
 					uni.setNavigationBarTitle({
 						title:"扫码操作"
 					})										

unpackage/resources/__UNI__73F6024/www/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/resources/__UNI__73F6024/www/app-config.js

@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

unpackage/resources/__UNI__73F6024/www/manifest.json

@@ -0,0 +1 @@
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__73F6024","name":"六院联创","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Barcode":{},"Maps":{"coordType":"gcj02"},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.99","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#7A7E83","selectedColor":"#1296db","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabbar/index.png","selectedIconPath":"static/tabbar/indexEd.png","text":"首页"},{"pagePath":"pages/applicationCenter/applicationCenter","iconPath":"static/tabbar/app.png","selectedIconPath":"static/tabbar/appEd.png","text":"应用中心"},{"pagePath":"pages/history/history","iconPath":"static/tabbar/info.png","selectedIconPath":"static/tabbar/infoEd.png","text":"信息中心"},{"pagePath":"pages/myCenter/myCenter","iconPath":"static/tabbar/myCenter.png","selectedIconPath":"static/tabbar/myCenterEd.png","text":"我的"}],"height":"50px"},"launch_path":"__uniappview.html"},"locale":"zh-Hans"}