diff --git a/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue b/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue
index c27fbf3c..57d692e8 100644
--- a/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue
+++ b/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue
@@ -6,110 +6,59 @@
         <el-form :inline="true" size="medium" :model="queryInfo" class="demo-form-inline">
           <el-form-item>
             <el-button type="warning" plain @click="refreshBtn">刷新</el-button>
-            <el-button class="expintBtn" size="medium" type="primary" @click="addBefore(1, null)">
-              新增
-            </el-button>
+            <el-button class="expintBtn" size="medium" type="primary" @click="addBefore(1, null)">新增</el-button>
           </el-form-item>
         </el-form>
       </div>
       <div class="table_wrap whiteBlock">
         <vue-scroll>
-          <el-table height="650" class="tables" :data="listData" lazy row-key="id" :tree-props="{ children: 'children' }"
+          <el-table height="650" class="tables" :data="listData1" lazy row-key="id" :tree-props="{ children: 'children' }"
             :header-cell-style="{ 'text-align': 'center' }">
             <!-- <el-table-column align="center" prop="subjectName" label="科目类别名称" ></el-table-column> -->
             <!-- <el-table-column prop="processName" label="工序名称"> -->
-            <el-table-column prop="processName" label="工序名称">
+            <el-table-column prop="subjectName" width="200" label="科目类别"></el-table-column>
+            <el-table-column></el-table-column>
+            <el-table-column width="200" label="操作" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.children.length == 0 && scope.row.parentId == '0'" :title="scope.row.processName" style="
-                    overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
-                    width: 150px; ">
-                  {{ scope.row.processName }}
-                </span>
-                <span v-else :title="scope.row.processName" style="overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
-                    width: 150px;
-                    position: absolute;">
-                  {{ scope.row.processName }}
-                </span>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column align="center" prop="code" label="风险编号"></el-table-column>
-            <el-table-column align="center" prop="riskPossibleConsequence" label="风险可能导致的后果"></el-table-column>
-            <el-table-column align="center" prop="riskAssessmentValueD" label="风险评定值D"></el-table-column>
-            <el-table-column align="center" prop="riskLevel" label="风险级别"></el-table-column>
-            <el-table-column align="center" prop="keyFactorsInRiskControl" label="风险控制关键因素"></el-table-column>
-            <el-table-column align="center" prop="precaution" label="预防措施">
-              <template slot-scope="scope">
-                <div :title="scope.row.precaution" class="name-wrapper">
-                  {{ scope.row.precaution }}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column width="300" label="操作" align="center">
-              <template slot-scope="scope">
-                <el-button @click.native.stop="addBefore(2, scope.row)" size="mini" type="text" icon="el-icon-circle-plus-outline">
+                <el-button @click.native.stop="addBefore(2, scope.row)" size="mini" type="text" icon="el-icon-circle-plus-outline"
+                v-if="scope.row.parentId == '0'">
                   新增
                 </el-button>
-                <el-button size="mini" type="text" icon="el-icon-document" @click.native.stop="showDetail(scope.rowchildren)">
-                  详情
-                </el-button>
-                <el-button size="mini" type="text" icon="el-icon-edit" @click.native.stop="editBefore(scope.row)">
+                <el-button size="mini" type="text" icon="el-icon-edit" @click.native.stop="editBefore(scope.row)" v-if="scope.row.parentId == '0'">
                   编辑
                 </el-button>
-                <el-button size="mini" type="text" class="delete-btn" icon="el-icon-delete"
-                  @click.native.stop="deleteBefore(scope.row)">删除</el-button>
+                <el-button size="mini" type="text" class="delete-btn" icon="el-icon-delete" @click.native.stop="deleteBefore(scope.row) " v-if="scope.row.parentId == '0'">
+                  删除
+                </el-button>
               </template>
-            </el-table-column> -->
+            </el-table-column>
           </el-table>
         </vue-scroll>
-        <el-pagination class="pagerBox" style="position: absolute; top: 85%; left: 40%" @size-change="SizeChange"   @current-change="CurrentChange" :current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.  pageSize" layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background>
-        </el-pagination>
+        <el-pagination class="pagerBox" style="position: absolute; top: 85%; left: 40%" @size-change="SizeChange"   @current-change="CurrentChange" :current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.  pageSize" layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background></el-pagination>
       </div>
       <!-- '新增父子级工程弹框' -->
       <el-dialog :modal-append-to-body="false" :title="title" :visible.sync="dialogVisible" width="667px" @close="close">
-        <div class="dialog_content">
+        <!-- <div class="dialog_content">
           <el-form ref="addEditForm" label-width="145px" size="medium" class="dialogFormBox" :rules="addEditRules" :model="workerInfo">
             <el-form-item label="工序名称" prop="processName" v-if="dialogType == 3">
               <el-input v-model="parentTaskName" placeholder="请输入" :disabled="dialogType == 3 || title == '详情'"></el-input>
             </el-form-item>
