diff --git a/src/utils/api.js b/src/utils/api.js
index 877bbcc..11059a8 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -13,7 +13,7 @@ if(isKd){
     }else if(url.includes('10.196.131.73')){
         host = 'http://10.196.131.73'; // 河海版
     }else if (url.includes('124.71.12.62')) {
-        host = 'http://124.71.12.62/'; // 巢湖版
+        host = 'http://124.71.12.62'; // 巢湖版
     } else if (url.includes('39.108.250.202')) {
         host = 'http://39.108.250.202:9000'; // 中台测试服
     } else {
@@ -21,7 +21,7 @@ if(isKd){
         host = 'http://39.108.250.202:9000';
     }
 
-    host = 'http://192.168.31.137:9000' // 坤
+    // host = 'http://192.168.31.137:9000' // 坤
 }
 let host1 = 'http://39.108.250.202:8080';
 let uploadURL = 'http://8.134.8.197:8001';
@@ -60,17 +60,21 @@ export default {
 
 
     // 职站
-    // QueryPointOfJudgement: `${host}/judgment/pointOfJudgement/queryPointOfJudgement`, //判分点列表查询
-    // DeletePointOfJudgement: `${host}/judgment/pointOfJudgement/deletePointOfJudgement`, //判分点列表删除
-    // QueryPfdInformation: `${host}/judgment/pointOfJudgement/queryPfdInformation`, //判分点详细信息
-    // UpdatePointOfJudgement: `${host}/judgment/pointOfJudgement/updatePointOfJudgement`, //编辑判分点基本信息
-    // UpdatePointOfJudgementRule: `${host}/judgment/pointOfJudgement/updatePointOfJudgementRule`, //编辑判分点规则
-    // AddPfdgzInformation: `${host}/judgment/pointOfJudgement/addPfdgzInformation`, //新增判分规则
-    // AddPfdInformation: `${host}/judgment/pointOfJudgement/addPfdInformation`, //新增判分点基本信息
-    // QueryPfdgzInformation: `${host}/judgment/pointOfJudgement/queryPfdgzInformation`, //判分点规则信息查询
-    // QueryAddgz: `${host}/judgment/pointOfJudgement/queryAddgz`, //查询新增判分点规则新增的数据
-    // DeletePointOfJudgementRule: `${host}/judgment/pointOfJudgement/deletePointOfJudgementRule`, //删除判分点规则
-    // JudgmentPointNameRepetition: `${host}/judgment/pointOfJudgement/JudgmentPointNameRepetition`,
+    QueryPointOfJudgement: `${host}/judgment/pointOfJudgement/queryPointOfJudgement`, //判分点列表查询
+    DeletePointOfJudgement: `${host}/judgment/pointOfJudgement/deletePointOfJudgement`, //判分点列表删除
+    QueryPfdInformation: `${host}/judgment/pointOfJudgement/queryPfdInformation`, //判分点详细信息
+    UpdatePointOfJudgement: `${host}/judgment/pointOfJudgement/updatePointOfJudgement`, //编辑判分点基本信息
+    UpdatePointOfJudgementRule: `${host}/judgment/pointOfJudgement/updatePointOfJudgementRule`, //编辑判分点规则
+    AddPfdgzInformation: `${host}/judgment/pointOfJudgement/addPfdgzInformation`, //新增判分规则
+    AddPfdInformation: `${host}/judgment/pointOfJudgement/addPfdInformation`, //新增判分点基本信息
+    QueryPfdgzInformation: `${host}/judgment/pointOfJudgement/queryPfdgzInformation`, //判分点规则信息查询
+    QueryAddgz: `${host}/judgment/pointOfJudgement/queryAddgz`, //查询新增判分点规则新增的数据
+    DeletePointOfJudgementRule: `${host}/judgment/pointOfJudgement/deletePointOfJudgementRule`, //删除判分点规则
+    JudgmentPointNameRepetition: `${host}/judgment/pointOfJudgement/JudgmentPointNameRepetition`,
+
+
+
+
     UpdateIsOpen: `${host}/judgment/pointOfJudgement/updateIsOpen`, //修改判分点状态
     queryUserIds:`${host}/liuwanr/userInfo/queryUserIds`,
 
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 6ad4059..f6ba220 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -117,7 +117,6 @@ export default {
     console.log('当前地址=', location.host);
     console.log("token=", this.$route.query.token)
     console.log("systemId=", this.$route.query.systemId)
-
     this.$route.query.token && this.$store.commit('setParam', {
       token: atob(decodeURI(this.$route.query.token)),
       referrer: atob(decodeURI(this.$route.query.referrer))
@@ -145,7 +144,11 @@ export default {
         this.getProcessClassData(params);
       } else {
         // 编程类
-        this.getProgrammingClassData(params);
+        if (location.host == 'http://124.71.12.62' || location.host == 'http://occupationlab.com'){
+          this.getCHProgrammingClassData(params);
+        }else{
+          this.getProgrammingClassData(params);
+        }
       }
     },
     getProcessClassData(params) { // 获取流程类判分点列表数据
@@ -215,9 +218,22 @@ export default {
           this.tableData = res.message.records;
           this.dataTotal = res.message.total;
         }).catch(err => {
-          console.log(err);
         });
     },
+    getCHProgrammingClassData(){
+      let systemId = this.$route.query.systemId
+      let userId = this.$route.query.userId
+      let pageNum = this.$route.query.pageNum
+      let pageSize = this.$route.query.pageSize
+      let queryName = this.$route.query.queryName
+      let userIdList = this.$route.query.userIdList
+      this.$post(`${this.api.QueryPointOfJudgement}?systemId=${systemId}&userId=${userId}&pageNum=${pageNum}&pageSize=${pageSize}&queryName=${queryName}&userIdList=${userIdList}`).then(res => {
+        this.tableData = res.message.records;
+        this.dataTotal = res.message.total;
+      }).catch(err => {
+        console.log(err);
+      });
+    },
     HomepageJump() { //新增
       if (this.systemId == 11) {
         // 交易类
diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue
index b7aeaac..e07fb7d 100644
--- a/src/views/Transaction.vue
+++ b/src/views/Transaction.vue
@@ -106,7 +106,7 @@
             </el-table-column>
             <el-table-column label="交易结果正确答案">
               <template slot-scope="scope" v-if="scope.row.isSubject">
-                <p class="p">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p>
+                <p class="p" style="margin-top: 1px">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p>
                 <div class="block">
                   <!-- type: 题目类型(1选择 2判断 3填空 4问答 5指标结果) -->
                   <div v-if="scope.row.type == ''" style="line-height: 65px">需点击</div>
@@ -360,6 +360,7 @@ export default {
       tableDataCopy: [], // 规则表格数据备份
       isAddRule: false, // 是否禁用新增规则按钮
       itemkey:'',
+      judgePoints:false,//判断是否点了编辑
     };
   },
   mounted() {
@@ -653,6 +654,7 @@ export default {
       this.tableData[index - 1].ruleOperation = row.ruleOperation;
     },
     handleEdit(row) { // 处理编辑规则
+      this.judgePoints = true
       this.tableDataCopy = deepCopy(this.tableData); // 深拷贝
       row.isDisabled = false;
       row.isSave = false;
@@ -702,7 +704,8 @@ export default {
       this.isAddRule = false;
     },
     handleCancel(row, index) { // 处理取消编辑规则
-      if (row.isSave) {
+      if (this.judgePoints == true) {
+        this.judgePoints = false
         this.$set(this.tableData, index, this.tableDataCopy[index]);
         if (!this.tableData[index].operationIds) {
           this.$refs[`tree-${index}`].setCheckedKeys([]);
@@ -711,7 +714,7 @@ export default {
         }
       } else {
         this.tableData.splice(index, 1);
-        index ? this.tableData.splice(index - 1, 1) : this.tableData.splice(0, 1);
+        // index ? this.tableData.splice(index - 1, 1) : this.tableData.splice(0, 1);
         this.isAddRule = false;
       }
     },
@@ -722,10 +725,11 @@ export default {
         type: "warning",
         center: true
       }).then(() => {
-        if(index+1 == this.tableData.length){
-          index = index-1
-        }
-        this.tableData.splice(index,2);
+        // if(index+1 == this.tableData.length){
+        //   index = index-1
+        // }
+        this.tableData.splice(index,1);
+        index ? this.tableData.splice(index - 1, 1) : this.tableData.splice(0, 1);
         this.itemkey = Math.random()
         this.tableData.forEach(async (item, index) => {
           // 勾选树节点
@@ -894,7 +898,7 @@ export default {
 }
 .block {
   @include block;
-  min-height: 100px;
+  min-height: 220px;
   background-color: #fff;
   overflow: auto;
 
diff --git a/src/views/Transaction.vue.copy20210901 b/src/views/Transaction.vue.copy20210901
index 716fe34..c221509 100644
--- a/src/views/Transaction.vue.copy20210901
+++ b/src/views/Transaction.vue.copy20210901
@@ -91,7 +91,7 @@
               </el-table-column>
               <el-table-column label="交易结果正确答案">
                 <template slot-scope="scope">
-                  <p class="p">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p>
+                  <p class="p" style="margin-top:1px">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p>
                   <div class="box">
                     <div class="flex box_p">
                       <p>指标类别</p>