Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

common/globalJs/globalJs.js

@@ -2,9 +2,11 @@
 // #ifdef APP-PLUS || MP
 // const baseUrl = "http://116.62.210.143:9002";
 const baseUrl = "http://118.89.79.160:8800/HiatmpPro";
+const chatUrl = "http://118.89.79.160:8800/HiatmpPro";
 // #endif
 // #ifdef H5
 const baseUrl = "/HiatmpPro";
+const chatUrl = "/hitapChat";
 // #endif
 
 // 图片路径的公用部分
@@ -34,7 +36,7 @@ module.exports = {
 	// 视频name值
 	fileVideoKey,
 	baseUrl,
-
+	chatUrl,
 	// ----------------------校验----------------------
 	// 处理时间两位数
 	timeDealTwo(value) {
@@ -464,30 +466,66 @@ module.exports = {
 	// ----------------------自封方法----------------------
 	// 获取分发类型
 	getTypeFenFa() {
-        return [
+		return [{
-            {type:1,label:'代表发文'},
+				type: 1,
-            {type:2,label:'收文'},
+				label: '代表发文'
-            {type:3,label:'呈报事项'},
+			},
-            {type:4,label:'纪检发文'},
+			{
-            {type:5,label:'会议通知'},
+				type: 2,
-            {type:6,label:'重大事项通知'},
+				label: '收文'
-            {type:7,label:'议案分发提议人'},
+			},
-            {type:8,label:'公文流转'},
+			{
+				type: 3,
+				label: '呈报事项'
+			},
+			{
+				type: 4,
+				label: '纪检发文'
+			},
+			{
+				type: 5,
+				label: '会议通知'
+			},
+			{
+				type: 6,
+				label: '重大事项通知'
+			},
+			{
+				type: 7,
+				label: '议案分发提议人'
+			},
+			{
+				type: 8,
+				label: '公文流转'
+			},
 		]
 	},
 	// 获取员工类型
 	getPersonType() {
-        return [
+		return [{
-            {type:1,label:'集团领导'},
+				type: 1,
-            {type:2,label:'中层领导'},
+				label: '集团领导'
-            {type:3,label:'普通员工'},
+			},
+			{
+				type: 2,
+				label: '中层领导'
+			},
+			{
+				type: 3,
+				label: '普通员工'
+			},
 		]
 	},
 	// 获取书记类型
 	getTypeSJ() {
-        return [
+		return [{
-            {type:1,label:'党委书记'},
+				type: 1,
-            {type:2,label:'党委副书记'}
+				label: '党委书记'
+			},
+			{
+				type: 2,
+				label: '党委副书记'
+			}
 		]
 	},
 	// 获取当前时间-年月日
@@ -550,7 +588,8 @@ module.exports = {
 		var userAgentInfo = navigator.userAgent;
 		var Agents = ["Android", "iPhone",
 			"SymbianOS", "Windows Phone",
-            "iPad", "iPod"];
+			"iPad", "iPod"
+		];
 		var flag = true;
 		for (var v = 0; v < Agents.length; v++) {
 			if (userAgentInfo.indexOf(Agents[v]) > 0) {
@@ -562,8 +601,11 @@ module.exports = {
 	},
 	// 获取语言列表
 	getLanguage() {
-        return [
+		return [{
-            {id:'cn',name:'CN',type:1},
+				id: 'cn',
+				name: 'CN',
+				type: 1
+			},
 			// {id:'en',name:'English',type:2}
 		]
 	},
@@ -743,7 +785,8 @@ module.exports = {
 		var hours = parseInt((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
 		var minutes = parseInt((time % (1000 * 60 * 60)) / (1000 * 60));
 		var seconds = (time % (1000 * 60)) / 1000;
-        return (days).toFixed(0) + " 天 " + (hours).toFixed(0) + " 小时 " + (minutes).toFixed(0) + " 分钟 " + (seconds).toFixed(0) + " 秒 ";
+		return (days).toFixed(0) + " 天 " + (hours).toFixed(0) + " 小时 " + (minutes).toFixed(0) + " 分钟 " + (seconds)
+			.toFixed(0) + " 秒 ";
 	},
 	// 秒数转换成时分秒
 	time_SToHMS(s) {

manifest.json

@@ -141,6 +141,14 @@
                     "pathRewrite" : {
                         "^/HiatmpPro" : "/HiatmpPro"
                     }
+                },
+				"/hitapChat" : {
+				    "target" : "http://219.147.31.25:30001/hitap",
+				    "changeOrigin" : true,
+				    "secure" : false,
+				    "pathRewrite" : {
+				        "^/hitapChat" : ""
+				    }
 				}
             }
         },

pages/index/detail.vue

@@ -1,10 +1,17 @@
 <template>
 	<view class="detail">
-		<headerNavBar title="智能排查" :isBack="true">
+		<view class="Content BorderBox Width100">
+			<top-title :is-show-left="true" :title="'智能排查'"  :rightWidth="40" class="custom_bg">
+				<template slot="right">
+					<image :src="$.imgurl + '/knowledge.png'" mode="" class="knowledge" @click="goToKnowledge"></image>
+				</template>
+			</top-title>
+		</view>
+		<!-- <headerNavBar title="智能排查" :isBack="true">
 			<template v-slot:right>
 				<image :src="$.imgurl + '/knowledge.png'" mode="" class="knowledge" @click="goToKnowledge"></image>
 			</template>
-		</headerNavBar>
+		</headerNavBar> -->
 		<view class="stepBox">
 			<view class="step" v-for="(item, index) in tablist" :key="index">
 				<view class="stepItem">
@@ -64,12 +71,13 @@
 
 <script>
 	import AbortController from 'abort-controller/dist/abort-controller'
-
+	import TopTitle from "../../components/top-title.vue";
-import headerNavBar from '../../components/headerNavBar/headerNavBar.vue'
+	// import headerNavBar from '../../components/headerNavBar/headerNavBar.vue'
 	import zeroMarkdownView from '../../components/zeroMarkdownView/zeroMarkdownView.vue'
 	// import {
 	// 	EventSourcePolyfill
 	// } from 'event-source-polyfill';
+	import $ from '../../common/globalJs/globalJs.js'
 	import {
 		fetchEventSource
 	} from '@microsoft/fetch-event-source'
@@ -78,7 +86,10 @@ import zeroMarkdownView from '../../components/zeroMarkdownView/zeroMarkdownView
 	// } from '../../utils/config.js';
 
 	export default {
-		components: { headerNavBar,zeroMarkdownView },
+		components: {
+			TopTitle,
+			zeroMarkdownView
+		},
 		data() {
 			return {
 				active: 0,
@@ -182,8 +193,7 @@ import zeroMarkdownView from '../../components/zeroMarkdownView/zeroMarkdownView
 					}),
 					signal: ctrl.signal,
 					openWhenHidden: true,
-					onopen:()=> {
+					onopen: () => {},
-					},
 					onmessage: (ev) => {
 						console.log(ev)
 						this.loading = true
@@ -196,7 +206,10 @@ import zeroMarkdownView from '../../components/zeroMarkdownView/zeroMarkdownView
 								this.active = this.tabkey - 1 > 0 ? this.tabkey - 1 : 0;
 							}
 							if (this.msgList.length == 0) {
-							  this.msgList = [{answerId,data:res.result.data.content}]
+								this.msgList = [{
+									answerId,
+									data: res.result.data.content
+								}]
 							} else {
 								// debugger
 								//回答
@@ -206,7 +219,10 @@ import zeroMarkdownView from '../../components/zeroMarkdownView/zeroMarkdownView
 
 								} else {
 									//最后一个是问题
-								  this.msgList = [...this.msgList,{answerId:'1',data:res.result.data.content}]
+									this.msgList = [...this.msgList, {
+										answerId: '1',
+										data: res.result.data.content
+									}]
 								}
 
 							}
@@ -239,7 +255,7 @@ import zeroMarkdownView from '../../components/zeroMarkdownView/zeroMarkdownView
 				this.loading = true;
 				const [err, res] = await uni.request({
 					// url: 'http://10.16.3.159:8777/api/local_doc_qa/local_doc_chat',
-					url:  'http://219.147.31.25:30001/hitap/chat',
+					url: $.chatUrl+'/chat',
 					dataType: 'json',
 					method: 'POST',
 					// responseType: 'arraybuffer',
@@ -444,7 +460,8 @@ import zeroMarkdownView from '../../components/zeroMarkdownView/zeroMarkdownView
 
 		.stepBox {
 			width: 100%;
-			height: 150rpx;
+			// height: 150rpx;
+			 padding-top: 110rpx ;
 			display: flex;
 			justify-content: center;
 			align-items: center;

pages/investigation/components/investigation-item.vue

@@ -251,7 +251,9 @@
 		}
 
 		/deep/ .uni-forms-item__label {
-			font-size: 16px;
+			font-size: 32rpx;
+			height:auto;
+			margin-bottom: 20rpx;
 		}
 	}
 

pages/investigation/components/investigation-item2.vue

@@ -271,7 +271,8 @@
 		}
 
 		/deep/ .uni-forms-item__label {
-			font-size: 16px;
+			font-size: 32rpx;
+			// height:82rpx
 		}
 	}
 
@@ -297,4 +298,5 @@
 			color: #2663BF;
 		}
 	}
+	
 </style>