-            <el-form-item v-else label="工序名称" prop="processName">
-              <el-input :disabled="title == '详情'" v-model="workerInfo.processName" placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item v-if="dialogType == 3" label="子工序名称" prop="processName">
-              <el-input :disabled="title == '详情'" v-model="workerInfo.processName" placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item label="风险编号" prop="code">
-              <el-input :disabled="title == '详情'" v-model="workerInfo.code" placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item label="风险可能导致的后果" prop="riskPossibleConsequence">
-              <el-input :disabled="title == '详情'" v-model="workerInfo.riskPossibleConsequence" placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item label="风险评定值D" prop="riskAssessmentValueD">
-              <el-input :disabled="title == '详情'" v-model="workerInfo.riskAssessmentValueD" placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item label="风险级别" prop="riskLevel">
-              <el-input :disabled="title == '详情'" v-model="workerInfo.riskLevel" placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item label="风险控制关键因素" prop="keyFactorsInRiskControl">
-              <el-input :disabled="title == '详情'" v-model="workerInfo.keyFactorsInRiskControl" placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item label="预防措施" prop="precaution">
-              <el-input type="textarea" :disabled="title == '详情'" v-model="workerInfo.precaution" placeholder="请输入"></el-input>
+          </el-form>
+        </div> -->
+        <div class="dialog_content">
+          <el-form ref="addEditForm" label-width="145px" size="medium" class="dialogFormBox" :rules="addEditRules" :model="workerInfo">
+            <el-form-item label="科目类别" prop="processName">
+              <el-input v-model="parentTaskName" placeholder="请输入" :disabled="dialogType == 3 || title == '详情'"></el-input>
             </el-form-item>
           </el-form>
         </div>
         <div class="dialog-footer">
-          <el-button class="cancleBtn" @click="dialogVisible = false" icon="el-icon-circle-close" size="medium">取消
+          <el-button class="cancleBtn" @click="handleCancel" icon="el-icon-circle-close" size="medium">取消
           </el-button>
           <el-button v-if="title != '详情'" type="primary" icon="el-icon-circle-check" @click="submitBtn" size="medium">确定
           </el-button>
         </div>
       </el-dialog>
-      <!-- //查看大图 -->
-      <el-dialog :modal-append-to-body="false" :visible.sync="showBigImg">
-        <img width="100%" :src="dialogImageUrl" alt="" />
-      </el-dialog>
     </div>
   </div>
 </template>
@@ -132,8 +81,8 @@ export default {
           subjectName: '科目名称1',
           parentId: '0',
           children: [
-            { id: 1, subjectName: '子科目名称1', parentId: '1' },
-            { id: 2, subjectName: '子科目名称1', parentId: '1' },
+            { id: '4', subjectName: '子科目名称1', parentId: '1' },
+            { id: '5', subjectName: '子科目名称2', parentId: '1' },
           ],
         },
         {
@@ -141,16 +90,17 @@ export default {
           subjectName: '科目名称2',
           parentId: '0',
           children: [
-            { id: 1, subjectName: '子科目名称1', parentId: '2' },
-            { id: 2, subjectName: '子科目名称1', parentId: '2' },
+            { id: '6', subjectName: '子科目名称1', parentId: '2' },
+            { id: '7', subjectName: '子科目名称2', parentId: '2' },
           ],
         },
         {
           id: '3',
           subjectName: '科目名称3',
+          parentId: '0',
           children: [
-            { id: 1, subjectName: '子科目名称1', parentId: '2' },
-            { id: 2, subjectName: '子科目名称1', parentId: '2' },
+            { id: '8', subjectName: '子科目名称1', parentId: '3' },
+            { id: '9', subjectName: '子科目名称2', parentId: '3' },
           ],
         },
       ],
@@ -206,6 +156,10 @@ export default {
         riskLevel: '',
         riskPossibleConsequence: '',
       },
+      subjectInfo: {
+        subjectName: '',
+        parentId: '0'
+      },
       principalLsit: [], //负责人
       seedId: '',
       showTime: false, //工期
@@ -214,7 +168,7 @@ export default {
       },
       type: 'add',
       addEditRules: {
-        processName: [
+        subjectName: [
           {
             required: true,
             message: this.$t('message.personnelPosition.required'),
@@ -313,8 +267,20 @@ export default {
       this.$http.defaults.baseURL + 'xmgl/progressTask/downloadTemplate'
     this.getProgressListData()
     // this.getCrewListData()
+    console.log('👇')
+    console.log(this.listData1)
+    console.log(this.listData1[0].children)
+    console.log(new Date().getTime())
   },
   methods: {
+    handleCancel(){
+      this.dialogVisible = false
+      this.clearObj()
+    },
+    clearObj(){
+      this.subjectInfo.subjectName = ''
+      this.subjectInfo.parentId = '0'
+    },
     //导入确定提交
     handleUploadConfirm() {
       if (this.fileName == '') {
@@ -365,14 +331,14 @@ export default {
     //新增
     addBefore(addType, value) {
       if (addType == 1) {
-        this.title = '新增风险清册'
+        this.title = '新增科目类别'
         this.dialogType = 1
       } else {
-        console.log('新增子分项点击', value)
-        this.title = '新增子分项'
+        console.log('新增子科目类别', value)
+        this.title = '新增子科目类别'
         this.dialogType = 3
-        this.workerInfo.parentId = value.id
-        this.parentTaskName = value.processName
+        // this.workerInfo.parentId = value.id
+        // this.parentTaskName = value.processName
       }
       this.dialogVisible = true
     },