diff --git a/supervise-risk-ui/src/api/Risk/index.js b/supervise-risk-ui/src/api/Risk/index.js
index faa0f8bc..3a738ff0 100644
--- a/supervise-risk-ui/src/api/Risk/index.js
+++ b/supervise-risk-ui/src/api/Risk/index.js
@@ -58,4 +58,43 @@ export default {
         method: 'get',
       })
   },
+    // 通过sid删除风险类别的数据
+    delriskType: function(sid) {
+      return request({
+          url: '/v1/riskType/del/' + sid,
+          method: 'get',
+        })
+    },
+     // 查询所有风险等级
+     selectRiskLevel: function() {
+       return request({
+         url: '/v1/riskLevel/selectRiskLevel',
+         method: 'get',
+       })
+     },
+     // 查询所有风险等级
+     selectType: function() {
+       return request({
+         url: '/v1/riskType/select',
+         method: 'get',
+       })
+     },
+      
+    // 保存风险指标
+    saveRiskIndicator: function(params) {
+      return request({
+        url: '/v1/riskIndicators/saveRiskIndicator',
+        method: 'post',
+        data: params
+      })
+    },
+
+      // 查询分页列表
+   riskIndicatorsListPage: function(params) {
+    return request({
+      url: '/v1/riskIndicators/listPage',
+      method: 'post',
+      data: params
+    })
+  },
 }
