From 41db342dfc2955d817d8651e7dcdc6c248bc26cb Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Wed, 10 Apr 2024 16:18:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/examSystem/examSystem.js    |  92 ++++
 .../js/api/examSystem/subjectManagement.js    |  72 ---
 src/assets/js/http.js                         |   4 +-
 src/store/index.js                            |  22 +-
 .../examRegulation/examRegulation.vue         |  75 +--
 .../subjectManagement/subjectManagement.vue   | 448 ++++--------------
 6 files changed, 238 insertions(+), 475 deletions(-)
 create mode 100644 src/assets/js/api/examSystem/examSystem.js
 delete mode 100644 src/assets/js/api/examSystem/subjectManagement.js

diff --git a/src/assets/js/api/examSystem/examSystem.js b/src/assets/js/api/examSystem/examSystem.js
new file mode 100644
index 00000000..8c9fe2ca
--- /dev/null
+++ b/src/assets/js/api/examSystem/examSystem.js
@@ -0,0 +1,92 @@
+/**
+ * 考试系统api接口统一管理
+ */
+import { post, get } from '../../http'
+
+// 科目管理
+export const addExamSubjectApi = data => post('exam/subject/add', data) //添加
+export const deleteExamSubjectApi = data => post('exam/subject/delete', data) //删除
+export const deleteExamSubjectsApi = data => post('exam/subject/deleteBatch', data) //批量删除
+export const editExamSubjectApi = data => post('exam/subject/edit', data) //编辑
+export const listExamSubjectApi = data => post('exam/subject/list', data) //列表查询
+export const pageExamSubjectApi = data => post('exam/subject/page', data) //分页查询
+export const queryExamSubjectByIdApi = data => post('exam/subject/queryById', data) //通过id查询
+// export const listTreeExamSubjectApi = data => get('exam/subject/tree/${sn}', data) //列表查询
+export const listTreeExamSubjectApi = data => get('exam/subject/tree/'+ data.sn,) //列表查询
+
+// 规章制度
+export const addExamRegulationApi = data => post('exam/regulation/add', data) //添加
+export const deleteExamRegulationApi = data => post('exam/regulation/delete', data) //删除
+export const deleteExamRegulationsApi = data => post('exam/regulation/deleteBatch', data) //批量删除
+export const editExamRegulationApi = data => post('exam/regulation/edit', data) //编辑
+export const listExamRegulationApi = data => post('exam/regulation/list', data) //列表查询
+export const pageExamRegulationApi = data => post('exam/regulation/page', data) //分页查询
+export const queryExamRegulationByIdApi = data => post('exam/regulation/queryById', data) //通过id查询
+
+// // 风险安全库 —— 作业类型、工序及部位接口 (左侧树)
+// export const rtRiskSecurityLibraryAdd = data => post('xmgl/rtRiskSecurityLibraryType/add', data) //添加
+// export const rtRiskSecurityLibraryEdit = data => post('xmgl/rtRiskSecurityLibraryType/edit', data) //编辑
+// //  export const rtRiskSecurityLibraryDelete = data => post('xmgl/rtRiskSecurityLibraryType/delete', data) //删除
+// export const rtRiskSecurityLibraryDelete = data => get('xmgl/rtRiskSecurityLibraryType/deleteByRtRiskSecurityLibraryTypeId', data) //删除
+// export const rtRiskSecurityLibraryPage = data => get('xmgl/rtRiskSecurityLibraryType/page', data) //查询列表数据
+// //  export const rtRiskSecurityLibraryList = data => post('xmgl/rtRiskSecurityLibraryType/list', data) //查询列表数据
+// export const rtRiskSecurityLibraryList = data => post('xmgl/rtRiskSecurityLibraryType/selectRtRiskSecurityLibraryTypeList', data) //查询列表数据
+
+// //  风险安全库 —— 具体项接口 (右侧列表)
+// export const rtRiskSecurityLibraryConcreteAdd = data => post('xmgl/rtRiskSecurityLibraryTypeConcrete/add', data) //添加
+// export const rtRiskSecurityLibraryConcreteEdit = data => post('xmgl/rtRiskSecurityLibraryTypeConcrete/edit', data) //编辑
+// export const rtRiskSecurityLibraryConcreteDelete = data => post('xmgl/rtRiskSecurityLibraryTypeConcrete/delete', data) //编辑
+// export const rtRiskSecurityLibraryConcreteList = data =>
+//   post('xmgl/rtRiskSecurityLibraryTypeConcrete/selectCompanyRtRiskSecurityLibraryTypeConcreteList', data) //查询列表数据
+
+// //  工作票相关接口 (右侧列表)
+// export const rtWorkTicketAdd = data => post('xmgl/rtWorkTicket/add', data) //添加
+// export const rtWorkTicketEdit = data => post('xmgl/rtWorkTicket/edit', data) //编辑
+// export const rtWorkTicketDelete = data => post('xmgl/rtWorkTicket/delete', data) //删除
+// export const rtWorkTicketPage = data => get('xmgl/rtWorkTicket/page', data) //删除
+
+// export const getWorkTickDetailText = data => post('xmgl/rtRiskSecurityLibraryTypeConcrete/queryJobPrerequisite', data) //添加
+
+// // 风险清册相关接口
+// export const rtRiskInventoryTypeAdd = data => post('xmgl/rtRiskInventoryType/add', data) //添加
+// export const rtRiskInventoryTypeEdit = data => post('xmgl/rtRiskInventoryType/edit', data) //编辑
+// export const rtRiskInventoryTypeDelete = data => post('xmgl/rtRiskInventoryType/delete', data) //删除
+// export const rtRiskInventoryTypePage = data => get('xmgl/rtRiskInventoryType/tree/page', data) //查询
+
+// // 仓库管理相关接口
+// export const rtToolAdd = data => post('xmgl/rtTool/add', data) //添加
+// export const rtToolEdit = data => post('xmgl/rtTool/edit', data) //编辑
+// export const rtToolDelete = data => post('xmgl/rtTool/delete', data) //删除
+// export const rtToolPage = data => get('xmgl/rtTool/page', data) //查询
+// export const rtToolPageHistory = data => get('xmgl/rtToolHistory/page', data) //历史数据查询
+
+// // 进度款合同 相关接口
+// export const rtProgressPaymentContractAdd = data => post('xmgl/rtProgressPaymentContract/add', data) //添加
+// export const rtProgressPaymentContractEdit = data => post('xmgl/rtProgressPaymentContract/edit', data) //编辑
+// export const rtProgressPaymentContractDelete = data => post('xmgl/rtProgressPaymentContract/delete', data) //删除
+// export const rtProgressPaymentContractPage = data => get('xmgl/rtProgressPaymentContract/page', data) //查询
+
+// // 技术管理——设计变更联系单 相关接口
+// export const rtDesignChangeContactSheetAdd = data => post('xmgl/rtDesignChangeContactSheet/add', data) //添加
+// export const rtDesignChangeContactSheetEdit = data => post('xmgl/rtDesignChangeContactSheet/edit', data) //编辑
+// export const rtDesignChangeContactSheetDelete = data => post('xmgl/rtDesignChangeContactSheet/delete', data) //删除
+// export const rtDesignChangeContactSheetPage = data => get('xmgl/rtDesignChangeContactSheet/page', data) //查询
+
+// // 技术管理——设计变更联系单 相关接口
+// export const rtNewTechnologiesAndNewProcessAdd = data => post('xmgl/rtNewTechnologiesAndNewProcess/add', data) //添加
+// export const rtNewTechnologiesAndNewProcessEdit = data => post('xmgl/rtNewTechnologiesAndNewProcess/edit', data) //编辑
+// export const rtNewTechnologiesAndNewProcessDelete = data => post('xmgl/rtNewTechnologiesAndNewProcess/delete', data) //删除
+// export const rtNewTechnologiesAndNewProcessPage = data => get('xmgl/rtNewTechnologiesAndNewProcess/page', data) //查询
+
+// // 技术管理——设计变更联系单 相关接口
+// export const rtMaterialOrderAdd = data => post('xmgl/rtMaterialOrder/add', data) //添加
+// export const rtMaterialOrderEdit = data => post('xmgl/rtMaterialOrder/edit', data) //编辑
+// export const rtMaterialOrderDelete = data => post('xmgl/rtMaterialOrder/delete', data) //删除
+// export const rtMaterialOrderPage = data => get('xmgl/rtMaterialOrder/page', data) //查询
+// export const getArrivalInfoApi = data => post('xmgl/rtMaterialOrder/countRtMaterialOrder', data) //查询
+
+// // 施工图 相关接口
+// export const rtConstructionDrawAdd = data => post('xmgl/rtConstructionDraw/add', data) //添加
+// export const rtConstructionDrawEdit = data => post('xmgl/rtConstructionDraw/edit', data) //编辑
+// export const rtConstructionDrawDelete = data => post('xmgl/rtConstructionDraw/delete', data) //删除
+// export const rtConstructionDrawPage = data => get('xmgl/rtConstructionDraw/page', data) //查询
diff --git a/src/assets/js/api/examSystem/subjectManagement.js b/src/assets/js/api/examSystem/subjectManagement.js
deleted file mode 100644
index 26c51379..00000000
--- a/src/assets/js/api/examSystem/subjectManagement.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * 风险安全库api接口统一管理
- */
-import { post, get } from '../../http'
-
-// 风险安全库 —— 作业类型、工序及部位接口 (左侧树)
-export const rtRiskSecurityLibraryAdd = data => post('xmgl/rtRiskSecurityLibraryType/add', data) //添加
-export const rtRiskSecurityLibraryEdit = data => post('xmgl/rtRiskSecurityLibraryType/edit', data) //编辑
-//  export const rtRiskSecurityLibraryDelete = data => post('xmgl/rtRiskSecurityLibraryType/delete', data) //删除
-export const rtRiskSecurityLibraryDelete = data => get('xmgl/rtRiskSecurityLibraryType/deleteByRtRiskSecurityLibraryTypeId', data) //删除
-export const rtRiskSecurityLibraryPage = data => get('xmgl/rtRiskSecurityLibraryType/page', data) //查询列表数据
-//  export const rtRiskSecurityLibraryList = data => post('xmgl/rtRiskSecurityLibraryType/list', data) //查询列表数据
-export const rtRiskSecurityLibraryList = data => post('xmgl/rtRiskSecurityLibraryType/selectRtRiskSecurityLibraryTypeList', data) //查询列表数据
-
-//  风险安全库 —— 具体项接口 (右侧列表)
-export const rtRiskSecurityLibraryConcreteAdd = data => post('xmgl/rtRiskSecurityLibraryTypeConcrete/add', data) //添加
-export const rtRiskSecurityLibraryConcreteEdit = data => post('xmgl/rtRiskSecurityLibraryTypeConcrete/edit', data) //编辑
-export const rtRiskSecurityLibraryConcreteDelete = data => post('xmgl/rtRiskSecurityLibraryTypeConcrete/delete', data) //编辑
-export const rtRiskSecurityLibraryConcreteList = data =>
-  post('xmgl/rtRiskSecurityLibraryTypeConcrete/selectCompanyRtRiskSecurityLibraryTypeConcreteList', data) //查询列表数据
-
-//  工作票相关接口 (右侧列表)
-export const rtWorkTicketAdd = data => post('xmgl/rtWorkTicket/add', data) //添加
-export const rtWorkTicketEdit = data => post('xmgl/rtWorkTicket/edit', data) //编辑
-export const rtWorkTicketDelete = data => post('xmgl/rtWorkTicket/delete', data) //删除
-export const rtWorkTicketPage = data => get('xmgl/rtWorkTicket/page', data) //删除
-
-export const getWorkTickDetailText = data => post('xmgl/rtRiskSecurityLibraryTypeConcrete/queryJobPrerequisite', data) //添加
-
-// 风险清册相关接口
-export const rtRiskInventoryTypeAdd = data => post('xmgl/rtRiskInventoryType/add', data) //添加
-export const rtRiskInventoryTypeEdit = data => post('xmgl/rtRiskInventoryType/edit', data) //编辑
-export const rtRiskInventoryTypeDelete = data => post('xmgl/rtRiskInventoryType/delete', data) //删除
-export const rtRiskInventoryTypePage = data => get('xmgl/rtRiskInventoryType/tree/page', data) //查询
-
-// 仓库管理相关接口
-export const rtToolAdd = data => post('xmgl/rtTool/add', data) //添加
-export const rtToolEdit = data => post('xmgl/rtTool/edit', data) //编辑
-export const rtToolDelete = data => post('xmgl/rtTool/delete', data) //删除
-export const rtToolPage = data => get('xmgl/rtTool/page', data) //查询
-export const rtToolPageHistory = data => get('xmgl/rtToolHistory/page', data) //历史数据查询
-
-// 进度款合同 相关接口
-export const rtProgressPaymentContractAdd = data => post('xmgl/rtProgressPaymentContract/add', data) //添加
-export const rtProgressPaymentContractEdit = data => post('xmgl/rtProgressPaymentContract/edit', data) //编辑
-export const rtProgressPaymentContractDelete = data => post('xmgl/rtProgressPaymentContract/delete', data) //删除
-export const rtProgressPaymentContractPage = data => get('xmgl/rtProgressPaymentContract/page', data) //查询
-
-// 技术管理——设计变更联系单 相关接口
-export const rtDesignChangeContactSheetAdd = data => post('xmgl/rtDesignChangeContactSheet/add', data) //添加
-export const rtDesignChangeContactSheetEdit = data => post('xmgl/rtDesignChangeContactSheet/edit', data) //编辑
-export const rtDesignChangeContactSheetDelete = data => post('xmgl/rtDesignChangeContactSheet/delete', data) //删除
-export const rtDesignChangeContactSheetPage = data => get('xmgl/rtDesignChangeContactSheet/page', data) //查询
-
-// 技术管理——设计变更联系单 相关接口
-export const rtNewTechnologiesAndNewProcessAdd = data => post('xmgl/rtNewTechnologiesAndNewProcess/add', data) //添加
-export const rtNewTechnologiesAndNewProcessEdit = data => post('xmgl/rtNewTechnologiesAndNewProcess/edit', data) //编辑
-export const rtNewTechnologiesAndNewProcessDelete = data => post('xmgl/rtNewTechnologiesAndNewProcess/delete', data) //删除
-export const rtNewTechnologiesAndNewProcessPage = data => get('xmgl/rtNewTechnologiesAndNewProcess/page', data) //查询
-
-// 技术管理——设计变更联系单 相关接口
-export const rtMaterialOrderAdd = data => post('xmgl/rtMaterialOrder/add', data) //添加
-export const rtMaterialOrderEdit = data => post('xmgl/rtMaterialOrder/edit', data) //编辑
-export const rtMaterialOrderDelete = data => post('xmgl/rtMaterialOrder/delete', data) //删除
-export const rtMaterialOrderPage = data => get('xmgl/rtMaterialOrder/page', data) //查询
-export const getArrivalInfoApi = data => post('xmgl/rtMaterialOrder/countRtMaterialOrder', data) //查询
-
-// 施工图 相关接口
-export const rtConstructionDrawAdd = data => post('xmgl/rtConstructionDraw/add', data) //添加
-export const rtConstructionDrawEdit = data => post('xmgl/rtConstructionDraw/edit', data) //编辑
-export const rtConstructionDrawDelete = data => post('xmgl/rtConstructionDraw/delete', data) //删除
-export const rtConstructionDrawPage = data => get('xmgl/rtConstructionDraw/page', data) //查询
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 50c02f67..75919048 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -83,8 +83,8 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
-  // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
+  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
   // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
