浏览代码

修复修改功能

yin_yu820 1 年之前
父节点
当前提交
51a4e51fef
共有 5 个文件被更改,包括 42 次插入33 次删除
  1. 7 0
      src/api/sys/userSets.js
  2. 4 2
      src/config/index.js
  3. 2 2
      src/utils/config.js
  4. 26 26
      src/views/tab_a/tabAll.vue
  5. 3 3
      vue.config.js

+ 7 - 0
src/api/sys/userSets.js

@@ -40,6 +40,13 @@ export default class userSets {
             params
         )
     };
+	//盐政通测试用户同步规则
+	SchemaServiceTest(params) {
+	    return request.get(
+	        `/SchemaServiceTest`,
+	        params
+	    )
+	};
     //盐政通测试用户新建
     UserCreateService(params) {
         return request.post(

+ 4 - 2
src/config/index.js

@@ -1,10 +1,12 @@
 var defaultConfig = {
 
-    //baseUrl : 'http://2.142.215.98:8010',
+    baseUrl : 'http://2.142.215.98:8010/hs',//政务网环境地址
 	
 	//baseUrl : 'http://192.168.1.102:3000',
 	
-	baseUrl : 'http://localhost:3000',
+	//baseUrl : 'http://192.168.139.71:3000',
+	
+	//baseUrl : '/api',
   
     timeout : '50000',
 

+ 2 - 2
src/utils/config.js

@@ -7,11 +7,11 @@ if (process.env.NODE_ENV === 'development') {
     //APP_SERVER_URL = 'http://192.168.139.77:8084'    
     //APP_SERVER_URL = 'http://localhost:8084'
     //测试线上
-    APP_SERVER_URL = 'http://112.3.63.60:58081'
+    APP_SERVER_URL = 'http://192.168.139.102:8084'
     
 } else {
     // 生产环境
-    APP_SERVER_URL = 'http://123.57.226.179:8010/hs'
+    APP_SERVER_URL = 'http://2.142.215.98:8010/hs'
 }
 
 // APP_SERVER_URL = APP_SERVER_URL + "/app"

+ 26 - 26
src/views/tab_a/tabAll.vue

@@ -48,26 +48,26 @@
 	</div>
 
 	<van-grid :border="false">
-		<van-grid-item icon="../../../loginbg/csdj.png" text="场所登记" @click="goPlaceRegister"/>
-		<van-grid-item icon="../../../loginbg/csry.png" text="场所人员信息" @click="goPlacePerson" />
-		<van-grid-item icon="../../../loginbg/cspw.png" text="牌位管理" @click="goPlaceTablet"/>
+		<van-grid-item icon="./loginbg/csdj.png" text="场所登记" @click="goPlaceRegister"/>
+		<van-grid-item icon="./loginbg/csry.png" text="场所人员信息" @click="goPlacePerson" />
+		<van-grid-item icon="./loginbg/cspw.png" text="牌位管理" @click="goPlaceTablet"/>
 	</van-grid>
 
 	<div class="hLine"></div>
 
 	<div class="tabtitlelay">
 		<div class="tabtitle1"></div>
-		<div class="tabtitle">活动管理</div>
+		<div class="tabtitle">{{testshow}}</div>
 	</div>
 
 	<van-grid :border="false" >
-		<van-grid-item icon="../../../loginbg/hd_cshd.png" @click="placeActivity" text="场所活动" />
-		<van-grid-item icon="../../../loginbg/hd_ssjhd.png" @click="selfMeetingList" text="私设聚会点" />
-		<van-grid-item icon="../../../loginbg/hd_xjqz.png" @click="abnormalCrowd" text="信教群众异常" />
-		<van-grid-item icon="../../../loginbg/hd_jc.png" text="场所检查" @click="tohd_jc" />
-		<van-grid-item icon="../../../loginbg/hd_af.png" text="安防设施异常" @click="tohd_af" />
-		<van-grid-item icon="../../../loginbg/hd_hy.png" text="负责人会议" @click="tohd_hy" />
-		<van-grid-item icon="../../../loginbg/hd_qt.png" to="/setting" text="其他" @click="tohd_qt" />
+		<van-grid-item icon="./loginbg/hd_cshd.png" @click="placeActivity" text="场所活动" />
+		<van-grid-item icon="./loginbg/hd_ssjhd.png" @click="selfMeetingList" text="私设聚会点" />
+		<van-grid-item icon="./loginbg/hd_xjqz.png" @click="abnormalCrowd" text="信教群众异常" />
+		<van-grid-item icon="./loginbg/hd_jc.png" text="场所检查" @click="tohd_jc" />
+		<van-grid-item icon="./loginbg/hd_af.png" text="安防设施异常" @click="tohd_af" />
+		<van-grid-item icon="./loginbg/hd_hy.png" text="负责人会议" @click="tohd_hy" />
+		<van-grid-item icon="./loginbg/hd_qt.png" text="其他" @click="tohd_qt" />
 	</van-grid>
 </div>
 </template>
@@ -88,6 +88,7 @@ import $base from "@/utils/config";
 				password2:"",
 				con1:0,
 				con2:0,
+				testshow:"活动管理",
 				sum:"0",
 				sum1:"0",
 				sum2:"0",
@@ -97,9 +98,8 @@ import $base from "@/utils/config";
 
 		created(){
 			let id=this.$route.query.id;
-			// window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
+			window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
 			this.TokenLogin2();
-			//this.dataNumber();
 		},
 
 		methods:{
@@ -133,7 +133,7 @@ import $base from "@/utils/config";
 				new toBeDone().list2().then((res1)=>{
 					this.sum2 = res1.records.length;
 					this.sum=this.sum1+this.sum2;
-					
+
 				})
 
 			},
@@ -192,9 +192,9 @@ import $base from "@/utils/config";
 				if(this.$store.state.pctoken==""||this.$store.state.pctoken==undefined){
 
 					//SDK中 getToken() 方法获取免登token
-					//window.xm.getToken().then(async function(token){//上线取消注释
-					let token="test";//上线注释
-
+					window.xm.getToken().then(async function(token){//上线取消注释
+					//let token="test";//上线注释	
+					
 
 					new userSets()
 					.TokenLogin({
@@ -208,7 +208,7 @@ import $base from "@/utils/config";
 						that.dataNumber();//获取待办事项数
 					});
 
-					//})//上线取消注释
+					})//上线取消注释
 
 				}else{
 					that.getBannerImg();//获取轮播图
@@ -245,7 +245,7 @@ import $base from "@/utils/config";
 				})
 				.then((res) => {
 					let bs=[];
-					
+
 					res.records[0].bannerImg.split("|").forEach((item) => {
 						if (item.trim().length > 0) {
 							bs.push($base + item.replace('程序附件//','程序附件/'),
@@ -274,15 +274,15 @@ import $base from "@/utils/config";
 				let that=this;
 
 				//SDK中 getToken() 方法获取免登token
-				window.xm.getToken().then(function(token){
-					console.log(token);
+				// window.xm.getToken().then(function(token){
+				// 	console.log(token);
 
-					that.con1="哈哈"+token;
-					window.xm.showToast({
-						message:that.con1
-					})
+				// 	that.con1="哈哈"+token;
+				// 	window.xm.showToast({
+				// 		message:that.con1
+				// 	})
 
-				})
+				// })
 
 				//测试数据同步接口的
 				const inputForm ={

+ 3 - 3
vue.config.js

@@ -5,11 +5,11 @@ module.exports = defineConfig({
 
     // 代理服务,处理接口跨域请求
     devServer: {
-        port: '8080',
+        port: '8080',//
         proxy: {
             '/api': {
-                //target:'http://124.70.137.152:8095',// http://124.70.137.152:8095
-                target: 'http://0.0.0.0:8084', // 
+                //target:'http://124.70.137.152:8095',// http://2.142.215.98:8010
+                target: 'http://192.168.139.102:8084', // 
                 changeOrigin: true,
                 pathRewrite: {
                     '^/api': '/'