diff --git a/supervise-risk-ui/src/router/modules/codemenu.js b/supervise-risk-ui/src/router/modules/codemenu.js
index 1cb23dab..300b5cb5 100644
--- a/supervise-risk-ui/src/router/modules/codemenu.js
+++ b/supervise-risk-ui/src/router/modules/codemenu.js
@@ -77,7 +77,7 @@ const codemenu = [{
   component: Layout,
   redirect: '/RiskManage/category',
   meta: {
-    title: '工商风险'
+    title: '风险管理'
   },
   children: [{
     path: '/RiskManage/category',
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
new file mode 100644
index 00000000..18279fce
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
@@ -0,0 +1,304 @@
+<template>
+	<div>
+		<!-- 标题按钮部分开始 -->
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>{{ viewTitle }}</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+		<!-- 标题按钮部分结束 -->
+		<!-- Start 新增修改部分 -->
+		<div class="listconadd">
+			<el-form ref="form_obj">
+			<el-card class="box-card">
+			 <div class="wlInfo"><span>风险类别</span></div>
+             <div class="item">
+                <span class="item_text">编号：</span>
+				<el-input v-model="formobj.code" placeholder="类别编号" class="item_input" clearable />
+              </div>
+			  <div class="item">
+                <span class="item_text">指标名称：</span>
+                <el-input v-model="formobj.name" placeholder="类别名称" class="item_input" clearable />
+              </div>
+			  <div class="item"  >
+                <span class="item_text">风险程度：</span>
+                <el-select
+                    v-model="formobj.levelSid"
+                    class="item_input"
+                    placeholder="请选择风险等级名称"
+					@change="getType"
+                  >
+                    <el-option
+                      v-for="(item, i) in arrList"
+                      :key="i"
+                      :label="item.name"
+                      :value="item.sid"
+                    />
+                </el-select>
+              </div>
+			  <div class="item"  >
+                <span class="item_text">风险类别：</span>
+                <el-cascader ref="cascaderAddr" :options="options" :props="optionProps" v-model="selectedOptions" :show-all-levels="false" @change="handleChange3" class="item_input"></el-cascader>
+              </div>
+              <div class="item">
+                <span class="item_text">指标说明：</span>
+				<el-input v-model="formobj.content" placeholder="分类说明" class="item_input" clearable />
+              </div>
+              <div class="item"  >
+                <span class="item_text">报送单位：</span>
+                <el-select
+                    v-model="formobj.reportTarget"
+                    class="item_input"
+                    placeholder="请选择报送单位"
+                  >
+                    <el-option
+                      v-for="(item, i) in plable"
+                      :key="i"
+                      :label="item.type"
+                      :value="item.value"
+                    />
+                </el-select>
+              </div>
+              <div class="item" style="height: 110px;">
+                <span class="item_text">备注信息：</span>
+                <el-input  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 6 }" v-model="formobj.remarks"  class="item_input" placeholder="备注信息" />
+              </div>
+			</el-card>
+		</el-form>
+		</div>
+		<!-- End 添加修改部分 -->
+	</div>
+</template>
+
+<script>
+import req from '@/api/Risk/index'
+export default {
+	name: 'DispatchStandardsAdd',
+	data() {
+		return {
+			submitdisabled: false,
+			viewTitle: '',
+			viewState: 1,
+			arrLists: [],
+			arrList: [],
+			rangeArr: [],
+			option: [],
+			options: [],
+			hierarchys: false,
+			formobj: {
+				name: '', 
+				code: '', 
+				content: '', 
+				levelSid: '', 
+                levelCode: '', 
+				levelName: '', 
+				typeCode:'',
+				typeName:'',
+				typeSid:'',
+                remarks:'',
+                reportTarget:''
+			},
+			rules: {
+				name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '风险等级代码不能为空', trigger: 'blur' }], 
+				content: [{ required: true, message: '分类说明不能为空', trigger: 'blur' }], 
+				reportTarget: [{ required: true, message: '报送单位不能为空', trigger: 'blur' }], 
+			},
+            optionProps: {
+				value: 'code',
+				label: 'name',
+				children: 'down',
+				expandTrigger: 'hover',
+			},
+            plable: [{value:1,type:'监管公司'},{value:2,type:'贷款支行'},{value:3,type:'总行'}],
+            selectedOptions: [], //配送选择值
+		}
+	},
+	created() {
+        this.superior()
+        this.selectTypes()
+    },
+	methods: {
+		handleReturn(isreload) {
+			if (isreload === 'true') this.$emit('reloadlist')
+			this.formobj.sid = '' 
+			this.formobj.name= '', 
+			this.formobj.code= '', 
+			this.formobj.content= '', 
+			this.formobj.levelSid= '', 
+			this.formobj.levelCode= ''
+			this.formobj.levelName= ''
+			this.formobj.typeCode='',
+            this.formobj.typeName='',
+            this.formobj.typeSid='',
+            this.formobj.remarks='',
+            this.formobj.reportTarget='',
+			
+			this.$refs['form_obj'].resetFields()
+			this.$emit('doback')
+		},
+		showAdd() {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【新增】风险等级'
+			this.hierarchys= false
+		},
+		showEdit(row) {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【修改】风险等级'
+			this.hierarchys= true
+			const _this = this
+			const vdata = row
+			_this.formobj.id = vdata.id
+			_this.formobj.sid = vdata.sid 
+			_this.formobj.name = vdata.name 
+			_this.formobj.code = vdata.code 
+			_this.formobj.content = vdata.content 
+			_this.formobj.hierarchy = vdata.hierarchy 
+			_this.formobj.parentName = vdata.parentName
+			_this.formobj.parentSid = vdata.parentSid
+			_this.formobj.remarks = vdata.remarks 
+		},
+		saveOrUpdate() {
+			req
+			.saveRiskIndicator(this.formobj)
+				.then(resp => {
+					if (resp.success) {
+						this.$message({ showClose: true, type: 'success', message: resp.msg })
+						this.handleReturn('true')
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+			})
+		},
+        superior(){
+            req
+			.selectRiskLevel()
+				.then(resp => {
+                    if(resp.code==200){
+                        this.arrLists=resp.data					
+						for (var i = 0; i < this.arrLists.length; i++) {
+
+                            let item = {
+                              name: this.arrLists[i].name,
+                              sid: this.arrLists[i].sid,
+                            
+                            }
+                            this.arrList.push(item)
+                            }
+                    }
+			})
+        },
+        selectTypes(){
+            req
+			.selectType()
+				.then(resp => {
+                 if(resp.code==200){
+                 this.options=resp.data				
+                }
+			})
+        },
+		getType(value) {
+        const choose = this.arrLists.filter((item) => item.sid === value)
+        this.formobj.levelName = choose[0].name
+        this.formobj.levelCode = choose[0].code
+        this.formobj.levelSid = value
+      },
+      handleChange3(value) {
+            var getSId = this.$refs.cascaderAddr.getCheckedNodes()[0].data.sid
+            this.formobj.typeSid=getSId
+			var thsAreaCode = this.$refs.cascaderAddr.getCheckedNodes()[0].pathLabels;  //注意2： 获取label值
+			var len=value.length-1;
+			var lens=thsAreaCode.length-1;
+			this.formobj.typeCode=value[len];//这是最终修改后的要提交的选中后的数据值
+			this.formobj.typeName=thsAreaCode[lens];//这是最终修改后的要提交的选中后的数据值
+			this.$refs.cascaderAddr.toggleDropDownVisible();// 选择之后将下拉界面收起
+	},
+	},
+    watch: {
+        selectedOptions() {
+          if (this.$refs.cascaderAddr) {
+            this.$refs.cascaderAddr.dropDownVisible = false;
+            console.log(this.$refs.cascaderAddr,'cascader')
+          }
+        }
+      },
+}
+</script>
+
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+    padding-bottom: 50px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_left_input {
+        width: 20%;
+      }
+
+      .item_left_text {
+        height: 30px;
+        margin-left: 20px;
+        line-height: 30px;
+        color: #018AD2;
+        padding: 0px 15px;
+        border: 1.5px solid #018AD2;
+        border-radius: 5px;
+
+      }
+
+      .item_right {
+        flex: 1;
+        justify-items: center;
+
+        .item_right_list_text {
+          font-size: 16px;
+        }
+
+        .item_right_list_delect {
+          color: #5E94FF;
+          margin-left: 20px;
+          font-size: 16px;
+          text-decoration: underline;
+        }
+      }
+
+    }
+
+  }
+</style>
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue
index e97036e4..ae6f2078 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue
@@ -1,15 +1,292 @@
-.<template>
-    <div>
-      风险指标
-    </div>
-  </template>
-  
-  <script>
-  export default {
-  
-  }
-  </script>
-  
-  <style>
-  
-  </style>
\ No newline at end of file
+<template>
+	<div class="app-container">
+		<div v-show="viewState == 1">
+			<button-bar ref="btnbar" view-title="风险类别查询" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<div class="main-content">
+			<div class="searchcon">
+				<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
+				<div v-show="isSearchShow" class="search">
+					<el-form ref="queryParams" :model="queryParams.params"  :inline="true" class="tab-header">
+						<el-form-item label="客户名称"><el-input v-model="queryParams.params.custname" placeholder="请输入客户名称" clearable /></el-form-item>
+						<el-form-item label="工单名称"><el-input v-model="queryParams.params.ordername" placeholder="请输入工单名称" clearable /></el-form-item>
+						<div class="btn" style="text-align: center;">
+							<el-button type="primary" size="small" icon="el-icon-search"  @click="dosearch">查询</el-button>
+							<el-button type="primary" size="small" icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+						</div>
+					</el-form>
+				</div>
+			</div>
+			<!-- Start 项目列表头部 -->
+			<div class="listtop">
+				<div class="tit">风险指标列表</div>
+				<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+			</div>
+			<!-- End 项目列表头部 -->
+
+			<!-- Start 项目列表 -->
+			<div>
+				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" >
+					<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
+					<el-table-column prop="name" label="指标名称" align="center" />
+					<el-table-column prop="code" label="指标编码" align="center" />
+					<el-table-column prop="levelName" label="风险等级" align="center" />
+					<el-table-column prop="bigTypeName" label="风险类别" align="center" />
+					<el-table-column prop="typeName" label="风险小类" align="center" />
+					<el-table-column prop="content" label="分类说明" align="center" />
+					<!-- <el-table-column prop="hierarchy" :formatter="formatorderdegree"  label="层级" align="center" /> -->
+          <el-table-column prop="remarks" label="备注信息" align="center" />
+					<el-table-column fixed="right" label="操作"  align="center">
+                        <template slot-scope="scope">
+						   <el-tooltip class="item" effect="dark" content="编辑" placement="top-end">
+								<i  class="el-icon-edit-outline"  @click="toEdit(scope.row)"></i>
+                           </el-tooltip>
+						   <el-tooltip class="item" effect="dark" content="删除" placement="top">
+							<i  class="el-icon-delete"  @click="doDel(scope.row)"></i>
+                           </el-tooltip>
+						   <el-tooltip class="item" effect="dark" content="查看二级" placement="top-start">
+							<i  class="el-icon-notebook-2" @click="purchase(scope.row)"></i>
+                           </el-tooltip>
+               </template>
+             </el-table-column>
+				</el-table>
+			</div>
+			<!-- End 项目列表 -->
+			<div class="pages">
+				<div class="tit" />
+				<!--  翻页  -->
+				<pagination
+					v-show="dataList.length > 0"
+					:total="queryParams.total"
+					:page.sync="queryParams.current"
+					:limit.sync="queryParams.size"
+					class="pagination"
+					@pagination="loadList"
+				/>
+			</div>
+		</div>
+		</div>
+		<!-- End 查询和其列表部分 -->
+		<el-dialog
+          title="二级类别信息"
+          :visible.sync="drawer"
+          width="65%">
+		  <el-table v-loading="listLoading" :data="formobj" border style="width: 100%;"
+                :row-style="{height: '40px'}">
+                <!-- <el-table-column type="selection" align="center" width="50"/> -->
+                <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+                <el-table-column label="类别名称" width="120" prop="name" align="center" />
+                <el-table-column label="类别编号" width="160" prop="code" align="center" />
+                <el-table-column label="分类说明"  prop="content" align="center" />
+                <el-table-column label="层级" width="70" :formatter="formatorderdegree" prop="hierarchy" align="center" />
+                <el-table-column label="备注信息" width="200" prop="remarks" align="center" />
+				<el-table-column label="操作" wid align="center" width="200">
+                  <template slot-scope="scope">
+                    <!-- <el-button type="primary" size="mini" @click="toPersonnelDetail(scope.row.sid)">查看</el-button> -->
+                    <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+                    <el-button type="primary" size="mini" @click="doCommoditylDel(scope.row)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+        </el-dialog>
+		<!-- 新增修改部分组件 -->
+		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+	</div>
+</template>
+
+<script>
+import req from '@/api/Risk/index'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import divAdd from './RiskAdd'
+
+export default {
+	name: 'DispatchOrderinfoIndex',
+	components: {
+		ButtonBar,
+		Pagination,
+		pageye,
+		divAdd,
+	},
+	data() {
+		return {
+			btndisabled: false,
+			viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+			isSearchShow: false,
+			tableLoading: false,
+			drawer: false,
+			listLoading: false,
+			dataList: [],
+			queryParams: {
+				current: 1,
+				size: 10,
+				total: 0,
+				params: {
+                    
+				}
+			},
+			multipleSelection: [],
+			btnList: [
+                 {
+                  type: 'primary',
+                  size: 'small',
+                  icon: 'plus',
+                  btnKey: 'toAdd',
+                  btnLabel: '新增'
+                },
+                {
+                  type: 'info',
+                  size: 'small',
+                  icon: 'cross',
+                  btnKey: 'doClose',
+                  btnLabel: '关闭'
+                }
+              ],
+			size:'',
+			TableList:[],
+			formobj:[]
+		}
+	},
+	mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+	created() {
+		this.loadList()
+	},
+	methods: {
+		resetState() {
+			this.viewState = 1
+		},
+		btnHandle(btnKey) {
+			switch (btnKey) {
+				case 'toAdd':
+					this.toAdd()
+					break
+			   case 'doClose': // 关闭
+         this.doClose()
+         break
+				default:
+					break
+			}
+		},
+		toAdd() {
+			this.viewState = 2
+			this.$refs['divadd'].showAdd()
+		},
+		toEdit(row) {
+			this.viewState = 3
+			this.$refs['divadd'].showEdit(row)
+			this.drawer=false
+		},
+		doDel(row) {
+			const sids = []
+		    sids.push(row.sid)
+			const tip = '请确认是否是否删除该条记录?'
+			this.$confirm(tip, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					req
+						.delriskType(sids)
+						.then(resp => {
+							if (resp.success) {
+								this.$message({ type: 'success', message: resp.msg, showClose: true })
+								this.loadList()
+							} else {
+								// 根据resp.code进行异常情况处理
+							}
+						})
+				})
+				.catch(() => {})
+		},
+		dosearch() {
+			this.queryParams.current = 1
+			this.loadList()
+		},
+		resetQuery() {
+			this.queryParams.params = {}
+			this.queryParams.params.sid = '' // sid
+			this.queryParams.params.name = '' // 登录名
+			this.dosearch()
+		},
+		loadList() {
+			const _this = this
+			this.tableLoading = true
+			req
+				.riskIndicatorsListPage(this.queryParams)
+				.then(resp => {
+					_this.tableLoading = false
+					if (resp.success) { 
+						const data = resp.data
+						_this.queryParams.total = data.total
+						_this.dataList = data.records
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+					_this.tableLoading = false
+				})
+		},
+		// 序号
+		indexMethod(index) {
+			var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+			var pageindex = index + 1 + pagestart
+			return pageindex
+		},
+		doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+        },
+		purchase(row){	
+			this.drawer=true
+			req
+				.selectRiskTypeSubordinate(row.sid)
+				.then(resp => {
+					this.listLoading = false
+					if (resp.code==200) { 
+						this.formobj=resp.data
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+					this.listLoading = false
+				})
+		},
+        formatorderdegree: function( row, column) {
+         if(row.hierarchy === 1){
+             return '一级'
+         }else if(row.hierarchy === 2) {
+			return '二级'
+		 }else{
+			return ''
+		 }
+        },
+		doCommoditylDel(row){
+			req
+				.delriskType(row.sid)
+				.then(resp => {
+					if (resp.code==200) {
+						this.$message({ type: 'success', message: resp.msg, showClose: true })
+						this.drawer=false
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+		},
+	}
+}
+</script>
+<style scoped>
+.margin-top {
+  border-bottom: 1px solid #ebebeb;
+}
+.item {
+   margin: 6px;
+ }
+</style>
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskSet.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskSet.vue
index 87e6c14f..a45f5611 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/RiskSet.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskSet.vue
@@ -76,23 +76,6 @@
 			</div>
 		</div>
 		</div>
-		<!-- End 查询和其列表部分 -->
-		<el-drawer
-          title="汇总工单数据详情"
-          :visible.sync="drawer"
-          size="86%">
-		  <div class="main-content">
-		<el-descriptions class="margin-top" title="巡视工单信息" :column="5" :size="size">
-            <el-descriptions-item label="工单名称">{{ TableList.ordername }}</el-descriptions-item>
-            <el-descriptions-item label="工单编号">{{ TableList.orderno }}</el-descriptions-item>
-			<el-descriptions-item label="客户名称">{{ TableList.custname }}</el-descriptions-item>
-            <el-descriptions-item label="等级">{{ TableList.orderdegree }}</el-descriptions-item>
-            <el-descriptions-item label="工单内容">{{ TableList.ordercontent }}</el-descriptions-item>
-            <el-descriptions-item label="现场联系人">{{ TableList.receiveperson }}</el-descriptions-item>
-            <el-descriptions-item label="现场联系人电话">{{ TableList.receivetel }}</el-descriptions-item>
-          </el-descriptions>
-		</div>
-        </el-drawer>
 		<!-- 新增修改部分组件 -->
 		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
 	</div>
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/category.vue b/supervise-risk-ui/src/views/risk/RiskManage/category.vue
index d00adad2..25f2b2ef 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/category.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/category.vue
@@ -9,21 +9,6 @@
 					<el-form ref="queryParams" :model="queryParams.params"  :inline="true" class="tab-header">
 						<el-form-item label="客户名称"><el-input v-model="queryParams.params.custname" placeholder="请输入客户名称" clearable /></el-form-item>
 						<el-form-item label="工单名称"><el-input v-model="queryParams.params.ordername" placeholder="请输入工单名称" clearable /></el-form-item>
-						<el-form-item label="等级">
-						<el-select
-                          v-model="queryParams.params.orderdegree"
-                          class="addinputw"
-                          placeholder="等级"
-						  size="small"
-                        >
-                          <el-option
-                            v-for="(item, i) in arrList"
-                            :key="i"
-                            :label="item.type"
-                            :value="item.value"
-                          />
-                        </el-select>
-						</el-form-item>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"  @click="dosearch">查询</el-button>
 							<el-button type="primary" size="small" icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
@@ -78,22 +63,29 @@
 		</div>
 		</div>
 		<!-- End 查询和其列表部分 -->
-		<el-drawer
-          title="汇总工单数据详情"
+		<el-dialog
+          title="二级类别信息"
           :visible.sync="drawer"
-          size="86%">
-		  <div class="main-content">
-		<el-descriptions class="margin-top" title="巡视工单信息" :column="5" :size="size">
-            <el-descriptions-item label="工单名称">{{ TableList.ordername }}</el-descriptions-item>
-            <el-descriptions-item label="工单编号">{{ TableList.orderno }}</el-descriptions-item>
-			<el-descriptions-item label="客户名称">{{ TableList.custname }}</el-descriptions-item>
-            <el-descriptions-item label="等级">{{ TableList.orderdegree }}</el-descriptions-item>
-            <el-descriptions-item label="工单内容">{{ TableList.ordercontent }}</el-descriptions-item>
-            <el-descriptions-item label="现场联系人">{{ TableList.receiveperson }}</el-descriptions-item>
-            <el-descriptions-item label="现场联系人电话">{{ TableList.receivetel }}</el-descriptions-item>
-          </el-descriptions>
-		</div>
-        </el-drawer>
+          width="65%">
+		  <el-table v-loading="listLoading" :data="formobj" border style="width: 100%;"
+                :row-style="{height: '40px'}">
+                <!-- <el-table-column type="selection" align="center" width="50"/> -->
+                <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+                <el-table-column label="类别名称" width="120" prop="name" align="center" />
+                <el-table-column label="类别编号" width="160" prop="code" align="center" />
+                <el-table-column label="分类说明"  prop="content" align="center" />
+                <el-table-column label="层级" width="70" :formatter="formatorderdegree" prop="hierarchy" align="center" />
+                <el-table-column label="备注信息" width="200" prop="remarks" align="center" />
+				<el-table-column label="操作" wid align="center" width="200">
+                  <template slot-scope="scope">
+                    <!-- <el-button type="primary" size="mini" @click="toPersonnelDetail(scope.row.sid)">查看</el-button> -->
+                    <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+                    <el-button type="primary" size="mini" @click="doCommoditylDel(scope.row)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+        </el-dialog>
 		<!-- 新增修改部分组件 -->
 		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
 	</div>
@@ -121,6 +113,7 @@ export default {
 			isSearchShow: false,
 			tableLoading: false,
 			drawer: false,
+			listLoading: false,
 			dataList: [],
 			queryParams: {
 				current: 1,
@@ -130,8 +123,6 @@ export default {
                     
 				}
 			},
-			arr:[{value:1,type:'计划巡视'},{value:2,type:'专项巡视'},{value:3,type:'告警巡视'}],
-			arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}],
 			multipleSelection: [],
 			btnList: [
                  {
@@ -150,7 +141,8 @@ export default {
                 }
               ],
 			size:'',
-			TableList:[]
+			TableList:[],
+			formobj:[]
 		}
 	},
 	mounted() {
@@ -183,6 +175,7 @@ export default {
 		toEdit(row) {
 			this.viewState = 3
 			this.$refs['divadd'].showEdit(row)
+			this.drawer=false
 		},
 		doDel(row) {
 			const sids = []
@@ -195,7 +188,7 @@ export default {
 			})
 				.then(() => {
 					req
-						.delBySids(sids)
+						.delriskType(sids)
 						.then(resp => {
 							if (resp.success) {
 								this.$message({ type: 'success', message: resp.msg, showClose: true })
@@ -247,18 +240,42 @@ export default {
         this.$router.go(-1)
         },
 		purchase(row){	
-			// this.drawer=true
-            req.selectRiskTypeSubordinate(row.sid).then((res)=>{
-                console.log(res.data);
-            })
+			this.drawer=true
+			req
+				.selectRiskTypeSubordinate(row.sid)
+				.then(resp => {
+					this.listLoading = false
+					if (resp.code==200) { 
+						this.formobj=resp.data
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+					this.listLoading = false
+				})
 		},
         formatorderdegree: function( row, column) {
          if(row.hierarchy === 1){
              return '一级'
-         }else{
+         }else if(row.hierarchy === 2) {
+			return '二级'
+		 }else{
 			return ''
 		 }
         },
+		doCommoditylDel(row){
+			req
+				.delriskType(row.sid)
+				.then(resp => {
+					if (resp.code==200) {
+						this.$message({ type: 'success', message: resp.msg, showClose: true })
+						this.drawer=false
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+		},
 	}
 }
 </script>
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
index 2baf9e0f..c0c0c8b9 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
@@ -33,7 +33,7 @@
               </div>
 			  <div class="item">
                 <span class="item_text">层级：</span>
-                <el-input v-model="formobj.hierarchy" placeholder="请输入层级" @input="hierarchy($event)" class="item_input" clearable />
+                <el-input v-model="formobj.hierarchy" :disabled="hierarchys" placeholder="请输入层级(1/2)" @input="hierarchy($event)" class="item_input" clearable />
               </div>
 			  <div class="item" v-show="viewState == 2" >
                 <span class="item_text">上级名称：</span>
@@ -41,12 +41,13 @@
                     v-model="formobj.parentName"
                     class="item_input"
                     placeholder="请选择上级名称"
+					@change="getType"
                   >
                     <el-option
                       v-for="(item, i) in arrList"
                       :key="i"
                       :label="item.name"
-                      :value="item.name"
+                      :value="item.sid"
                     />
                 </el-select>
               </div>
@@ -71,7 +72,9 @@ export default {
 			submitdisabled: false,
 			viewTitle: '',
 			viewState: 1,
+			arrLists: [],
 			arrList: [],
+			hierarchys: false,
 			formobj: {
 				name: '', 
 				code: '', 
@@ -79,12 +82,13 @@ export default {
 				hierarchy: '', 
 				parentSid: '', 
 				parentName: '', 
-				remarks: '' 
+				remarks: '' ,
+				sid:''
 			},
 			rules: {
 				name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }],
 				code: [{ required: true, message: '风险等级代码不能为空', trigger: 'blur' }], 
-				handlingMethod: [{ required: true, message: '处理方式不能为空', trigger: 'blur' }], 
+				content: [{ required: true, message: '分类说明不能为空', trigger: 'blur' }], 
 				reportTarget: [{ required: true, message: '报送单位不能为空', trigger: 'blur' }], 
 			},
 		}
@@ -93,7 +97,6 @@ export default {
 	methods: {
 		handleReturn(isreload) {
 			if (isreload === 'true') this.$emit('reloadlist')
-			this.formobj.id = ''
 			this.formobj.sid = '' 
 			this.formobj.name= '', 
 			this.formobj.code= '', 
@@ -111,19 +114,24 @@ export default {
 				this.$refs['form_obj'].clearValidate()
 			})
 			this.viewTitle = '【新增】风险等级'
+			this.hierarchys= false
 		},
 		showEdit(row) {
 			this.$nextTick(() => {
 				this.$refs['form_obj'].clearValidate()
 			})
 			this.viewTitle = '【修改】风险等级'
+			this.hierarchys= true
 			const _this = this
 			const vdata = row
 			_this.formobj.id = vdata.id
 			_this.formobj.sid = vdata.sid 
 			_this.formobj.name = vdata.name 
 			_this.formobj.code = vdata.code 
-			_this.formobj.handlingMethod = vdata.handlingMethod 
+			_this.formobj.content = vdata.content 
+			_this.formobj.hierarchy = vdata.hierarchy 
+			_this.formobj.parentName = vdata.parentName
+			_this.formobj.parentSid = vdata.parentSid
 			_this.formobj.remarks = vdata.remarks 
 		},
 		saveOrUpdate() {
@@ -145,19 +153,36 @@ export default {
 			.selectRiskTypeFirst()
 				.then(resp => {
                     if(resp.code==200){
-                        this.arrList=resp.data
-                        this.formobj.parentSid=resp.data[0].sid
+                        this.arrLists=resp.data					
+						for (var i = 0; i < this.arrLists.length; i++) {
+
+                            let item = {
+                              name: this.arrLists[i].name,
+                              sid: this.arrLists[i].sid,
+                            
+                            }
+                            this.arrList.push(item)
+                            }
                     }
 			})
         },
         hierarchy(e){
            if(e==2){
             this.viewState=2
-            this.superior()
+			this.superior()
            }else{
             this.viewState=1
+			this.sid=null
+			this.parentSid=null
+			this.parentName=null
            }
         },
+		getType(value) {
+        const choose = this.arrLists.filter((item) => item.sid === value)
+        this.formobj.parentName = choose[0].name
+        this.formobj.parentSid = value
+		console.log( this.formobj.parentSid);
+      },
 	}
 }
 </script>