diff --git a/src/store/State.js b/src/store/State.js
index 3ebb231..2721aa5 100644
--- a/src/store/State.js
+++ b/src/store/State.js
@@ -1,4 +1,5 @@
 export default {
     token: '',
+
     referrer: ''
 }
\ No newline at end of file
diff --git a/src/utils/api.js b/src/utils/api.js
index d91633d..3bb25a7 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -17,27 +17,61 @@ if(isKd){
     } else {
         host = 'http://39.108.250.202'; // 中台
     }
+
+    host = 'http://192.168.31.125:9000' // 坤
 }
 let host1 = 'http://39.108.250.202:8080';
 let uploadURL = 'http://8.134.8.197:8001';
 export default {
     fileupload: `${uploadURL}/oss/manage/fileupload`,
 
+    // 交易类（流程类）
+    getLcRecord: `${host}/judgment/lcRecord/getLcRecord`, // 获取流程记录列表(树)
+    getSubjectInfo: `${host}/judgment/lcSubject/getSubjectInfo`, // 根据题目id获取题目信息
+    addJudgmentRule: `${host}/judgment/lcJudgmentRule/addJudgmentRule`, // 添加判分点规则
+    updateJudgmentRule: `${host}/judgment/lcJudgmentRule/updateJudgmentRule`, // 添加判分点规则
+    deleteJudgmentRule: `${host}/judgment/lcJudgmentRule/deleteJudgmentRule`, // 批量删除判分点规则
+    addJudgmentPoint: `${host}/judgment/lcJudgmentPoint/addJudgmentPoint`, // 新增判分点
+    updateJudgmentPoint: `${host}/judgment/lcJudgmentPoint/updateJudgmentPoint`, // 更新判分点
+    deleteJudgmentPoint: `${host}/judgment/lcJudgmentPoint/deleteJudgmentPoint`, // 批量删除判分点
+    calculate: `${host}/judgment/lcJudgmentPoint/calculate`, // 计算判分点规则
+    updateIsOpen: `${host}/judgment/lcJudgmentPoint/updateIsOpen`, // 更新开启状态
+    queryNameIsExist: `${host}/judgment/lcJudgmentPoint/queryNameIsExist`, // 新增/编辑判分点名称判重
+    bandingProject: `${host}/judgment/lcJudgmentPoint/bandingProject`, // 绑定项目管理
+    queryAllJudgmentPoint: `${host}/judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表
+    queryJudgmentPointDetails: `${host}/judgment/lcJudgmentPoint/queryJudgmentPointDetails`, // 获取判分点详细信息
+
+    // 编程类
+    getBcJudgmentPoint: `${host}/judgment/bcJudgmentPoint/getBcJudgmentPoint`, // 获取判分点列表(分页)
+    queryBcJudgmentPointByBcId: `${host}/judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId`, // 根据判分点id查询判分点详细信息
+    queryBcJudgmentByBcId: `${host}/judgment/bcJudgmentPoint/queryBcJudgmentByBcId`, // 根据判分点id查询判分点信息(不带规则)
+    addBcJudgmentPoint: `${host}/judgment/bcJudgmentPoint/addBcJudgmentPoint`, // 添加判分点
+    updateBcJudgmentPoint: `${host}/judgment/bcJudgmentPoint/updateBcJudgmentPoint`, // 更新判分点
+    bcDeleteJudgmentPoint: `${host}/judgment/bcJudgmentPoint/deleteJudgmentPoint`, // 批量删除判分点
+    bcQueryNameIsExist: `${host}/judgment/bcJudgmentPoint/queryNameIsExist`, // 新增/编辑判分点名称判重
+    bcBandingProject: `${host}/judgment/bcJudgmentPoint/bcBandingProject`, // 绑定项目管理
+    bcUpdateIsOpen: `${host}/judgment/bcJudgmentPoint/updateIsOpen`, // 更新开启状态
+    bcAddJudgmentRule: `${host}/judgment/bcJudgmentRule/addJudgmentRule`, // 添加判分点规则
+    bcUpdateJudgmentRule: `${host}/judgment/bcJudgmentRule/updateJudgmentRule`, // 更新判分点规则
+    bcDeleteJudgmentRule: `${host}/judgment/bcJudgmentRule/deleteJudgmentRule`, // 批量删除判分点规则
+
+
     // 职站
-    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`, //删除判分点规则
+    // 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`, //修改判分点状态
-    JudgmentPointNameRepetition: `${host}/judgment/pointOfJudgement/JudgmentPointNameRepetition`,
     queryUserIds:`${host}/liuwanr/userInfo/queryUserIds`,
 
+
     // 科大子系统
     queryPoint: `${host}/kdSys/queryPoint`,
     querySubject: `${host}/kdSys/querySubject`,
diff --git a/src/views/Home.vue b/src/views/Home.vue
index e1aec89..6d0e831 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -5,12 +5,12 @@
         <span>Back</span>
       </i>
 
-      <p>{{systemName}} 判分点设置</p>
+      <p>{{ systemName }} 判分点设置</p>
     </div>
     <div class="footer">
       <div class="flex-end">
         <div>
-            <el-input placeholder="请输入判分点名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
+          <el-input placeholder="请输入判分点名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
         </div>
       </div>
       <div class="flex footer_h">
@@ -24,35 +24,36 @@
           <el-col :span="24">
             <el-card shadow="hover">
               <el-table
-                :data="tableData"
-                :cell-style="rowClass"
-                :header-cell-style="headClass"
-                :stripe="true"
-                header-align="center"
+                  :data="tableData"
+                  :cell-style="rowClass"
+                  :header-cell-style="headClass"
+                  :stripe="true"
+                  header-align="center"
               >
                 <el-table-column type="index" label="序号" align="center">
-                  <template slot-scope="scope">{{scope.$index + (pageNo - 1) * pageSize + 1}}</template>
+                  <template slot-scope="scope">{{ scope.$index + (pageNum - 1) * pageSize + 1 }}</template>
                 </el-table-column>
-                <el-table-column prop="judgmentPointsName" label="判分点名称" align="center"></el-table-column>
+                <el-table-column prop="name" label="判分点名称" align="center"></el-table-column>
                 <el-table-column label="实验要求" align="center">
                   <template slot-scope="scope">
-                    <quill :border="true" :readonly="true" v-model="scope.row.experimentalRequirements" :minHeight="150" :height="150" />
+                    <quill :border="true" :readonly="true" v-model="scope.row.experimentalRequirements" :minHeight="150"
+                           :height="150"/>
                   </template>
                 </el-table-column>
 
                 <el-table-column prop="operate" label="操作" align="center">
                   <template slot-scope="scope">
-                    <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
-                    <el-button @click="getListDelete(scope.row)" type="text" size="small">删除</el-button>
+                    <el-button @click="handleEdit(scope.row)" type="text" size="small">编辑</el-button>
+                    <el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
                   </template>
                 </el-table-column>
-                <el-table-column prop="isopen" label="是否启用" align="center" min-width="20%">
+                <el-table-column prop="isOpen" label="是否启用" align="center" min-width="20%">
                   <template slot-scope="scope">
                     <el-switch
-                      v-model="scope.row.isopen"
-                      :active-value="0"
-                      :inactive-value="1"
-                      @change="changeSwitch($event,scope.row,scope.$index)"
+                        v-model="scope.row.isOpen"
+                        :active-value="0"
+                        :inactive-value="1"
+                        @change="changeSwitch(scope.row)"
                     ></el-switch>
                   </template>
                 </el-table-column>
@@ -64,12 +65,12 @@
         <!-- 分页 -->
         <div class="block">
           <el-pagination
-            background
-            @current-change="handleCurrentChange"
-            :current-page="pageNo"
-            :page-size="10"
-            layout="total,prev, pager, next, jumper"
-            :total="dataTotal"
+              background
+              @current-change="handleCurrentChange"
+              :current-page="pageNum"
+              :page-size="10"
+              layout="total,prev, pager, next, jumper"
+              :total="dataTotal"
           ></el-pagination>
         </div>
       </div>
@@ -78,8 +79,8 @@
 </template>
 
 <script>
-import axios from "axios";
 import quill from '@/components/quill'
+
 export default {
   data() {
     return {
@@ -87,172 +88,186 @@ export default {
       searchTimer: null,
       tableData: [],
       dataTotal: 0, // 总条数，根据接口获取数据长度(注意：这里不能为空)
-      pageNo: 1,
+      pageNum: 1,
       pageSize: 10,
       currentPage: 1,
       systemId: this.$route.query.systemId,
-      userId: this.$route.query.userId,
       systemName: this.$route.query.systemName,
     };
   },
   components: {quill},
   watch: {
-    keyword: function(val) {
-        clearTimeout(this.searchTimer)
-        this.searchTimer = setTimeout(() => {
-            this.initData()
-        },500)
+    keyword: function (val) {
+      clearTimeout(this.searchTimer)
+      this.searchTimer = setTimeout(() => {
+        this.initData()
+      }, 500)
     },
   },
   mounted() {
-    let url = location.host
-    console.log(url,'当前地址');
-    console.log(11,this.$route.query.token)
-    this.$route.query.token && this.$store.commit('setParam',{token: atob(decodeURI(this.$route.query.token)),referrer: atob(decodeURI(this.$route.query.referrer))})
-    this.handleCurrentChange(this.pageNo);
+    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))
+    })
+
+    this.initData();
   },
   methods: {
-    changeSwitch(e, row, index) {
-      let newData = row;
-      newData.isopen = newData.isopen === 1 ? 1 : 0;
-      this.tableData[index] = newData;
-      this.$post(this.api.UpdateIsOpen, {
-        judgmentPointsId: row.judgmentPointsId,
-        isopen: newData.isopen
-      });
-    },
-    BackMain() {
-      // window.location = "http://120.78.198.231:8080/serviceSide/#/configure";
+    BackMain() { // 返回
       history.back()
     },
-
-    handleCurrentChange(val) {
-      this.$get(`${this.api.queryUserIds}`).then(res => {
-          this.pageNo = val;
-          this.$get(this.api.QueryPointOfJudgement, {
-            systemId: this.systemId,
-            userId: this.userId,
-            pageNum: this.pageNo,
-            pageSize: this.pageSize,
-            queryName: this.keyword,
-            userIdList: res.message.retvalue.join()
-          }).then(res => {
-            this.tableData = res.message.rows;
-            this.dataTotal = res.message.total;
-          })
-          .catch(err => {
-            console.log(err);
-          });
-      }).catch(res => {})
+    handleCurrentChange(val) { // 切换页码
+      this.pageNum = val;
+      this.initData();
     },
-    initData(){
-      this.pageNo = 1
-      this.handleCurrentChange(this.pageNo)
+    initData() { // 获取初始数据
+      let params = {
+        name: this.keyword,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        systemId: this.systemId
+      };
+      if (this.systemId == 11) {
+        // (流程)交易类
+        this.getProcessClassData(params);
+      } else {
+        // 编程类
+        this.getProgrammingClassData(params)
+      }
     },
-    // setCookie(name, value) {
-    //   if (value) {
-    //     var days = 1; //定义一天
-    //     var exp = new Date();
-    //     exp.setTime(exp.getTime() + days * 24 * 60 * 60 * 1000); // 写入Cookie, toGMTString将时间转换成字符串
-    //     document.cookie =
-    //       name +
-    //       "=" +
-    //       escape(value) +
-    //       ";expires=" +
-    //       exp.toGMTString +
-    //       ";path=/;";
-    //   }
-    // },
-
-    //新增
-    HomepageJump() {
-      //重制判分点ID 当点击新增时清除
-      // this.setCookie("judgmentPointsId", "");
-      // console.log(this.getCookie("judgmentPointsId"));
-      // this.$router.push({ path: "/program" });
-      this.$router.push(`program?systemId=${this.systemId}&userId=${this.userId}`);
+    getProcessClassData(params) { // 获取流程类判分点列表数据
+      this.$post(`${this.api.queryAllJudgmentPoint}`, params).then(res => {
+        if (res.status === 200) {
+          this.tableData = res.message.records;
+          this.dataTotal = res.message.total;
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch(err => {
+        console.log(err);
+      });
     },
-    // 表头样式设置
-    headClass() {
-      return "text-align: center;";
+    getProgrammingClassData(params) { // 获取编程类判分点列表数据
+        this.$post(this.api.getBcJudgmentPoint, params).then(res => {
+          this.tableData = res.message.records;
+          this.dataTotal = res.message.total;
+        }).catch(err => {
+          console.log(err);
+        });
     },
-    // 表格样式设置
-    rowClass() {
-      return "text-align: center;";
+    HomepageJump() { //新增
+      if (this.systemId == 11) {
+        // 交易类
+        this.$router.push(`Transaction?isAdd=true&systemId=${this.systemId}`);
+      } else {
+        // 编程类
+        this.$router.push(`program?isAdd=true&systemId=${this.systemId}`);
+      }
     },
-
-    getCookie(cookie_name) {
-      //获取cookie中指定key的value
-      var allcookies = document.cookie; //索引长度，开始索引的位置
-      var cookie_pos = allcookies.indexOf(cookie_name); // 如果找到了索引，就代表cookie存在,否则不存在
-
-      if (cookie_pos != -1) {
-        // 把cookie_pos放在值的开始，只要给值加1即可
-        //计算取cookie值得开始索引，加的1为“=”
-        cookie_pos = cookie_pos + cookie_name.length + 1; //计算取cookie值得结束索引
-        var cookie_end = allcookies.indexOf(";", cookie_pos);
-
-        if (cookie_end == -1) {
-          cookie_end = allcookies.length;
-        } //得到想要的cookie的值
-        var value = unescape(allcookies.substring(cookie_pos, cookie_end));
+    handleEdit(row) { // 编辑
+      if (this.systemId == 11) {
+        // 交易类
+        this.$router.push(`Transaction?isEdit=true&systemId=${this.systemId}&lcId=${row.lcId}`);
+      } else {
+        // 编程类
+        this.$router.push(`program?isEdit=true&systemId=${this.systemId}&bcId=${row.bcId}`)
       }
-      return value;
     },
-    // 删除
-    getListDelete(res) {
-      this.$confirm("此操作将永久删除该内容, 是否继续?", "提示", {
+    handleDelete(row) { // 删除
+      this.$confirm(`此操作将永久删除【${row.name}】判分点, 是否继续?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
         center: true
-      })
-        .then(() => {
-          this.$post(this.api.DeletePointOfJudgement, {
-            judgmentPointsId: res.judgmentPointsId
-          })
-            .then(res => {
-              let totalPage = Math.ceil((this.dataTotal - 1) / this.pageSize);
-              let currentPage =
-                this.pageNo > totalPage ? totalPage : this.pageNo;
-              this.pageNo = currentPage < 1 ? 1 : currentPage;
-              this.handleCurrentChange(this.pageNo);
-            })
-            .catch(err => {
-              console.log(err);
-            });
-          this.$message({
-            type: "success",
-            message: "删除成功!"
+      }).then(() => {
+        if (this.systemId == 11) {
+          // 交易类
+          this.$post(`${this.api.deleteJudgmentPoint}?ids=${row.lcId}`).then(res => {
+            if (res.status === 200) {
+              this.$message.success("删除成功");
+              this.initData();
+            } else {
+              this.$message.error(res.message);
+            }
+          }).catch(err => {
+            console.log(err);
           });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除"
+        } else {
+          // 编程类
+          this.$post(`${this.api.bcDeleteJudgmentPoint}?ids=${row.bcId}`).then(res => {
+            if (res.status === 200) {
+              this.$message.success("删除成功");
+              this.initData();
+            } else {
+              this.$message.error(res.message);
+            }
+          }).catch(err => {
+            console.log(err);
           });
+        }
+      }).catch(() => {
+        this.$message.info("已取消删除");
+      });
+    },
+    changeSwitch(row) { // 更新是否启用
+      if (this.systemId == 11) {
+        // 交易类
+        this.$get(`${this.api.updateIsOpen}?isOpen=${row.isOpen}&lcId=${row.lcId}`).then(res => {
+          if (res.status === 200) {
+            this.$message.success("更新启用状态成功");
+            this.initData();
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch(err => {
+          console.log(err);
         });
+      } else {
+        // 编程类
+        this.$get(`${this.api.bcUpdateIsOpen}?isOpen=${row.isOpen}&bcId=${row.bcId}`).then(res => {
+          if (res.status === 200) {
+            this.$message.success("更新启用状态成功");
+            this.initData();
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch(err => {
+          console.log(err);
+        });
+      }
+    },
+
+    // 表头样式设置
+    headClass() {
+      return "text-align: center;";
+    },
+
+    // 表格样式设置
+    rowClass() {
+      return "text-align: center;";
     },
-    // 编辑
-    handleClick(res) {
-      this.$router.push(`program?judgmentPointsId=${res.judgmentPointsId}&systemId=${this.systemId}&userId=${this.userId}`)
-    }
   }
 };
 </script>
 
 <style lang="scss" scoped>
-/deep/.ql-toolbar{
+/deep/ .ql-toolbar {
   height: 0;
   padding: 0;
   border-bottom: 0;
 }
+
 //分页
 .footer /deep/ .el-pagination span:not([class*="suffix"]),
 .el-pagination button {
   font-size: 16px;
   margin-right: 30px;
 }
+
 .footer /deep/ .el-pagination {
   text-align: right;
   margin: 20px 0 0 0;
@@ -261,16 +276,19 @@ export default {
 /deep/ .el-button {
   line-height: 0;
 }
+
 .footer {
   background-color: #ffffff;
   margin-top: 10px;
   padding: 10px 20px 20px 20px;
 }
+
 .footer_h {
   position: relative;
   height: 50px;
   line-height: 50px;
 }
+
 .footer_h .black {
   width: 8px;
   height: 18px;
@@ -285,6 +303,7 @@ export default {
   font-weight: 600;
   margin: 0;
 }
+
 // 文本框
 .footer /deep/ .el-textarea__inner {
   height: 60px;
@@ -294,29 +313,35 @@ export default {
   font-size: 12px;
   border-radius: 5px;
 }
+
 .footer /deep/ .el-textarea__inner:hover {
   border: 1px solid #9278ff;
 }
+
 .footer /deep/ .el-table th.is-leaf,
 .el-table td {
   border-bottom: none;
 }
+
 .footer /deep/ .el-table--group::after,
 .el-table--border::after,
 .el-table::before {
   background: rgba(255, 255, 255, 1);
 }
+
 // 滚动条的宽度
 /deep/ ::-webkit-scrollbar {
   width: 6px; // 横向滚动条
   height: 6px; // 纵向滚动条 必写
 }
+
 // 滚动条的滑块
 /deep/ ::-webkit-scrollbar-thumb {
   background-color: #9278ff;
   border-radius: 3px;
   -webkit-box-shadow: inset 0 0 5px #dddddd;
 }
+
 /deep/ ::-webkit-scrollbar-track {
   /*滚动条里面轨道*/
   -webkit-box-shadow: inset 0 0 5px #dddddd;
@@ -327,26 +352,32 @@ export default {
 .footer /deep/ .el-card__body {
   padding: 0;
 }
+
 .footer /deep/ .el-card {
   border: none;
 }
+
 .footer /deep/ .el-table th {
   font-size: 14px;
   font-family: Microsoft YaHei;
   color: rgba(255, 255, 255, 1);
   background-color: #9278ff;
 }
+
 .footer /deep/ .el-table--striped .el-table__body tr.el-table__row--striped td {
   background-color: #f5f2ff;
 }
+
 .footer /deep/ .el-button--text {
   padding-right: 20px;
   color: #9278ff;
 }
+
 .footer /deep/ .el-button--text:focus,
 .el-button--text:hover {
   color: #9278ff;
 }
+
 .button {
   height: 30px;
   width: 80px;
@@ -358,14 +389,17 @@ export default {
   position: absolute;
   right: 30px;
 }
+
 .button:focus {
   outline: 0;
 }
+
 .header /deep/ [class*=" el-icon-"],
 [class^="el-icon-"] {
   line-height: 3;
   padding-left: 10px;
 }
+
 .header {
   background-color: #ffffff;
   height: 50px;
@@ -373,11 +407,13 @@ export default {
   line-height: 50px;
   font-weight: 600;
 }
+
 .header span {
   font-size: 16px;
   font-weight: 600;
   padding-left: 5px;
 }
+
 .header p {
   font-size: 14px;
   padding-left: 20px;
@@ -388,7 +424,8 @@ export default {
   display: flex;
   justify-content: flex-start;
 }
-.flex-end{
+
+.flex-end {
   display: flex;
   justify-content: flex-end;
 }
diff --git a/src/views/List.vue b/src/views/List.vue
index 23a18fc..4495e84 100644
--- a/src/views/List.vue
+++ b/src/views/List.vue
@@ -221,7 +221,10 @@ export default {
     },
     // 编辑
     handleClick(res) {
-      if(this.systemId == 2){
+      if (this.systemId == 11) {
+        // 银行综合系统
+        this.$router.push(`transaction?systemId=${this.systemId}&userId=${this.userId}&id=${res.id}`);
+      } else if(this.systemId == 2){
         this.$router.push(`programOption?systemId=${this.systemId}&userId=${this.userId}&id=${res.id}`);
       }else{
         this.$router.push(`programOptions?systemId=${this.systemId}&userId=${this.userId}&id=${res.id}&pattern=${this.pattern}`);
diff --git a/src/views/Program.vue b/src/views/Program.vue
index 59892c3..e027e1f 100644
--- a/src/views/Program.vue
+++ b/src/views/Program.vue
@@ -1,665 +1,541 @@
 <template>
-    <!-- 编程类 -->
-    <div class="content">
-        <div class="header flex">
-            <i class="el-icon-arrow-left"
-               @click="Back()"
-               style="cursor:pointer">
-                <span>Back</span>
-            </i>
-
-            <p>判分点设置</p>
-            <el-button type="primary"
-                       @click="Savejump('ruleForm')">保存</el-button>
+  <!-- 编程类 -->
+  <div class="content">
+    <div class="header">
+      <div>
+        <i class="back el-icon-arrow-left" @click="Back()" style="cursor:pointer">
+          <span>Back</span>
+        </i>
+        <span class="title">判分点设置</span>
+      </div>
+      <div>
+        <el-button v-if="!isView" type="primary" size="mini" @click="saveAll">保存</el-button>
+      </div>
+    </div>
+
+    <!--基本信息-->
+    <div>
+      <div class="form-con">
+        <div class="title">
+          <div class="black"></div>
+          <div>基本信息</div>
+        </div>
+        <div class="item">
+          <div class="label">判分点名称</div>
+          <el-input
+              v-model.trim="formData.points.name"
+              @blur="handleBlur"
+              placeholder="请输入内容"
+              clearable
+              style="width: 400px"
+          ></el-input>
         </div>
-        <div class="footer">
-            <div>
-                <div class="flex footer_h">
-                    <div class="black"></div>
-                    <p>基本信息</p>
-                </div>
-
-                <el-form :model="ruleForm"
-                         :rules="rules"
-                         ref="ruleForm"
-                         label-width="150px">
-                    <el-form-item label="请输入判分点名称"
-                                  prop="judgmentPointsName">
-                        <el-input v-model="ruleForm.judgmentPointsName" @change="nameChange"></el-input>
-                    </el-form-item>
-                    <el-form-item label="实验要求" prop="experimentalRequirements">
-                        <quill :toref="'editor1'" :border="true" v-model="ruleForm.experimentalRequirements" :minHeight="150" :height="150" />
-                    </el-form-item>
-                </el-form>
-
-                <div class="flex footer_b">
-                    <div class="black"></div>
-                    <p>实验代码</p>
-                </div>
-
-                <div class="footer_inputs1">
-                    <p style=" text-align: center;">参考答案</p>
-                    <div style="padding: 10px 50px">
-                        <quill1 :toref="'editor2'" :border="true" v-model="ruleForm.experimentcode" :minHeight="300" :height="300" />
-                        <!-- <textarea id="memo1"
-                              v-model="ruleForm.experimentcode"
-                              style="outline:none;"></textarea> -->
-                    </div>
-                </div>
-
-                <div class="flex footer_b">
-                    <div class="black"></div>
-                    <p>判分规则</p>
-                    <el-button type="primary"
-                               :disabled="isAdd"
-                               @click="AddListRow()">新增</el-button>
-                </div>
-            </div>
-
-            <el-row>
-                <el-col :span="24">
-                    <el-card shadow="hover">
-                        <el-table :data="tableData"
-                                  :stripe="true"
-                                  :cell-style="rowClass"
-                                  :header-cell-style="headClass"
-                                  header-align="center"
-                                  ref="editTable">
-                            <el-table-column prop="decisionPointRule"
-                                             type="index"
-                                             label="序号"
-                                             align="center"
-                                             width="80"></el-table-column>
-                            <el-table-column label="编译器中正确答案"
-                                             align="center">
-                                <template slot-scope="scope">
-                                    <p class="p">字段一致性规则：用户编辑器中至少出现如下语句</p>
-                                    <el-input type="textarea"
-                                              :rows="2"
-                                              v-model="scope.row.judgmentRulesRule"
-                                              :disabled="scope.row.isShow"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column align="center"
-                                             width="150">
-                                <template slot-scope="scope">
-                                    <el-button type="primary"
-                                               :disabled="scope.row.isShow"
-                                               style="cursor:pointer;border-radius: 50%;"
-                                               circle
-                                               @click="getPerhaps(scope.row)">{{scope.row.perhaps==0?"且":"或"}}</el-button>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="终端中正确答案"
-                                             align="center">
-                                <template slot-scope="scope">
-                                    <p class="p">运行结果一致性规则：用户运行结果需要与下方代码运行结果一致</p>
-                                    <el-input type="textarea"
-                                              :rows="2"
-                                              v-model="scope.row.judgmentRulesPoint"
-                                              :disabled="scope.row.isShow"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作"
-                                             align="center"
-                                             width="300">
-                                <template slot-scope="scope">
-                                    <el-link size="mini"
-                                             type="primary"
-                                             :underline="false"
-                                             v-show="scope.row.isShow"
-                                             @click="getHandleEdit(scope.row)">编辑</el-link>
-                                    <el-link type="primary"
-                                             size="mini"
-                                             :underline="false"
-                                             v-show="!scope.row.isShow"
-                                             @click="getRule(scope.row)">保存</el-link>
-                                    <el-link size="mini"
-                                             type="primary"
-                                             :underline="false"
-                                             v-show="!scope.row.isShow"
-                                             @click="dialogFormVisible(scope.$index,scope.row)">取消</el-link>
-                                    <el-link size="mini"
-                                             type="primary"
-                                             :underline="false"
-                                             v-show="!scope.row.isShow"
-                                             @click="getRuleDelete(scope.$index,scope.row)">删除</el-link>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </el-card>
-                </el-col>
-            </el-row>
+        <div class="item">
+          <div class="label">实验要求</div>
+          <quill :border="true" v-model="formData.points.experimentalRequirements" :minHeight="150" :height="150"/>
+        </div>
+      </div>
+
+      <!--实验代码-->
+      <div class="form-con">
+        <div class="title">
+          <div class="black"></div>
+          <div>实验代码</div>
         </div>
+        <p style=" text-align: center;">参考答案</p>
+        <div>
+          <quill :border="true" v-model="formData.points.experimentCode" :minHeight="300" :height="300"/>
+        </div>
+      </div>
+
+      <!--判分规则-->
+      <div class="rule-con">
+        <div class="title-con">
+          <div class="title">
+            <div class="black"></div>
+            <div>判分规则</div>
+          </div>
+          <div>
+            <el-button v-if="!isView" :disabled="isAddRule" type="primary" size="mini" @click="addRule">新增</el-button>
+          </div>
+        </div>
+
+        <el-card shadow="hover">
+          <el-table
+              :data="tableData"
+              :stripe="true"
+              :cell-style="rowClass"
+              header-align="center"
+              :header-cell-style="headClass"
+          >
+            <el-table-column prop="id" type="index" label="序号" width="80"></el-table-column>
+            <el-table-column label="编译器中正确答案" align="center">
+              <template slot-scope="scope">
+                <p class="p">字段一致性规则：用户编辑器中至少出现如下语句</p>
+                <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-model="scope.row.required"
+                    :disabled="isView || scope.row.isDisabled"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label=" " width="150">
+              <template slot-scope="scope">
+                <el-button
+                    :disabled="isView || scope.row.isDisabled"
+                    type="primary" circle
+                    @click="changeResult(scope.row)"
+                    style="position: absolute; right: 55px"
+                >
+                  {{ scope.row.withOr === 0 ? '且' : '或' }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="终端中正确答案" align="center">
+              <template slot-scope="scope">
+                <p class="p">运行结果一致性规则：用户运行结果需要与下方代码运行结果一致</p>
+                <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-model="scope.row.result"
+                    :disabled="isView || scope.row.isDisabled"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="300" v-if="!isView">
+              <template slot-scope="scope">
+                <el-button v-if="!scope.row.isSave" size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.isSave" size="mini" type="text" @click="handleSave(scope.row)">保存</el-button>
+                <el-button v-if="scope.row.isSave" size="mini" type="text" @click="handleCancel(scope.$index)">取消</el-button>
+                <el-button size="mini" type="text" @click="handleDelete(scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
 import quill from '@/components/quill'
-import quill1 from '@/components/quill'
+import {deepCopy} from '@/utils/deepCopy'
 export default {
-    data () {
-        return {
-            ruleForm: {
-                judgmentPointsName: "",
-                experimentalRequirements: "",
-                experimentcode: ""
-            },
-            tableData: [],
-            id: "",
-            rules: {
-                judgmentPointsName: [
-                    { required: true, message: "内容不能为空", trigger: "blur" }
-                ],
-                experimentalRequirements: [
-                    { required: true, message: "实验要求不能为空", trigger: "blur" }
-                ],
-                experimentcode: [
-                    { required: true, message: "参考答案不能为空", trigger: "blur" }
-                ]
-            },
-            decisionPointRule: "",
-            systemId: this.$route.query.systemId,
-            userId: this.$route.query.userId,
-            ruleIds: [],
-            jRP: "",
-            jRR: "",
-            isAdd: false,
-            originalName: '',
-            nameRepeat: false
+  components: {quill},
+  data() {
+    return {
+      isAdd: false, // 添加
+      isEdit: false, // 编辑
+      isView: false, // 查看
+      isNameRepeat: false, // 名称是否重复
+      formData: {
+        points: {
+          name: "",
+          experimentalRequirements: "",
+          experimentCode: "",
+          isDel: 0,
+          isOpen: 0,
+          projectId: "",
+          systemId: ""
+        },
+        bcJudgmentRuleList: []
+      }, // 表单参数
+      tableData: [], // 规则表格数据
+      tableDataCopy: [], // 规则表格数据备份
+      isAddRule: false, // 是否可以新增规则
+    };
+  },
+  mounted() {
+    this.$route.query.token && this.$store.commit('setParam', {
+      token: atob(decodeURI(this.$route.query.token))
+    });
+    if (this.$route.query.isView) {
+      this.isView = true;
+    } else if (this.$route.query.isEdit) {
+      this.isEdit = true;
+    } else if (this.$route.query.isAdd) {
+      this.isAdd = true;
+    }
+    if (this.$route.query.bcId) {
+      this.getInfoData(this.$route.query.bcId);
+    }
+    if (this.$route.query.systemId) {
+      this.formData.points.systemId = this.$route.query.systemId;
+    }
+  },
+  methods: {
+    Back() { // 返回
+      this.$router.back();
+    },
+    getInfoData(bcId) { // 获取判分点详细信息
+      this.$get(`${this.api.queryBcJudgmentPointByBcId}?bcId=${bcId}`).then(res => {
+        if (res.status === 200) {
+          let {judgmentPoint, judgmentRule} = res;
+          this.formData = {
+            points: judgmentPoint,
+            bcJudgmentRuleList: judgmentRule
+          }
+          // 重新封装数据
+          judgmentRule.forEach((item, index) => {
+            this.tableData.push({ ...item, isSubject: true, isDisabled: true, isSave: false});
+          })
+        } else {
+          this.$message.warning(res.message);
+        }
+      }).catch(err => {
+        console.log(err)
+      });
+    },
+    handleBlur() { // 新增/编辑判分点名称判重
+      if (this.formData.points.name) {
+        let params = {
+          lcId: this.$route.query.lcId ? this.$route.query.lcId : "",
+          name: this.formData.points.name
+        }
+        this.$post(this.api.bcQueryNameIsExist, params).then(res => {
+          if (res.status === 200) {
+            this.isNameRepeat = false;
+          } else {
+            this.isNameRepeat = true;
+          }
+        }).catch(err => {
+          console.log(err)
+        });
+      }
+    },
+    saveAll() { // 保存判分点
+      if (!this.formData.points.name) {
+        this.$message.warning(`判分点名称不能为空`);
+        return;
+      }
+      if (this.isNameRepeat) {
+        this.$message.warning(`当前判分点名称已存在`);
+        return;
+      }
+      if (!this.formData.points.experimentalRequirements) {
+        this.$message.warning(`实验要求不能为空`);
+        return;
+      }
+      if (!this.formData.points.experimentCode) {
+        this.$message.warning(`实验代码不能为空`);
+        return;
+      }
+      if (!this.tableData.length) {
+        this.$message.warning(`请添加判分规则`);
+        return;
+      } else {
+        for (let i = 0; i < this.tableData.length; i++) {
+          if (!this.tableData[i].required) {
+            this.$message.warning(`第${i + 1}项，规则要求不能为空`);
+            return;
+          } else if (!this.tableData[i].result) {
+            this.$message.warning(`第${i + 1}项，规则结果不能为空`);
+            return;
+          } else if (this.tableData[i].isSave) {
+            this.$message.warning(`第${i + 1}项，未保存`);
+            return;
+          }
+        }
+      }
+      let tempArr = [];
+      this.tableData.forEach(i => {
+        let obj = {
+          id: i.id ? i.id : "",
+          bcId: i.bcId ? i.bcId : "",
+          required: i.required,
+          result: i.result,
+          withOr: i.withOr
         };
+        tempArr.push(obj)
+      });
+      this.formData.bcJudgmentRuleList = tempArr;
+      if (this.isAdd) { // 新增判分点
+        this.$post(this.api.addBcJudgmentPoint, this.formData).then(res => {
+          if (res.status === 200) {
+            this.$message.success("新增判分点成功");
+            this.Back();
+          } else {
+            this.$message.warning(res.message);
+          }
+        }).catch(err => {
+          console.log(err)
+        })
+      } else if (this.isEdit) { // 编辑判分点
+        this.$post(this.api.updateBcJudgmentPoint, this.formData).then(res => {
+          if (res.status === 200) {
+            this.$message.success("更新判分点成功");
+            this.Back();
+          } else {
+            this.$message.warning(res.message);
+          }
+        }).catch(err => {
+          console.log(err)
+        })
+      }
+    },
+    addRule() { // 新增规则
+      this.isAddRule = true;
+      this.tableData.push({
+        isDisabled: true,
+        isSave: false,
+        required: "",
+        result: "",
+        withOr: 0
+      });
+    },
+    changeResult(row) { // （左右）结果运算符(0：且 1：或 默认0)
+      row.withOr = row.withOr === 0 ? 1 : 0;
+    },
+    handleEdit(row) { // 处理编辑规则
+      this.tableDataCopy = deepCopy(this.tableData); // 深拷贝
+      row.isDisabled = false;
+      row.isSave = true;
+    },
+    handleSave(row) { // 处理保存规则
+      if (!row.required) {
+        this.$message.warning(`规则要求不能为空`);
+        return;
+      }
+      if (!row.result) {
+        this.$message.warning(`规则结果不能为空`);
+        return;
+      }
+      row.isSave = false;
+      row.isDisabled = true;
+      this.isAddRule = false;
     },
-    components: {quill,quill1},
-    mounted () {
-        this.$route.query.token && this.$store.commit('setParam',{token: atob(decodeURI(this.$route.query.token)),referrer: atob(decodeURI(this.$route.query.referrer))})
-        this.getMesg();
+    handleCancel(index) { // 处理取消编辑规则
+      this.$set(this.tableData, index, this.tableDataCopy[index]);
     },
+    handleDelete(index) { // 处理删除规则
+      this.$confirm("此操作将永久删除该规则, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      }).then(() => {
+        this.tableData.splice(index, 1);
+        this.isAddRule = false;
+      }).catch(() => {})
+    },
+    // 表头样式设置
+    headClass() {
+      return "text-align: center;";
+    },
+    // 表格样式设置
+    rowClass() {
+      return "text-align: center;";
+    }
+  }
+};
+</script>
 
-    methods: {
-        //且或判断
-        getPerhaps (a) {
-            if (a.perhaps == 1) {
-                a.perhaps = "0";
-            } else {
-                a.perhaps = "1";
-            }
-        },
-        //判分点详细信息查询(通过首页编辑按钮)
-        getMesg () {
-            if (this.$route.query.judgmentPointsId) {
-                this.$get(this.api.QueryPfdInformation, {
-                    judgmentPointsId: this.$route.query.judgmentPointsId
-                })
-                    .then(res => {
-                        res.message.rules.map(e => {
-                            this.$set(e, "isQie", true);
-                            this.$set(e, "isShow", true);
-                        });
-                        this.ruleForm = {
-                            judgmentPointsName: res.message.point.judgmentPointsName,
-                            experimentalRequirements:
-                                res.message.point.experimentalRequirements,
-                            experimentcode: res.message.point.experimentcode
-                        };
-                        this.originalName = res.message.point.judgmentPointsName
-                        this.tableData = res.message.rules;
-                        let arr1 = this.tableData;
-                        let result1 = arr1.map(e => e.decisionPointRule);
-                        this.ruleIds = this.ruleIds.concat(result1);
-                        // this.decisionPointRule=res.message.rules[0].decisionPointRule;
-                    })
-                    .catch(err => { });
-            }
-        },
-        nameChange(){
-            if(this.ruleForm.judgmentPointsName !== this.originalName){
-                this.$get(`${this.api.JudgmentPointNameRepetition}?judgmentPointName=${this.ruleForm.judgmentPointsName}`).then(res => {
-                    this.nameRepeat = false
-                }).catch(res => {
-                    this.nameRepeat = true
-                })
-            }else{
-                this.nameRepeat = false
-            }
-        },
-        //保存
-        Savejump (formName) {
-            if (this.ruleIds != "") {
-                this.$refs[formName].validate(valid => {
-                    if (valid) {
-                        if(this.nameRepeat) return this.$message.error('当前判分点名称已存在!')
-                        if (this.$route.query.judgmentPointsId) {
-                            // 编辑判分点基本信息
-                            this.$post(this.api.UpdatePointOfJudgement, {
-                                points: {
-                                    experimentalRequirements: this.ruleForm
-                                        .experimentalRequirements,
-                                    judgmentPointsName: this.ruleForm.judgmentPointsName,
-                                    experimentcode: this.ruleForm.experimentcode,
-                                    judgmentPointsId: this.$route.query.judgmentPointsId
-                                },
-                                ruleIds: this.ruleIds
-                            })
-                                .then(res => {
-                                    this.$router.back()
-                                })
-                                .catch(err => {
-                                    console.log(err);
-                                });
-                        } else {
-                            // 新增判分点基本信息
-                            this.$post(this.api.AddPfdInformation, {
-                                points: {
-                                    experimentalRequirements: this.ruleForm
-                                        .experimentalRequirements,
-                                    judgmentPointsName: this.ruleForm.judgmentPointsName,
-                                    experimentcode: this.ruleForm.experimentcode,
-                                    judgmentPointsType: 1,
-                                      systemId: this.systemId,
-                                      userId: this.userId,
-                                    // systemId: 1,
-                                    // userId: 4
-                                },
-                                ruleIds: this.ruleIds
-                            })
-                                .then(res => {
-                                    this.$router.back()
-                                })
-                                .catch(err => {
-                                    console.log(err);
-                                });
-                        }
-                    } else {
-                        console.log("error submit!!");
-                        return false;
-                    }
-                });
-            } else {
-                this.$message.error("错了哦，判分规则不能为空");
-            }
-        },
-        getCookie (cookie_name) {
-            //获取cookie中指定key的value
-            var allcookies = document.cookie; //索引长度，开始索引的位置
-            var cookie_pos = allcookies.indexOf(cookie_name); // 如果找到了索引，就代表cookie存在,否则不存在
-
-            if (cookie_pos != -1) {
-                // 把cookie_pos放在值的开始，只要给值加1即可
-                //计算取cookie值得开始索引，加的1为“=”
-                cookie_pos = cookie_pos + cookie_name.length + 1; //计算取cookie值得结束索引
-                var cookie_end = allcookies.indexOf(";", cookie_pos);
-
-                if (cookie_end == -1) {
-                    cookie_end = allcookies.length;
-                } //得到想要的cookie的值
-                var value = unescape(allcookies.substring(cookie_pos, cookie_end));
-            }
-            return value;
-        },
-        Back () {
-            this.$router.back()
-        },
+<style lang="scss" scoped>
+.content {
+  position: relative;
+  top: 10px;
+  padding: 0 10px;
+  background-color: #ffffff;
 
-        // 表头样式设置
-        headClass () {
-            return "text-align: center;";
-        },
+  .header {
+    border-bottom: 1px dashed #ccc;
+    height: 45px;
+    line-height: 45px;
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
 
-        // 表格样式设置
-        rowClass () {
-            return "text-align: center;";
-        },
-        // 编辑判分点规则 保存按钮
-        getRule (row) {
-            if (!row.judgmentRulesRule && !row.judgmentRulesPoint) {
-                this.$message({
-                    showClose: true,
-                    message: "内容不能为空",
-                    type: "warning"
-                });
-            } else {
-                if (row.decisionPointRule) {
-                    this.$post(this.api.UpdatePointOfJudgementRule, {
-                        judgmentRulesRule: row.judgmentRulesRule,
-                        judgmentRulesPoint: row.judgmentRulesPoint,
-                        perhaps: String(row.perhaps),
-                        decisionPointRule: row.decisionPointRule
-                    })
-                        .then(res => {
-                            this.isAdd = false;
-                            row.isShow = true;
-                            this.getContent();
-                        })
-                        .catch(err => {
-                            console.log(err);
-                        });
-                } else {
-                    //新增判分规则
-                    this.$post(this.api.AddPfdgzInformation, {
-                        judgmentRulesRule: row.judgmentRulesRule,
-                        judgmentRulesPoint: row.judgmentRulesPoint,
-                        perhaps: String(row.perhaps)
-                    })
-                        .then(s => {
-                            this.isAdd = false;
-                            row.isShow = true;
-                            this.id = s.message;
-                            this.ruleIds.push(this.id);
-                            console.log(this.ruleIds);
-                            this.getContent();
-                        })
-                        .catch(err => {
-                            console.log(err);
-                        });
-                }
-            }
-        },
+    .back {
+      line-height: 3;
+      padding-left: 10px;
 
-        //取消
-        dialogFormVisible (index, row) {
-            this.isAdd = false;
-            if (!row.decisionPointRule) {
-                this.tableData.splice(index, 1);
-            } else {
-                if (!row.judgmentRulesRule && !row.judgmentRulesPoint) {
-                    this.$message({
-                        showClose: true,
-                        message: "内容不能为空",
-                        type: "warning"
-                    });
-                } else {
-                    row.isShow = true;
-                    row.judgmentRulesRule = this.jRR;
-                    row.judgmentRulesPoint = this.jRP;
-                }
-            }
-        },
-        //编辑
-        getHandleEdit (row) {
-            this.isAdd = true;
-            row.isShow = false;
-            this.jRR = row.judgmentRulesRule;
-            this.jRP = row.judgmentRulesPoint;
-        },
-        //删除
-        getRuleDelete (index, row) {
-            if (!row.decisionPointRule) {
-                this.tableData.splice(index, 1);
-                this.isAdd = false;
-            } else {
-                this.$confirm("此操作将永久删除该内容, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                    center: true
-                })
-                    .then(() => {
-                        this.$post(this.api.DeletePointOfJudgementRule, {
-                            decisionPointRule: row.decisionPointRule
-                        })
-                            .then(res => {
-                                this.getContent();
-                                this.isAdd = false;
-                            })
-                            .catch(err => {
-                                console.log(err);
-                            });
-                        this.$message({
-                            type: "success",
-                            message: "删除成功!"
-                        });
-                    })
-                    .catch(() => {
-                        this.$message({
-                            type: "info",
-                            message: "已取消删除"
-                        });
-                    });
-            }
-        },
-        // 判分点规则信息查询
-        getContent () {
-            this.$get(this.api.QueryPfdgzInformation, {
-                ruleIds: this.ruleIds.join()
-            })
-                .then(s => {
-                    s.message.map(e => {
-                        this.$set(e, "isQie", true);
-                        this.$set(e, "isShow", true);
-                    });
-                    this.tableData = s.message;
-                    this.decisionPointRule = s.message[0].decisionPointRule;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
+      span {
+        font-size: 14px;
+        font-weight: 600;
+        padding-left: 5px;
+      }
+    }
 
-        //点击新增添加一行数据
-        AddListRow () {
-            this.isAdd = true;
-            this.tableData.push({
-                decisionPointRule: "",
-                judgmentRulesRule: "",
-                isQie: true,
-                isShow: false,
-                judgmentRulesPoint: "",
-                perhaps: "0"
-            });
-            this.$nextTick(() => {
-                this.scrollToTop();
-            });
-        },
-        scrollToTop () {
-            const c =
-                document.documentElement.scrollHeight || document.body.scrollHeight;
-            window.scrollTo(0, c);
-        }
+    .title {
+      font-weight: bold;
+      margin-left: 20px;
     }
-};
-</script>
+  }
 
-<style lang="scss" scoped>
-// 后面修改的样式
-/deep/ .el-link.el-link--primary {
-    padding-right: 10px;
-}
-/deep/ .el-button {
-    line-height: 0;
-    height: 30px;
-    width: 80px;
-    margin-top: 7px;
-    border-radius: 20px;
-    position: absolute;
-    right: 30px;
-}
+  // 表单容器
+  .form-con {
+    padding-bottom: 24px;
+    border-bottom: 1px dashed #ccc;
 
-/deep/ .el-input__inner {
-    border: 1px solid #9278ff;
-}
-/deep/ .el-form-item {
-    margin-top: 15px;
-}
-// 第二部分
-/deep/ .el-button--text {
-    color: #9278ff;
-}
-/deep/ .el-button--text:focus,
-.el-button--text:hover {
-    color: #9278ff;
-}
-.border {
-    width: 50px;
-    height: 50px;
-    border: 1px solid #9278ff;
-    border-radius: 50%;
-    margin: auto;
-}
-.p {
-    font-size: 12px;
-    font-weight: 600;
-}
-// 文本框
-/deep/ .el-textarea__inner {
-    height: 145px;
-    width: 650px;
-    resize: none;
-    border: 1px solid #9278ff;
-    font-size: 12px;
-    border-radius: 5px;
-}
-/deep/ .el-textarea__inner:hover {
-    border: 1px solid #9278ff;
+    .title {
+      padding: 10px 0;
+      //border-bottom: 1px dashed #ccc;
+      display: flex;
+
+      .black {
+        width: 8px;
+        height: 18px;
+        background-color: #333;
+        margin-right: 10px;
+      }
+    }
+
+    .item {
+      display: flex;
+      margin-top: 24px;
+
+      .label {
+        width: 200px;
+        text-align: right;
+        padding-right: 20px;
+        line-height: 35px;
+      }
+    }
+  }
+
+  // 规则容器
+  .rule-con {
+    padding-bottom: 60px;
+
+    .title-con {
+      height: 60px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .title {
+        display: flex;
+
+        .black {
+          width: 8px;
+          height: 18px;
+          background-color: #333;
+          margin-right: 10px;
+        }
+      }
+    }
+
+  }
 }
 
 // 滚动条的宽度
 /deep/ ::-webkit-scrollbar {
-    width: 6px; // 横向滚动条
-    height: 6px; // 纵向滚动条 必写
+  width: 6px; // 横向滚动条
+  height: 6px; // 纵向滚动条 必写
 }
+
 // 滚动条的滑块
 /deep/ ::-webkit-scrollbar-thumb {
-    background-color: #9278ff;
-    border-radius: 3px;
-    -webkit-box-shadow: inset 0 0 5px #dddddd;
+  background-color: #9278ff;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 0 5px #dddddd;
 }
+
 /deep/ ::-webkit-scrollbar-track {
-    /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px #dddddd;
-    border-radius: 0;
-    background: #dddddd;
-}
-/deep/ .el-row {
-    padding: 0 20px;
-    margin-bottom: 60px;
-}
-/deep/ .el-card__body {
-    padding: 0;
-}
-/deep/ .el-card {
-    border: none;
+  /*滚动条里面轨道*/
+  -webkit-box-shadow: inset 0 0 5px #dddddd;
+  border-radius: 0;
+  background: #dddddd;
+}
+.tree-con{
+  height: 230px;
+  position: relative;
+  .mask{
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    cursor:not-allowed;
+    z-index: 99999;
+  }
 }
 
-/deep/ .el-table th {
-    font-size: 14px;
-    font-family: Microsoft YaHei;
-    color: rgba(255, 255, 255, 1);
-    background-color: #9278ff;
-}
-/deep/ .el-table td,
-.el-table th {
-    padding-top: 0;
-}
-.footer_b p {
-    margin: 0;
-    padding-left: 10px;
-    font-size: 14px;
-}
-.footer_b {
-    padding: 10px 0;
-    border-top: 1px dashed #cccccc;
-    margin: 0 15px;
-    height: 45px;
-    line-height: 45px;
+@mixin block {
+  padding: 10px;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
 }
 
-// 第一部分
-
-#memo {
-    margin-left: 10px;
-    height: 200px;
-    width: 800px;
-    resize: none;
-    border: 1px solid #9278ff;
-    font-size: 12px;
-    border-radius: 5px;
-}
-#memo1 {
-    height: 300px;
-    width: 1700px;
-    resize: none;
-    border: 1px solid #9278ff;
-    font-size: 12px;
-    border-radius: 5px;
-    padding: 10px 20px;
-}
-/deep/ .el-input--suffix .el-input__inner {
-    border: 1px solid #9278ff;
-}
-.footer_input p {
-    font-size: 12px;
-    padding-right: 20px;
-}
-.footer_input {
-    padding: 30px 0 20px 80px;
-}
-.footer_inputs {
-    padding: 30px 0 20px 80px;
-}
-.footer_inputs1 {
-    padding-bottom: 50px;
-    text-align: center;
-}
-.footer_inputs1 p {
-    margin: 0 0 15px 0;
-    font-size: 14px;
-}
-.footer_inputs p {
-    font-size: 12px;
-    padding-right: 20px;
-}
-/deep/ .el-input {
-    width: 30%;
-}
-/deep/ [class*=" el-icon-"],
-[class^="el-icon-"] {
-    line-height: 3;
-    padding-left: 10px;
-}
-.header {
-    background-color: #ffffff;
-    height: 45px;
-    line-height: 45px;
-    font-size: 14px;
-    font-weight: 600;
-    position: relative;
-}
-.header span {
-    font-size: 14px;
-    font-weight: 600;
-    padding-left: 5px;
-}
-.header p {
-    padding-left: 20px;
-    margin: 0;
-}
-.footer_h {
-    border-top: 1px dashed #cccccc;
-    border-bottom: 1px dashed #cccccc;
-    margin: 0 15px;
-    height: 45px;
-    line-height: 45px;
-}
-.flex {
+.block {
+  @include block;
+  height: 230px;
+  background-color: #fff;
+  overflow: auto;
+  .line {
     display: flex;
-    justify-content: flex-start;
-}
-.footer {
-    background-color: #ffffff;
-}
-.footer_h p {
-    padding-left: 10px;
-    font-size: 14px;
-    margin: 0;
-}
-.black {
-    width: 8px;
-    height: 18px;
-    background-color: #333;
-    margin-top: 10px;
-}
-.content {
-    position: relative;
-    top: 10px;
+    align-items: center;
+    margin: 10px 0;
+
+    .label {
+      width: 100px;
+      margin-right: 10px;
+      text-align: right;
+      font-size: 12px;
+
+      &.mini {
+        width: auto;
+      }
+    }
+
+    .action {
+      flex: 1;
+      text-align: left;
+
+      /deep/ .el-input {
+        width: 100%;
+      }
+
+      &.steps {
+        @include block;
+        display: inline-flex;
+        flex-direction: column;
+        height: 150px;
+        font-size: 12px;
+        overflow: auto;
+
+        .radio-wrap {
+          display: flex;
+          flex-direction: column;
+
+          .child {
+            display: flex;
+            flex-direction: column;
+            margin-left: 15px;
+          }
+
+          /deep/ .el-radio {
+            margin: 3px 0;
+          }
+        }
+      }
+
+      .inputs {
+        display: flex;
+        align-items: center;
+
+        /deep/ .el-input {
+          width: 100px;
+          margin: 0 5px;
+
+          &:first-child {
+            margin-left: 0;
+          }
+        }
+      }
+
+      &.a-line {
+        display: inline-flex;
+      }
+
+      .mini-textarea,
+      /deep/ .mini-textarea .el-textarea__inner {
+        width: 100%;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/ProgramOptions.vue b/src/views/ProgramOptions.vue
index 730405f..b8d3061 100644
--- a/src/views/ProgramOptions.vue
+++ b/src/views/ProgramOptions.vue
@@ -713,7 +713,7 @@ export default {
                 })
                 .catch((err) => {})
             })
-            .catch(() => {})
+
         }
     },
     AddListRow() {
diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue
index 716fe34..5ac318d 100644
--- a/src/views/Transaction.vue
+++ b/src/views/Transaction.vue
@@ -1,295 +1,669 @@
 <template>
   <!-- 交易类 -->
   <div class="content">
-    <div class="header flex">
-      <i class="el-icon-arrow-left" @click="Back()" style="cursor:pointer">
-        <span>Back</span>
-      </i>
-      <p>判分点设置</p>
-      <button class="button" @click="Savejump()">保存</button>
-    </div>
-    <div class="footer">
+    <div class="header">
+      <div>
+        <i class="back el-icon-arrow-left" @click="Back()" style="cursor:pointer">
+          <span>Back</span>
+        </i>
+        <span class="title">判分点设置</span>
+      </div>
       <div>
-        <div class="flex footer_h">
+        <el-button v-if="!isView" type="primary" size="mini" @click="saveAll">保存</el-button>
+      </div>
+    </div>
+
+    <div>
+      <div class="form-con">
+        <div class="title">
           <div class="black"></div>
-          <p>基本信息</p>
+          <div>基本信息</div>
         </div>
-        <div class="flex footer_input">
-          <p>判分点名称</p>
-          <el-input placeholder="请输入内容" v-model="input" clearable></el-input>
+        <div class="item">
+          <div class="label">判分点名称</div>
+          <el-input
+              v-model.trim="formData.lcJudgmentPoint.name"
+              @blur="handleBlur"
+              placeholder="请输入内容"
+              clearable
+              style="width: 400px"
+          ></el-input>
         </div>
-        <div class="flex footer_inputs">
-          <p>实验要求</p>
-          <textarea id="memo" style="outline:none;"></textarea>
+        <div class="item">
+          <div class="label">实验要求</div>
+          <quill :border="true" v-model="formData.lcJudgmentPoint.experimentalRequirements" :minHeight="150"
+                 :height="150"/>
         </div>
       </div>
-      <div class="flex footer_b">
-        <div class="black"></div>
-        <p>判分规则</p>
-        <button class="button">新增</button>
-      </div>
 
-      <el-row>
-        <el-col :span="24">
-          <el-card shadow="hover">
-            <el-table
+      <div class="rule-con">
+        <div class="title-con">
+          <div class="title">
+            <div class="black"></div>
+            <div>判分规则</div>
+          </div>
+          <div>
+            <el-button v-if="!isView" :disabled="isAddRule" type="primary" size="mini" @click="addRule">新增</el-button>
+          </div>
+        </div>
+
+        <el-card shadow="hover">
+          <el-table
               :data="tableData"
               :stripe="true"
               :cell-style="rowClass"
               header-align="center"
               :header-cell-style="headClass"
-              :row-class-name="tableRowClassName"
-            >
-              <el-table-column prop="id" type="index" label="序号" width="80"></el-table-column>
-              <el-table-column label="流程判分正确答案">
-                <template slot-scope="scope">
-                  <p class="p">操作一致性规则：用户完成的功能操作与下方设置的操作点一致</p>
-                  <div class="box">
-                    <div class="flex box_p">
-                      <p>一级栏目</p>
-                      <el-select v-model="value1" clearable placeholder="币币交易">
-                        <el-option
-                          v-for="item in options1"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        ></el-option>
-                      </el-select>
+          >
+            <el-table-column prop="id" type="index" label="序号" width="80"></el-table-column>
+            <el-table-column label="流程判分正确答案">
+              <template slot-scope="scope" v-if="scope.row.isSubject">
+                <p class="p">操作一致性规则：用户完成的功能操作与下方设置的操作点一致</p>
+                <div class="tree-con">
+                  <div class="block">
+                    <el-tree
+                        class="action"
+                        :ref="'tree-'+scope.$index"
+                        :data="treeData"
+                        :props="defaultProps"
+                        default-expand-all
+                        node-key="id"
+                        show-checkbox
+                        @check-change="(data, checked, indeterminate) => {
+                          handleCheckChange(data, checked, indeterminate, scope.row, scope.$index);
+                        }"
+                    ></el-tree>
+                  </div>
+                  <div v-show="scope.row.isDisabled" class="mask"></div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label=" " width="150">
+              <template slot-scope="scope">
+                <el-button
+                    circle
+                    type="primary"
+                    v-if="scope.row.isSubject"
+                    :disabled="isView || scope.row.isDisabled"
+                    @click="changeResult(scope.row)"
+                    style="position: absolute; right: 55px"
+                >
+                  {{ scope.row.resultOperation === 0 ? '且' : '或' }}
+                </el-button>
+                <el-button v-else type="primary" circle @click="changeRule(scope.row, scope.$index)">
+                  {{ scope.row.ruleOperation === 0 ? '且' : '或' }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="交易结果正确答案">
+              <template slot-scope="scope" v-if="scope.row.isSubject">
+                <p class="p">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p>
+                <div class="block">
+                  <!-- type: 题目类型(1选择 2判断 3填空 4问答 5指标结果) -->
+                  <template v-if="scope.row.type == 1">
+                    <div class="line">
+                      <span class="label" style="width: auto;text-align: left">{{ scope.row.name }}</span>
                     </div>
-                    <div class="flex box_p">
-                      <p>二级栏目</p>
-                      <el-select v-model="value2" clearable placeholder="限价交易">
-                        <el-option
-                          v-for="item in options2"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        ></el-option>
-                      </el-select>
+                    <div class="line">
+                      <span class="label mini">正确答案</span>
+                      <div class="action">
+                        <!--multiple:多选-->
+                        <el-select
+                            v-model="scope.row.value1"
+                            :disabled="isView || scope.row.isDisabled"
+                            size="mini"
+                            style="width: 100%"
+                        >
+                          <el-option
+                              v-for="(item, index) in scope.row.items"
+                              :key="index"
+                              :label="item.options"
+                              :value="item.itemId"
+                          ></el-option>
+                        </el-select>
+                      </div>
                     </div>
-                    <div class="flex box_p">
-                      <p>操作按钮</p>
-                      <el-select v-model="value3" clearable placeholder="买入BTC">
-                        <el-option
-                          v-for="item in options3"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        ></el-option>
-                      </el-select>
+                  </template>
+
+                  <template v-if="scope.row.type == 2">
+                    <div class="line">
+                      <span class="label" style="width: auto;text-align: left">{{ scope.row.name }}</span>
                     </div>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column label=" " width="150">
-                <template slot-scope="scope">
-                  <div class="border">
-                    <p v-show="scope.row.isQie" @click="getQie(scope.row)" style="cursor:pointer">且</p>
-                    <p v-show="!scope.row.isQie" @click="getHuo(scope.row)" style="cursor:pointer">或</p>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column label="交易结果正确答案">
-                <template slot-scope="scope">
-                  <p class="p">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p>
-                  <div class="box">
-                    <div class="flex box_p">
-                      <p>指标类别</p>
-                      <el-select v-model="value4" clearable placeholder="交易结果指标">
-                        <el-option
-                          v-for="item in values1"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        ></el-option>
-                      </el-select>
+                    <div class="line">
+                      <span class="label mini">正确答案</span>
+                      <div class="action">
+                        <el-select
+                            v-model="scope.row.value1"
+                            :disabled="isView || scope.row.isDisabled"
+                            size="mini"
+                            style="width: 100%"
+                        >
+                          <el-option
+                              v-for="(item, index) in scope.row.items"
+                              :key="index"
+                              :label="item.options"
+                              :value="item.itemId"
+                          ></el-option>
+                        </el-select>
+                      </div>
                     </div>
-                    <div class="flex box_p">
-                      <p>交易指标</p>
-                      <el-select v-model="value5" clearable placeholder="BTC买入量">
-                        <el-option
-                          v-for="item in values2"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        ></el-option>
-                      </el-select>
+                  </template>
+
+                  <template v-if="scope.row.type == 3">
+                    <div class="line">
+                        <span class="label">
+                          <el-checkbox v-model="scope.row.fieldOfReq" :disabled="isView || scope.row.isDisabled">字段要求</el-checkbox>
+                        </span>
+                      <div class="action">
+                        <el-input
+                            class="mini-textarea"
+                            type="textarea"
+                            rows="6"
+                            size="mini"
+                            v-model.trim="scope.row.value1"
+                            :disabled="isView || scope.row.isDisabled"
+                        ></el-input>
+                      </div>
                     </div>
-                    <div class="flex box_p box_right" style="padding-left: 30px;">
-                      <p>交易结果区间</p>
-                      <el-select v-model="value6" clearable placeholder="(">
-                        <el-option
-                          v-for="item in values3"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        ></el-option>
-                      </el-select>
-                      <el-input
-                        placeholder="100"
-                        style="width:80px;margin:8px 10px 0 10px;"
-                        v-model="input1"
-                        clearable
-                      ></el-input>
-                      <el-input
-                        placeholder="100"
-                        v-model="input2"
-                        style="width:80px;margin:8px 10px 0 0;"
-                        clearable
-                      ></el-input>
-                      <el-select v-model="value7" clearable placeholder=")">
-                        <el-option
-                          v-for="item in values4"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        ></el-option>
-                      </el-select>
+                  </template>
+
+                  <template v-if="scope.row.type == 4">
+                    <div class="line">
+                        <span class="label">
+                          <el-checkbox v-model="scope.row.numOfWords" :disabled="isView || scope.row.isDisabled">字数要求</el-checkbox>
+                        </span>
+                      <div class="action a-line">
+                        <el-select
+                            v-model="scope.row.value1"
+                            :disabled="isView || scope.row.isDisabled"
+                            size="mini"
+                        >
+                          <el-option label=">" value=">"></el-option>
+                          <el-option label="<" value="<"></el-option>
+                          <el-option label="=" value="="></el-option>
+                          <el-option label=">=" value=">="></el-option>
+                          <el-option label="<=" value="<="></el-option>
+                          <el-option label="无限制" value="无限制"></el-option>
+                        </el-select>
+                        <el-input
+                            class="number-input"
+                            v-model.trim="scope.row.value2"
+                            :disabled="isView || scope.row.isDisabled"
+                            type="number"
+                            min="1"
+                            size="mini"
+                            style="margin-left: 5px;"
+                        ></el-input>
+                      </div>
                     </div>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" width="300">
-                <template slot-scope="scope">
-                  <el-button size="mini" type="text" v-show="isShow" @click="handleEdit()">编辑</el-button>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    v-show="!isShow"
-                    @click="addTab(scope.$index, scope.row)"
-                  >保存</el-button>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    v-show="!isShow"
-                    @click="dialogFormVisible()"
-                  >取消</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-card>
-        </el-col>
-      </el-row>
+                    <div class="line">
+                        <span class="label">
+                          <el-checkbox v-model="scope.row.fieldOfReq" :disabled="isView || scope.row.isDisabled">字段要求</el-checkbox>
+                        </span>
+                      <div class="action">
+                        <el-input
+                            class="mini-textarea"
+                            type="textarea"
+                            rows="5"
+                            size="mini"
+                            v-model.trim="scope.row.value3"
+                            :disabled="isView || scope.row.isDisabled"
+                        ></el-input>
+                      </div>
+                    </div>
+                  </template>
+
+                  <template v-if="scope.row.type == 5">
+                    <div class="line">
+                      <span class="label">选择指标</span>
+                      <div class="action">
+                        <el-select
+                            v-model="scope.row.value1"
+                            :disabled="isView || scope.row.isDisabled"
+                            size="mini"
+                        >
+                          <el-option
+                              v-for="(item, index) in scope.row.items"
+                              :key="index"
+                              :label="item.options"
+                              :value="item.itemId"
+                          ></el-option>
+                        </el-select>
+                      </div>
+                    </div>
+                    <div class="line">
+                      <span class="label">交易指标区间</span>
+                      <div class="action">
+                        <div class="inputs">
+                          <el-select
+                              v-model="scope.row.value2"
+                              :disabled="isView || scope.row.isDisabled"
+                              size="mini"
+                          >
+                            <el-option label="(" value="("></el-option>
+                            <el-option label="[" value="["></el-option>
+                          </el-select>
+                          <el-input
+                              class="number-input"
+                              v-model.trim="scope.row.value3"
+                              :disabled="isView || scope.row.isDisabled"
+                              type="number"
+                              size="mini"
+                          ></el-input>
+                          <el-input
+                              class="number-input"
+                              v-model.trim="scope.row.value4"
+                              :disabled="isView || scope.row.isDisabled"
+                              type="number"
+                              size="mini"
+                          ></el-input>
+                          <el-select
+                              :disabled="isView || scope.row.isDisabled"
+                              v-model="scope.row.value5"
+                              size="mini"
+                          >
+                            <el-option label=")" value=")"></el-option>
+                            <el-option label="]" value="]"></el-option>
+                          </el-select>
+                        </div>
+                      </div>
+                    </div>
+                  </template>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="300" v-if="!isView">
+              <template slot-scope="scope" v-if="scope.row.isSubject">
+                <el-button v-if="!scope.row.isSave" size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.isSave" size="mini" type="text" @click="handleSave(scope.row, scope.$index)">保存</el-button>
+                <el-button v-if="scope.row.isSave" size="mini" type="text" @click="handleCancel(scope.row, scope.$index)">取消</el-button>
+                <el-button size="mini" type="text" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import quill from '@/components/quill'
+import {deepCopy} from '@/utils/deepCopy'
 export default {
+  components: {quill},
   data() {
     return {
-      input: "",
-      textarea: "",
-      tableData: [
-        {
-          qie: "且",
-          huo: "或"
-        }
-      ],
-      options1: [
-        {
-          value: "选项1",
-          label: "币币交易"
+      isAdd: false, // 添加
+      isEdit: false, // 编辑
+      isView: false, // 查看
+      isNameRepeat: false, // 名称是否重复
+      treeData: [], // 树结构数据
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      }, // 树结构配置项
+      currentNodeData: {}, // 当前选中的节点
+      formData: {
+        lcJudgmentPoint: {
+          name: "",
+          experimentalRequirements: "",
+          isDel: 0,
+          isOpen: 0,
+          projectId: "",
+          systemId: ""
         },
-        {
-          value: "选项2",
-          label: "网络交易"
+        lcJudgmentRuleList: []
+      }, // 表单参数
+      tableData: [], // 规则表格数据
+      tableDataCopy: [], // 规则表格数据备份
+      isAddRule: false, // 是否可以新增规则
+    };
+  },
+  mounted() {
+    this.$route.query.token && this.$store.commit('setParam', {
+      token: atob(decodeURI(this.$route.query.token))
+    });
+    if (this.$route.query.isView) {
+      this.isView = true;
+    } else if (this.$route.query.isEdit) {
+      this.isEdit = true;
+    } else if (this.$route.query.isAdd) {
+      this.isAdd = true;
+    }
+    this.getTreeData();
+    if (this.$route.query.lcId) {
+      this.getInfoData(this.$route.query.lcId);
+    }
+    if (this.$route.query.systemId) {
+      this.formData.lcJudgmentPoint.systemId = this.$route.query.systemId;
+    }
+  },
+  methods: {
+    getInfoData(lcId) { // 获取判分点详细信息
+      this.$get(`${this.api.queryJudgmentPointDetails}?lcId=${lcId}`).then(res => {
+        if (res.status === 200) {
+          let {judgmentPoint, judgmentRuleList} = res;
+          this.formData = {
+            lcJudgmentPoint: judgmentPoint,
+            lcJudgmentRuleList: judgmentRuleList
+          }
+
+          // 重新封装数据
+          let length = judgmentRuleList.length;
+          let tempArr = [];
+          judgmentRuleList.forEach((item, index) => {
+            let obj = { ...item, isSubject: true, isDisabled: true, isSave: false};
+            //题目类型(1选择 2判断 3填空 4问答 5指标结果)
+            if (item.type == 1) {
+              obj.subjectId = Number(item.emptyOne);
+              obj.value1 = Number(item.emptyTwo);
+            } else if (item.type == 3) {
+              obj.subjectId = Number(item.emptyOne);
+              obj.value1 = item.emptyTwo;
+            } else if (item.type == 4) {
+              // 需要提目id
+              if (item.emptyOne === '无限制') {
+                obj.value1 = item.emptyOne;
+                obj.value2 = "";
+              } else {
+                obj.value1 = item.emptyOne.substring(1,item.emptyOne.indexOf(','));
+                obj.value2 = item.emptyOne.substring(item.emptyOne.indexOf(',') + 1,item.emptyOne.length - 1)
+              }
+              obj.value3 = item.emptyTwo;
+            } else if (item.type == 5) {
+              obj.subjectId = Number(item.emptyOne);
+              obj.value2 = item.emptyTwo[0];
+              obj.value3 = item.emptyTwo.substring(1,item.emptyTwo.indexOf('~'));
+              obj.value4 = item.emptyTwo.substring(item.emptyTwo.indexOf('~') + 1,item.emptyTwo.length - 1)
+              obj.value5 = item.emptyTwo[item.emptyTwo.length -1];
+            }
+            tempArr.push(obj);
+            if (length > 1 && index !== (length - 1)) {
+              tempArr.push({ruleOperation: item.ruleOperation})
+            }
+            this.tableData = tempArr;
+          });
+
+          this.tableData.forEach((item, index) => {
+            // 勾选树节点
+            if (item.operationIds) {
+              this.$nextTick(() => {
+                this.$refs[`tree-${index}`].setCheckedKeys([item.operationIds]);
+              });
+            }
+            // 根据题目id,获取题目信息
+            if (item.type && item.type != 4 && item.emptyOne) {
+              this.getSubjectData(item.subjectId, index);
+            }
+          });
+
+        } else {
+          this.$message.warning(res.message)
         }
-      ],
-      options2: [
-        {
-          value: "选项1",
-          label: "限价交易"
+      }).catch(err => {
+        console.log(err)
+      });
+    },
+    getSubjectData(subjectId, index) { // 获取题目信息
+      this.$get(`${this.api.getSubjectInfo}?subject_id=${subjectId}`).then(res => {
+        if (res.status === 200) {
+          let item = {
+            ...this.tableData[index],
+            ...res.subject,
+            items: res.items
+          }
+          this.$set(this.tableData, index, item);
+          // console.log(JSON.stringify(this.tableData))
         }
-      ],
-      options3: [
-        {
-          value: "选项1",
-          label: "买入BTC"
+      }).catch(err => {
+        console.log(err)
+      });
+    },
+    handleCheckChange(data, checked, indeterminate, row, index) { // 处理勾选
+      if (checked && data.isNode === 1) {
+        this.tableData[index].operationIds = data.id; // 操作id串
+        if (data.subjectId) { // 是否有题目id
+          this.currentNodeData = data;
+          this.$refs[`tree-${index}`].setCheckedNodes([data]);
+          this.getSubjectData(data.subjectId, index);
+        } else {
+          row.type = "";
+          this.currentNodeData = {};
+          this.$refs[`tree-${index}`].setCheckedNodes([data]);
+
         }
-      ],
-      values1: [
-        {
-          value: "选项1",
-          label: "交易结果指标"
-        },
-        {
-          value: "选项2",
-          label: "交易过程指标"
+      }
+    },
+    getTreeData() { // 获取树结构数据
+      this.$get(this.api.getLcRecord).then(res => {
+        if (res.status === 200 && res.list) {
+          if (res.list.length) {
+            this.treeData = this.toTreeId(res.list, res.list[0].parentId);
+          }
+        } else {
+          this.$message.warning(res.message);
         }
-      ],
-      values2: [
-        {
-          value: "选项1",
-          label: "BTC买入量"
-        },
-        {
-          value: "选项2",
-          label: "总资产收益率"
+      }).catch(err => {
+        console.log(err)
+      });
+    },
+    toTreeId(data, parentId) { // id重新串连成（父+子+孙）,已便达到树节点需要的key唯一性,且后面提交数据，需要传这个id串到后台
+      let result = [];
+      data.forEach(item => {
+        if (item.isNode === 0) {
+          item.disabled = true;
         }
-      ],
-      values3: [
-        {
-          value: "选项1",
-          label: "("
-        },
-        {
-          value: "选项2",
-          label: "["
+        if (item.children && item.children.length) {
+          item.id = `${parentId},${item.id}`;
+          item.children = this.toTreeId(item.children, item.id);
+        } else {
+          item.id = `${parentId},${item.id}`;
         }
-      ],
-      values4: [
-        {
-          value: "选项1",
-          label: ")"
-        },
-        {
-          value: "选项2",
-          label: "]"
+        result.push(item);
+      });
+      return result;
+    },
+    Back() { // 返回
+      this.$router.back();
+    },
+    handleBlur() { // 新增/编辑判分点名称判重
+      if (this.formData.lcJudgmentPoint.name) {
+        let params = {
+          lcId: this.$route.query.lcId ? this.$route.query.lcId : "",
+          name: this.formData.lcJudgmentPoint.name
         }
-      ],
-      value1: "",
-      value2: "",
-      value3: "",
-      value4: "",
-      value5: "",
-      value6: "",
-      value7: "",
-      input1: "",
-      input2: "",
-      isShow: true,
-      isQie: true
-    };
-  },
+        this.$post(this.api.queryNameIsExist, params).then(res => {
+          if (res.status === 200) {
+            this.isNameRepeat = false;
+          } else {
+            this.isNameRepeat = true;
+          }
+        }).catch(err => {
+          console.log(err)
+        });
+      }
+    },
+    saveAll() { // 保存判分点
+      if (!this.formData.lcJudgmentPoint.name) {
+        this.$message.warning(`判分点名称不能为空`);
+        return;
+      }
+      if (this.isNameRepeat) {
+        this.$message.warning(`当前判分点名称已存在`);
+        return;
+      }
+      if (!this.formData.lcJudgmentPoint.experimentalRequirements) {
+        this.$message.warning(`实验要求不能为空`);
+        return;
+      }
+      if (!this.tableData.length) {
+        this.$message.warning(`请添加判分规则`);
+        return;
+      } else {
+        for (let i = 0; i < this.tableData.length; i++) {
+          if (this.tableData[i].isSubject && !this.tableData[i].operationIds) {
+            this.$message.warning(`第${i + 1}项请选择操作点`);
+            return;
+          } else if (this.tableData[i].isSave) {
+            this.$message.warning(`第${i + 1}项，未保存`);
+            return;
+          }
+        }
+      }
+      let tempArr = [];
+      this.tableData.forEach(i => {
+        if (i.isSubject) {
+          let obj = {
+            emptyOne: "",
+            emptyTwo: "",
+            id: i.id ? i.id : "",
+            lcId: i.lcId ? i.lcId : "",
+            type: i.type ? i.type : "",
+            operationIds: i.operationIds,
+            resultOperation: i.resultOperation,
+            ruleOperation: i.ruleOperation
+          };
+          //题目类型(1选择 2判断 3填空 4问答 5指标结果)
+          if (i.type == 1 || i.type == 2) {
+            obj.emptyOne = i.subjectId ? i.subjectId.toString() : "";
+            obj.emptyTwo = i.value1 ? i.value1.toString() : "";
+          } else if (i.type == 3) {
+            obj.emptyOne = i.subjectId ? i.subjectId.toString() : "";
+            obj.emptyTwo = i.value1;
+          } else if (i.type == 4) {
+            if (i.value1 === '无限制') {
+              obj.emptyOne = i.value1;  // 问答题,传的不是题目id
+            } else if (i.value1 && i.value2) {
+              obj.emptyOne = `${i.value1},${i.value2}`;  // 问答题,传的不是题目id
+            }
+            obj.emptyTwo = i.value3;
+          } else if (i.type == 5) {
+            // obj.emptyOne = i.value1; // 选择指标不传
+            obj.emptyOne = i.subjectId ? i.subjectId.toString() : "";
+            obj.emptyTwo = `${i.value2}${i.value3}~${i.value4}${i.value5}`;
+          }
+          tempArr.push(obj);
+        }
+      })
 
-  methods: {
-    Savejump() {
-      this.$router.push({ path: "/" });
+      this.formData.lcJudgmentRuleList = tempArr;
+      if (this.isAdd) { // 新增判分点
+        this.$post(this.api.addJudgmentPoint, this.formData).then(res => {
+          if (res.status === 200) {
+            this.$message.success("新增判分点成功");
+            this.Back();
+          } else {
+            this.$message.warning(res.message);
+          }
+        }).catch(err => {
+          console.log(err)
+        })
+      } else if (this.isEdit) { // 编辑判分点
+        this.$post(this.api.updateJudgmentPoint, this.formData).then(res => {
+          if (res.status === 200) {
+            this.$message.success("更新判分点成功");
+            this.Back();
+          } else {
+            this.$message.warning(res.message);
+          }
+        }).catch(err => {
+          console.log(err)
+        })
+      }
     },
-    Back() {
-      this.$router.push({ path: "/" });
+    addRule() { // 新增规则
+      this.isAddRule = true;
+      this.tableData.length && this.tableData.push({ruleOperation: 0});
+      this.tableData.push({
+        isSubject: true,
+        isDisabled: true,
+        isSave: false,
+        resultOperation: 0,
+        ruleOperation: 0,
+        operationIds: "",
+        value1: "",
+        value2: "",
+        value3: "",
+        value4: "",
+        value5: "",
+      })
     },
-    getQie() {
-      this.isQie = false;
+    changeResult(row) { // （左右）结果运算符(0：且 1：或 默认0)
+      row.resultOperation = row.resultOperation === 0 ? 1 : 0;
     },
-    getHuo() {
-      this.isQie = true;
+    changeRule(row, index) { // （上下）规则运算符(0：且 1：或 默认0)
+      row.ruleOperation = row.ruleOperation === 0 ? 1 : 0;
+      this.tableData[index - 1].ruleOperation = row.ruleOperation;
     },
-    handleEdit() {
-      this.isShow = false;
+    handleEdit(row) { // 处理编辑规则
+      this.tableDataCopy = deepCopy(this.tableData); // 深拷贝
+      row.isDisabled = false;
+      row.isSave = true;
     },
-    addTab(tabName, targetName) {
-      let newTabName = ++this.tabIndex + "";
-      this.editableTabs.push({
-        title: tabName,
-        name: newTabName,
-        content: "New Tab content"
-      });
-      this.editableTabsValue = newTabName;
-      this.dialogFormVisible = false;
+    handleSave(row, index) { // 处理保存规则
+      let keys = this.$refs[`tree-${index}`].getCheckedKeys();
+      if (!keys.length || !row.operationIds) {
+        this.$message.warning(`请选择操作点`);
+        return;
+      } else {
+        //题目类型(1选择 2判断 3填空 4问答 5指标结果)
+        if (row.type == 1 || row.type == 2) {
+          if (!row.value1) {
+            this.$message.warning(`请选择正确答案`);
+            return;
+          }
+        } else if (row.type == 3) {
+          if (!row.value1) {
+            this.$message.warning(`请输入字段要求`);
+            return;
+          }
+        } else if (row.type ==4) {
+          if (!row.value1) {
+            this.$message.warning(`请选择字数要求`);
+            return;
+          } else if (row.value1 !== '无限制' && !row.value2) {
+            this.$message.warning(`请输入字数要求`);
+            return;
+          } else if (!row.value3) {
+            this.$message.warning(`请输入字段要求`);
+            return;
+          }
+        } else if (row.type ==5) {
+          if (!row.value2 || !row.value5) {
+            this.$message.warning(`请选择交易指标区间`);
+            return;
+          } else if (!row.value3 || !row.value4) {
+            this.$message.warning(`请输入交易指标区间`);
+          } else if (row.value3 > row.value4) {
+            this.$message.warning(`第一个指标必须小于第二个指标`);
+            return;
+          }
+        }
+      }
+      row.isSave = false;
+      row.isDisabled = true;
+      this.isAddRule = false;
     },
-    dialogFormVisible() {
-      this.isShow = true;
+    handleCancel(row, index) { // 处理取消编辑规则
+      this.$set(this.tableData, index, this.tableDataCopy[index]);
+      if (!this.tableData[index].operationIds) {
+        this.$refs[`tree-${index}`].setCheckedKeys([]);
+      } else {
+        this.$refs[`tree-${index}`].setCheckedKeys([this.tableData[index].operationIds]);
+      }
+    },
+    handleDelete(row, index) { // 处理删除规则
+      this.$confirm("此操作将永久删除该规则, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      }).then(() => {
+        this.tableData.splice(index, 1);
+        index ? this.tableData.splice(index - 1, 1) : this.tableData.splice(0, 1);
+        this.isAddRule = index === 0 ? false : true;
+      }).catch(() => {})
     },
     // 表头样式设置
     headClass() {
@@ -304,82 +678,93 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// 第二部分
-//或 且的边框
-.border {
-  width: 50px;
-  height: 50px;
-  border: 1px solid #9278ff;
-  border-radius: 50%;
-  margin: auto;
-}
-// 表格盒子
-.box {
-  border: 1px solid #9278ff;
-  width: 500px;
-  margin: 0 auto;
-}
-.box /deep/ .el-input {
-  width: 150px;
-}
-.box_right /deep/ .el-input {
-  width: 51px;
-  margin-right: 0;
-}
-.box /deep/ .el-input--suffix .el-input__inner {
-  height: 25px;
-  padding-right: 0;
-}
-.box /deep/ .el-input--suffix .el-input__inner {
-  border: 1px solid #9278ff;
-}
-.box /deep/ .el-input--suffix .el-input__inner:focus,
-.el-input--suffix .el-input__inner:hover {
-  border: 1px solid #9278ff;
-}
-/deep/ .el-table .cell {
-  line-height: 1;
-}
-.box_p {
-  padding-left: 50px;
-}
-.box_p p {
-  padding-right: 20px;
-}
+.content {
+  position: relative;
+  top: 10px;
+  padding: 0 10px;
+  background-color: #ffffff;
 
-// 表格里面的内容
-.p {
-  font-size: 12px;
-  font-weight: 600;
-}
-/deep/ .el-select {
-  padding-top: 10px;
-}
-/deep/ .el-table td,
-.el-table th {
-  padding-top: 0;
-}
-.box /deep/ [class*=" el-icon-"],
-[class^="el-icon-"] {
-  line-height: 1;
-  padding-left: 0;
-}
-/deep/ .el-select__caret:before {
-  content: "\e78f";
-  font-size: 8px;
-  padding: 1px;
-  background-color: #9278ff;
-  border-radius: 50%;
-  color: #ffffff;
-}
-/deep/ .el-row {
-  padding: 0 20px;
-}
-/deep/ .el-card__body {
-  padding: 0;
-}
-/deep/ .el-card {
-  border: none;
+  .header {
+    border-bottom: 1px dashed #ccc;
+    height: 45px;
+    line-height: 45px;
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .back {
+      line-height: 3;
+      padding-left: 10px;
+
+      span {
+        font-size: 14px;
+        font-weight: 600;
+        padding-left: 5px;
+      }
+    }
+
+    .title {
+      font-weight: bold;
+      margin-left: 20px;
+    }
+  }
+
+  // 表单容器
+  .form-con {
+    padding-bottom: 24px;
+    border-bottom: 1px dashed #ccc;
+
+    .title {
+      padding: 10px 0;
+      border-bottom: 1px dashed #ccc;
+      display: flex;
+
+      .black {
+        width: 8px;
+        height: 18px;
+        background-color: #333;
+        margin-right: 10px;
+      }
+    }
+
+    .item {
+      display: flex;
+      margin-top: 24px;
+
+      .label {
+        width: 200px;
+        text-align: right;
+        padding-right: 20px;
+        line-height: 35px;
+      }
+    }
+  }
+
+  // 规则容器
+  .rule-con {
+    padding-bottom: 60px;
+
+    .title-con {
+      height: 60px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .title {
+        display: flex;
+
+        .black {
+          width: 8px;
+          height: 18px;
+          background-color: #333;
+          margin-right: 10px;
+        }
+      }
+    }
+
+  }
 }
 
 // 滚动条的宽度
@@ -387,135 +772,122 @@ export default {
   width: 6px; // 横向滚动条
   height: 6px; // 纵向滚动条 必写
 }
+
 // 滚动条的滑块
 /deep/ ::-webkit-scrollbar-thumb {
   background-color: #9278ff;
   border-radius: 3px;
   -webkit-box-shadow: inset 0 0 5px #dddddd;
 }
+
 /deep/ ::-webkit-scrollbar-track {
   /*滚动条里面轨道*/
   -webkit-box-shadow: inset 0 0 5px #dddddd;
   border-radius: 0;
   background: #dddddd;
 }
-
-/deep/ .el-table th {
-  font-size: 14px;
-  font-family: Microsoft YaHei;
-  color: rgba(255, 255, 255, 1);
-  background-color: #9278ff;
+.tree-con{
+  height: 230px;
+  position: relative;
+  .mask{
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    cursor:not-allowed;
+    z-index: 99999;
+  }
 }
 
-.footer_b p {
-  //   padding-right: 800px;
-  margin: 0;
-  padding-left: 10px;
-  font-size: 12px;
-}
-.footer_b {
-  padding: 10px 0;
-  border-top: 1px dashed #cccccc;
-  margin: 0 15px;
-  height: 45px;
-  line-height: 45px;
+@mixin block {
+  padding: 10px;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
 }
 
-// 第一部分
-#memo {
-  margin-left: 10px;
-  height: 200px;
-  width: 800px;
-  resize: none;
-  border: 1px solid #9278ff;
-  font-size: 12px;
-  border-radius: 5px;
-}
-/deep/ .el-input--suffix .el-input__inner {
-  border: 1px solid #9278ff;
-}
-.footer_input p {
-  font-size: 12px;
-  padding-right: 20px;
-}
-.footer_input {
-  padding: 30px 0 20px 80px;
-}
-.footer_inputs {
-  padding: 30px 0 20px 80px;
-}
-.footer_inputs p {
-  font-size: 12px;
-  padding-right: 20px;
-}
-/deep/ .el-input {
-  width: 30%;
-}
-.button {
-  height: 30px;
-  width: 80px;
-  margin-top: 7px;
-  border: none;
-  background-color: #9278ff;
-  color: #ffffff;
-  border-radius: 20px;
-  position: absolute;
-  right: 30px;
-}
-.button:focus {
-  outline: 0;
-}
-/deep/ [class*=" el-icon-"],
-[class^="el-icon-"] {
-  line-height: 3;
-  padding-left: 10px;
-}
-.header {
-  background-color: #ffffff;
-  height: 45px;
-  line-height: 45px;
-  font-size: 14px;
-  font-weight: 600;
-  position: relative;
-}
-.header span {
-  font-size: 14px;
-  font-weight: 600;
-  padding-left: 5px;
-}
-.header p {
-  padding-left: 20px;
-  margin: 0;
-}
-.footer_h {
-  // padding: 10px 0;
-  border-top: 1px dashed #cccccc;
-  border-bottom: 1px dashed #cccccc;
-  margin: 0 15px;
-  height: 45px;
-  line-height: 45px;
-}
-.flex {
-  display: flex;
-  justify-content: flex-start;
-}
-.footer {
-  background-color: #ffffff;
-}
-.footer_h p {
-  padding-left: 10px;
-  font-size: 12px;
-  margin: 0;
-}
-.black {
-  width: 8px;
-  height: 18px;
-  background-color: #333;
-  margin-top: 10px;
-}
-.content {
-  background-color: #f2f6fc;
-  position: relative;
-  top: 10px;
+.block {
+  @include block;
+  height: 230px;
+  background-color: #fff;
+  overflow: auto;
+  .line {
+    display: flex;
+    align-items: center;
+    margin: 24px 0;
+
+    .label {
+      width: 100px;
+      margin-right: 10px;
+      text-align: right;
+      font-size: 12px;
+
+      &.mini {
+        width: auto;
+      }
+    }
+
+    .action {
+      flex: 1;
+      text-align: left;
+
+      /deep/ .el-input {
+        width: 100%;
+      }
+
+      &.steps {
+        @include block;
+        display: inline-flex;
+        flex-direction: column;
+        height: 150px;
+        font-size: 12px;
+        overflow: auto;
+
+        .radio-wrap {
+          display: flex;
+          flex-direction: column;
+
+          .child {
+            display: flex;
+            flex-direction: column;
+            margin-left: 15px;
+          }
+
+          /deep/ .el-radio {
+            margin: 3px 0;
+          }
+        }
+      }
+
+      .inputs {
+        display: flex;
+        align-items: center;
+
+        /deep/ .el-input {
+          width: 100px;
+          margin: 0 5px;
+
+          &:first-child {
+            margin-left: 0;
+          }
+        }
+      }
+
+      &.a-line {
+        display: inline-flex;
+      }
+
+      .mini-textarea,
+      /deep/ .mini-textarea .el-textarea__inner {
+        width: 100%;
+      }
+
+      .number-input {
+        /deep/ .el-input__inner {
+          padding-right: 0;
+        }
+      }
+    }
+  }
 }
 </style>