diff --git a/src/store/index.js b/src/store/index.js
index 6e428150..074b8fc7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -50,19 +50,21 @@ export default new Vuex.Store({
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
     // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
     // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
+    UPLOADURL:'http://192.168.34.155:19111/upload/image/',// 
+    FILEURL:'http://192.168.34.155:19111/image/',//
     // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
-    BASEURL: baseUrl
-      ? baseUrl
-      : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    UPLOADURL:
-      window.location.protocol +
-      "//" +
-      window.location.host +
-      "/upload/image", //正式环境
-    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
-    WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址
+    // BASEURL: baseUrl
+    //   ? baseUrl
+    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
+    // UPLOADURL:
+    //   window.location.protocol +
+    //   "//" +
+    //   window.location.host +
+    //   "/upload/image", //正式环境
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    // WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl
diff --git a/src/views/projectFront/examSystem/examRegulation/examRegulation.vue b/src/views/projectFront/examSystem/examRegulation/examRegulation.vue
index 4bd27c65..e8c557c1 100644
--- a/src/views/projectFront/examSystem/examRegulation/examRegulation.vue
+++ b/src/views/projectFront/examSystem/examRegulation/examRegulation.vue
@@ -5,11 +5,11 @@
     </div>
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="tableData">
-        <el-table-column prop="fileName" align="center" label="文件名称" width="280"></el-table-column>
-        <el-table-column prop="pbulicStatus" align="center" label="公开状态">
+        <el-table-column prop="name" align="center" label="文件名称" width="280"></el-table-column>
+        <el-table-column prop="isEnable" align="center" label="公开状态">
           <template slot-scope="scope">
-            <span style="color: green" v-if="scope.row.pbulicStatus === '1'">已公开</span>
-            <span style="color: black" v-if="scope.row.pbulicStatus === '0'">未公开</span>
+            <span style="color: green" v-if="scope.row.isEnable === true">已公开</span>
+            <span style="color: black" v-if="scope.row.isEnable === false">未公开</span>
           </template>
         </el-table-column>
         <el-table-column prop="uploadTime" align="center" label="上传时间"></el-table-column>
@@ -40,11 +40,11 @@
     <el-dialog :modal-append-to-body="false" @close="close" :title="title" :visible.sync="dialogShow" width="667px">
       <div class="dialog_content">
         <el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
-          <el-form-item label="文件名称" prop="fileName">
-            <el-input v-model="addEditForm.fileName" placeholder="请输入"></el-input>
+          <el-form-item label="文件名称" prop="name">
+            <el-input v-model="addEditForm.name" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item label="公开状态" prop="pbulicStatus">
-            <el-switch v-model="addEditForm.pbulicStatus" active-color="green" inactive-color="black" :active-value="'1'" :inactive-value="'0'"></el-switch>
+          <el-form-item label="公开状态" prop="isEnable">
+            <el-switch v-model="addEditForm.isEnable" active-color="green" inactive-color="black" :active-value="true" :inactive-value="false"></el-switch>
           </el-form-item>
           <el-form-item label="上传资料" prop="uploadFile">
             <el-upload class="upload-demo" name="files" :action="$store.state.UPLOADURL" :on-remove="handleRemove" 
@@ -65,10 +65,16 @@
   </div>
 </template>
 <script>
+
 import {
-  rtToolPage,
-} from '@/assets/js/api/workTicketManage.js'
-import {} from '@/assets/js/api/devicePosition/deviceCentral.js'
+  addExamRegulationApi,
+  deleteExamRegulationApi,
+  deleteExamRegulationsApi,
+  editExamRegulationApi,
+  listExamRegulationApi,
+  pageExamRegulationApi,
+  queryExamRegulationByIdApi,
+} from '@/assets/js/api/examSystem/examSystem'
 export default {
   mounted() {},
   created() {
@@ -89,37 +95,39 @@ export default {
       tableData: [],
       addEditForm: {
         id: '',
-        fileName: '',
-        pbulicStatus: '',
+        name: '',
+        isEnable: '',
         uploadFile: '',
       },
       addEditRules: {
-        fileName: [{ required: true, message: '必填', trigger: 'blur' }],
+        name: [{ required: true, message: '必填', trigger: 'blur' }],
         uploadFile: [{ required: true, message: '上传文件', trigger: 'blur' }],
       },
     }
   },
   methods: {
     getList() {
-      // rtToolPage({
-      //   pageNo: this.pagInfo.pageNo,
-      //   pageSize: this.pagInfo.pageSize,
-      //   projectSn: this.$store.state.projectSn,
-      // }).then((result) => {
-      //   if (result.success) {
-      //     this.tableData = result.result.records
-      //     this.pagInfo.total = result.result.total
-      //   }
-      // })
-      this.tableData = [
-        {fileName: '1',pbulicStatus: '1',uploadTime: '2024-04-30 00:00:00'},
-        {fileName: '2',pbulicStatus: '0',uploadTime: '2024-04-30 00:00:00'},
-        {fileName: '3',pbulicStatus: '1',uploadTime: '2024-04-30 00:00:00'},
-        {fileName: '4',pbulicStatus: '0',uploadTime: '2024-04-30 00:00:00'},
-        {fileName: '5',pbulicStatus: '1',uploadTime: '2024-04-30 00:00:00'},
-      ]
+      pageExamRegulationApi({
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        projectSn: this.$store.state.projectSn,
+      }).then((result) => {
+        if (result.success) {
+          this.tableData = result.result.records
+          this.pagInfo.total = result.result.total
+        }
+      })
+      // this.tableData = [
+      //   {name: '1',isEnable: true,uploadTime: '2024-04-30 00:00:00'},
+      //   {name: '2',isEnable: false,uploadTime: '2024-04-30 00:00:00'},
+      //   {name: '3',isEnable: true,uploadTime: '2024-04-30 00:00:00'},
+      //   {name: '4',isEnable: false,uploadTime: '2024-04-30 00:00:00'},
+      //   {name: '5',isEnable: true,uploadTime: '2024-04-30 00:00:00'},
+      // ]
+    },
+    testMethod(){
+      console.log('==========Upload==========',this.$store.state.UPLOADURL)
     },
-
     add() {
       this.title = '新增'
       this.dialogShow = true
@@ -225,8 +233,9 @@ export default {
       this.getList()
     },
     handleSuccess(res, file) {
+      console.log('===========回调结果===========',res)
+      console.log('===========文件===========',file)
       if (res.status == 'SUCCESS') {
-
         this.fileList.push({
           name: file.name,
           url: this.$store.state.FILEURL + file.response.data[0].imageUrl
diff --git a/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue b/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue
index ab7d00a4..e0b5ad7f 100644
--- a/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue
+++ b/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue
@@ -3,7 +3,7 @@
   <div class="fullHeight">
     <div v-if="type != 'detail'" style="height: 100%;">
       <div class="searchBox whiteBlock">
-        <el-form :inline="true" size="medium" :model="queryInfo" class="demo-form-inline">
+        <el-form :inline="true" size="medium" 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>
@@ -12,13 +12,13 @@
       </div>
       <div class="table_wrap whiteBlock">
         <vue-scroll>
-          <el-table height="650" class="tables" :data="listData1" lazy row-key="id" :tree-props="{ children: 'children' }"
+          <el-table height="240" class="tables" style="min-height:664px" :data="listData" 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 align="center" prop="name" label="科目类别名称" ></el-table-column> -->
             <!-- <el-table-column prop="processName" label="工序名称"> -->
-            <el-table-column prop="subjectName" width="200" label="科目类别"></el-table-column>
+            <el-table-column prop="name" width="200" label="科目类别"></el-table-column>
             <el-table-column></el-table-column>
-            <el-table-column width="200" label="操作" align="center">
+            <el-table-column width="240" 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">
                   新增
@@ -33,15 +33,14 @@
             </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>
       </div>
       <!-- '新增父子级工程弹框' -->
       <el-dialog :modal-append-to-body="false" :title="title" :visible.sync="dialogVisible" width="667px" @close="close">
         <div class="dialog_content">
           <el-form ref="addEditForm" label-width="145px" size="medium" class="dialogFormBox" 
           :rules="addEditRules" :model="subjectInfo">
-            <el-form-item label="科目类别" prop="subjectName">
-              <el-input v-model="subjectInfo.subjectName" placeholder="请输入"></el-input>
+            <el-form-item label="科目类别" prop="name">
+              <el-input v-model="subjectInfo.name" placeholder="请输入"></el-input>
             </el-form-item>
           </el-form>
         </div>
@@ -57,10 +56,13 @@
 </template>
   <script>
 import {
-  rtRiskInventoryTypePage,
-} from '@/assets/js/api/examSystem/subjectManagement'
+  addExamSubjectApi,
+  deleteExamSubjectApi,
+  editExamSubjectApi,
+  listExamSubjectApi,
+  listTreeExamSubjectApi,
+} from '@/assets/js/api/examSystem/examSystem'
 
-// import { getCrewListDataApi } from '@/assets/js/api/dailyCheck'
 export default {
   mounted() {},
   data() {
@@ -68,97 +70,45 @@ export default {
       listData1: [
         {
           id: '1',
-          subjectName: '科目名称1',
+          name: '科目名称1',
           parentId: '0',
           children: [
-            { id: '4', subjectName: '科目名称11', parentId: '1', children: [{id: '10', subjectName: '科目名称111', parentId: '4'}]},
-            { id: '5', subjectName: '科目名称21', parentId: '1' },
+            { id: '4', name: '科目名称11', parentId: '1', children: [{id: '10', name: '科目名称111', parentId: '4'}]},
+            { id: '5', name: '科目名称21', parentId: '1' },
           ],
         },
         {
           id: '2',
-          subjectName: '科目名称2',
+          name: '科目名称2',
           parentId: '0',
           children: [
-            { id: '6', subjectName: '科目名称21', parentId: '2' },
-            { id: '7', subjectName: '科目名称22', parentId: '2' },
+            { id: '6', name: '科目名称21', parentId: '2' },
+            { id: '7', name: '科目名称22', parentId: '2' },
           ],
         },
         {
           id: '3',
-          subjectName: '科目名称3',
+          name: '科目名称3',
           parentId: '0',
           children: [
-            { id: '8', subjectName: '科目名称31', parentId: '3' },
-            { id: '9', subjectName: '科目名称32', parentId: '3' },
+            { id: '8', name: '科目名称31', parentId: '3' },
+            { id: '9', name: '科目名称32', parentId: '3' },
           ],
         },
       ],
-      fullscreenLoading: false,
-      rowData: {},
-      parentTaskName: '', // 用于存储父级processName
-      options: [
-        {
-          label: '未开始',
-          value: 0,
-        },
-        {
-          label: '进行中',
-          value: 1,
-        },
-        {
-          label: '已完成',
-          value: 2,
-        },
-        // {
-        //   label: '已逾期',
-        //   value: 3
-        // },
-      ],
-      pagInfo: {
-        pageNo: 1, //页数
-        pageSize: 10, //条数
-        total: 0, //总条数
-      },
-      radio: 1,
-      uploadShow: false, //导入弹框
       title: '',
-      daterange: [],
-      fileList: [], //上传文件
-      downUrl: '', //下载文件地址
       projectSn: '',
-      createUserId: '',
       listData: [],
-      uploadUrl: '',
-      fileUrl: '',
       dialogVisible: false, //新增弹窗
-      workerInfo: {
-        code: '',
-        keyFactorsInRiskControl: '',
-        level: 0,
-        name: '',
-        parentId: 0,
-        precaution: '',
-        processName: '',
-        projectSn: '',
-        riskAssessmentValueD: '',
-        riskLevel: '',
-        riskPossibleConsequence: '',
-      },
       subjectInfo: {
-        subjectName: '',
+        name: '',
         parentId: '0',
-        opType: ''
       },
-      principalLsit: [], //负责人
-      seedId: '',
+      opType: '',
       showTime: false, //工期
-      queryInfo: {
-        code: '',
-      },
       type: 'add',
       addEditRules: {
-        subjectName: [
+        name: [
           {
             required: true,
             message: this.$t('message.personnelPosition.required'),
@@ -166,141 +116,43 @@ export default {
           },
         ],
       },
-      dialogImageUrl: '',
-      showBigImg: false,
-      times: '',
-      // 时间限制
-      pickerOptions: {
-        // 对象
-        disabledDate: (time) => {
-          let nowData = this.times
-          nowData = new Date(nowData.setDate(nowData.getDate() - 1))
-          return time > nowData
-          // return time.getTime() < Date.now()- 1 * 24 * 3600 * 1000;
-        },
-      },
-      fileName: '',
+      userInfo: {}
     }
   },
   computed: {
-    headers() {
-      return { Authorization: this.$store.state.userInfo.token }
-    },
-    dateAfter() {
-      // 动态起始时间
-      const startTimestamp = Date.now() * 1 - 24 * 60 * 60 * 1000
-      const endTimestamp =
-        Date.parse(this.workerInfo.finishDate) * 1 - 24 * 60 * 60 * 1000
-      return {
-        disabledDate(time) {
-          const timestamp = time.getTime()
-          if (endTimestamp) {
-            if (timestamp >= startTimestamp && timestamp <= endTimestamp) {
-              return false
-            } else {
-              return true
-            }
-          } else {
-            return timestamp <= startTimestamp
-          }
-        },
-      }
-    },
-    dateBefore() {
-      // 动态起始时间
-      // const startTimestamp = Date.parse(this.workerInfo.startDate)
-      const specifiedDate = new Date(this.workerInfo.startDate) // 指定的日期
-      const prevDay = new Date(specifiedDate) // 创建一个新的 Date 对象，使用同样的日期
-      prevDay.setDate(specifiedDate.getDate() - 1) // 将日期设置为前一天的日期
-
-      const lastTime = prevDay.getTime() // 获取前一天的时间戳
-      // const startTimestamp = new Date(this.workerInfo.startDate)
-      return {
-        disabledDate(time) {
-          const timestamp = time.getTime()
-          if (timestamp > lastTime) {
-            // console.log("计划结束时间",startTimestamp,timestamp)
-            return false
-          }
-          return true
-        },
-      }
-    },
-    actualDateBefore() {
-      // 动态起始时间
-      // const startTimestamp = Date.parse(this.workerInfo.startDate)
-      const specifiedDate = new Date(this.workerInfo.actualStartDate) // 指定的日期
-      const prevDay = new Date(specifiedDate) // 创建一个新的 Date 对象，使用同样的日期
-      prevDay.setDate(specifiedDate.getDate() - 1) // 将日期设置为前一天的日期
-
-      const lastTime = prevDay.getTime() // 获取前一天的时间戳
-      // const startTimestamp = new Date(this.workerInfo.startDate)
-      return {
-        disabledDate(time) {
-          const timestamp = time.getTime()
-          if (timestamp > lastTime) {
-            // console.log("计划结束时间",startTimestamp,timestamp)
-            return false
-          }
-          return true
-        },
-      }
-    },
+    
   },
-
   created() {
     this.projectSn = this.$store.state.projectSn
-    this.createUserId = this.$store.state.userInfo.userId
-    this.uploadUrl = this.$store.state.UPLOADURL
-    this.fileUrl = this.$store.state.FILEURL
-    this.downUrl =
-      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())
+    // this.createUserId = this.$store.state.userInfo.userId
+    // this.uploadUrl = this.$store.state.UPLOADURL  //上传地址
+    // this.fileUrl = this.$store.state.FILEURL  //文件地址
+    // this.downUrl = this.$http.defaults.baseURL + 'xmgl/progressTask/downloadTemplate' //下载地址
+    this.getExamSubjectList()
+    this.testMethod()
   },
   methods: {
+    testMethod(){
+      this.userInfo = this.$store.state.userInfo,
+      console.log('==========userInfo==========',this.userInfo)
+    },
     handleCancel(){
       this.dialogVisible = false
       this.clearObj()
     },
     clearObj(){
-      this.subjectInfo.subjectName = ''
-      // this.subjectInfo.parentId = '0'
-    },
-    //导入确定提交
-    handleUploadConfirm() {
-      if (this.fileName == '') {
-        this.$message.warning('请先上传文件')
-        return
-      } else {
-        this.uploadShow = false
-        this.$message.success('操作成功')
-        this.getProgressListData()
-      }
-    },
-    handleRadioChange(val) {
-      this.radio = val
+      this.subjectInfo = {}
     },
     //获取列表数据
-    getProgressListData() {
+    getExamSubjectList() {
       let data = {
-        projectSn: this.projectSn,
-        pageNo: this.pagInfo.pageNo,
-        pageSize: this.pagInfo.pageSize,
-        code: this.queryInfo.code,
-        // processName: this.queryInfo.processName,
-        // status: this.queryInfo.status,
-        // actualFinishDate_begin: this.queryInfo.actualStartDate,
-        // actualFinishDate_end: this.queryInfo.actualFinishDate
+        sn: this.projectSn,
       }
-      rtRiskInventoryTypePage(data).then((res) => {
+      listTreeExamSubjectApi(data).then((res) => {
+      // listExamSubjectApi(data).then((res) => {
         if (res.code == 200) {
-          this.listData = res.result.records
-          this.pagInfo.total = res.result.total
+          this.listData = res.result
+          console.log('==========考试科目列表==========',this.listData)
         }
       })
     },
@@ -308,11 +160,11 @@ export default {
     addBefore(addType, value) {
       if (addType == 1) {
         this.title = '新增科目类别'
-        this.subjectInfo.opType = '1'
+        this.opType = '1'
       } else {
         console.log('新增子科目类别', value)
         this.title = '新增子科目类别'
-        this.subjectInfo.opType = '2'
+        this.opType = '2'
         this.subjectInfo.parentId = value.id
       }
       this.dialogVisible = true
@@ -321,11 +173,14 @@ export default {
     editBefore(value) {
       this.title = '编辑科目类别'
       console.log('当前点击的行', value)
-      this.subjectInfo.parentId = value.id
-      this.subjectInfo.opType = '3'
+      this.subjectInfo = value
+      // this.subjectInfo.id = value.id
+      // this.subjectInfo.name = value.name
+      // this.subjectInfo.parentId = value.id
+      this.opType = '3'
       this.dialogVisible = true
     },
-    //编辑
+    // 添加/编辑
     submitBtn() {
       this.$refs.addEditForm.validate((valid) => {
         if (valid) {
@@ -333,39 +188,39 @@ export default {
           // let data = JSON.parse(JSON.stringify(this.subjectInfo))
           let data = this.subjectInfo
           data.projectSn = this.$store.state.projectSn
-          if (data.opType === '1') {
-            console.log('提交表单1', this.subjectInfo)
-            // rtRiskInventoryTypeAdd(data).then((res) => {
-            //   if (res.code == 200) {
-            //     this.$message.success(res.message)
-            this.clearObj()
+          if (this.opType === '1') {
+            console.log('==========添加科目1==========',this.subjectInfo)
+            addExamSubjectApi(data).then((res) => {
+              if (res.code == 200) {
+                this.getExamSubjectList()
                 this.dialogVisible = false
-            //     this.getProgressListData()
-            //   }
-            // })
-          } else if (data.opType === '2') {
-            console.log('提交表单2', this.subjectInfo)
-            // data.id = this.workerInfo.id
-            // rtRiskInventoryTypeEdit(data).then((res) => {
-            //   if (res.code == 200) {
-            //     this.$message.success(res.message)
-            this.clearObj()
+                this.clearObj()
+                this.$message({
+                  type: 'success',
+                  message: '添加成功',
+                })
+              }
+            })
+          } else if (this.opType === '2') {
+            console.log('==========添加科目2==========',this.subjectInfo)
+            addExamSubjectApi(data).then((res) => {
+              if (res.code == 200) {
+                this.getExamSubjectList()
                 this.dialogVisible = false
-            //     this.getProgressListData()
-            //   }
-            // })
-          } else if (data.opType === '3') {
+                this.clearObj()
+              }
+            })
+          } else if (this.opType === '3') {
             console.log('提交表单3', this.subjectInfo)
-            // data.parentId = this.workerInfo.parentId
-            // data.level = 2
-            // rtRiskInventoryTypeAdd(data).then((res) => {
-            //   if (res.code == 200) {
-            //     this.$message.success(res.message)
-            this.clearObj()
+            // data.parentId = this.subjectInfo.parentId
+            editExamSubjectApi(data).then((res) => {
+              if (res.code == 200) {
+                this.$message.success(res.message)
+                this.clearObj()
                 this.dialogVisible = false
-            //     this.getProgressListData()
-            //   }
-            // })
+                this.getExamSubjectList()
+              }
+            })
           }
         } else {
           return false
@@ -387,15 +242,15 @@ export default {
           let data = {
             id: value.id,
           }
-          // rtRiskInventoryTypeDelete(data).then((res) => {
-          //   if (res.code == 200) {
-          //     this.$message({
-          //       type: 'success',
-          //       message: this.$t('message.quality.successfullyDelete') + '!',
-          //     })
-          //     this.getProgressListData()
-          //   }
-          // })
+          deleteExamSubjectApi(data).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                type: 'success',
+                message: this.$t('message.quality.successfullyDelete') + '!',
+              })
+              this.getExamSubjectList()
+            }
+          })
         })
         .catch(() => {})
     },
@@ -406,129 +261,6 @@ export default {
         this.$refs.addEditForm.clearValidate()
       })
     },
-    close2() {
-      this.fileName = ''
-      this.radio = 1
-    },
-    //刷新
-    refreshBtn() {
-      this.daterange = []
-      this.pagInfo.pageNo = 1
-      this.pagInfo.pageSize = 10
-      this.queryInfo = {
-        status: '',
-        actualStartDate: '',
-        actualFinishDate: '',
-        processName: '',
-      }
-      this.getProgressListData()
-    },
-    SizeChange(val) {
-      this.pagInfo.pageSize = val
-      this.getProgressListData()
-    },
-    CurrentChange(val) {
-      this.pagInfo.pageNo = val
-      this.getProgressListData()
-    },
-    //关闭详请组件
-    closeDetailFn(val) {
-      this.type = val
-      this.getProgressListData()
-    },
-    changeDate() {
-      if (this.daterange) {
-        this.queryInfo.actualStartDate = this.daterange[0]
-        this.queryInfo.actualFinishDate = this.daterange[1]
-      } else {
-        this.queryInfo.actualStartDate = ''
-        this.queryInfo.actualFinishDate = ''
-      }
-    },
-    validateInput() {
-      let value = parseInt(this.workerInfo.progressRatio, 10)
-      if (
-        isNaN(value) ||
-        value < 0 ||
-        value > 100 ||
-        Math.floor(value) !== value
-      ) {
-        this.workerInfo.progressRatio = ''
-      }
-    },
-    time1(val) {
-      console.log('开始时间', val)
-      this.times = val
-    },
-    time2(val) {
-      console.log('结束时间', val)
-    },
-    // 下载模板
-    handleSuccess(res, file) {
-      console.log(res)
-      this.$refs.upload.clearFiles()
-      this.fullscreenLoading = false
-      if (res.code == 200 || res.code == 0) {
-        this.$message.success(
-          this.$t('message.safeMangeCheck.toLeadSuccess') + '!'
-        )
-        this.getProgressListData()
-      } else {
-        this.$message.error(this.$t('message.safeMangeCheck.toLeadFail') + '!')
-      }
-    },
-    beforeAvatarUpload() {
-      this.fullscreenLoading = true
-    },
-    downloadFn() {
-      fetch(
-        this.$http.defaults.baseURL +
-          'xmgl/rtRiskInventoryType/downloadExcelTemplate',
-        {
-          headers: {
-            Authorization: this.$store.state.userInfo.token,
-          },
-        }
-      )
-        .then((response) => {
-          // 处理响应
-          if (!response.ok) {
-            throw new Error('导出失败')
-          }
-          return response.blob()
-        })
-        .then((blob) => {
-          console.log('导出成功')
-          // 创建一个下载链接
-          const url = window.URL.createObjectURL(blob)
-          // 创建一个<a>元素
-          const link = document.createElement('a')
-          link.href = url
-          link.download = '风险清册导入模板.xlsx' // 指定下载文件的文件名
-          // 模拟点击下载链接
-          document.body.appendChild(link)
-          link.click()
-          document.body.removeChild(link)
-          // 释放URL对象
-          window.URL.revokeObjectURL(url)
-          // 处理导出的文件
-          // 这里可以使用blob对象来获取导出的文件内容或者将其保存到本地
-        })
-        .catch((error) => {
-          // 处理错误
-          console.error(error)
-        })
-    },
-    //
-    beforeUpload(file) {
-      console.log('=========', file)
-      this.fileName = file.name
-    },
-    // 上传mpp文件触发
-    handleImportChange(file, fileList) {
-      console.log('=[====]')
-      // console.log((file, fileList))
-    },
   },
 }
 </script>