Merge remote-tracking branch 'origin/master'

refined-manager-ui/admin/.env

@@ -9,7 +9,8 @@ VUE_APP_BASE_API =/basics_api
 # 门户登录地址
 VUE_APP_PORTAL_URL = http://192.168.0.98:11072
 
-VUE_APP_PORTAL_PORT = 21080
+# VUE_APP_PORTAL_PORT = 21080
+VUE_APP_PORTAL_PORT = 8085
 
 # 站点请求地址
 VUE_APP_SITETREE_URL = http://192.168.0.98:11078/base/site/siteTree

refined-manager-ui/admin/src/views/appointment/constraint/list.vue

@@ -36,7 +36,11 @@
 
           handleConstraint(row,type) {
             let _this = this
-            this.$confirm('取消约束后，系统将不向该群众推送此项服务，是否确认？', "系统服务", {
+            let content = '取消约束后，系统将不向该群众推送此项服务，是否确认？';
+            if(type){
+              content = '约束后，系统将向该群众推送此项服务，是否确认？';
+            }
+            this.$confirm(content, "系统服务", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning"

refined-manager-ui/admin/vue.config.js

@@ -8,8 +8,8 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/refined': {
-				// target: 'http://112.19.80.237:11080/',
-				target: 'http://192.168.0.98:11080/',
+				target: 'http://112.19.80.237:11080/',
+				// target: 'http://192.168.0.98:11080/',
 				// target: 'http://127.0.0.1:21080',
 				changeOrigin: true,
 				secure: false,