From 4d482d7ce36f1e779677cdaef0475b5a2030e31b Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 02 六月 2022 13:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
index a2ddbbb..57b9f9b 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -30,6 +30,7 @@
             </div>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showAnalyseUnitForm('','新增')">新增</el-button>
+            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showDepartmentChart()">图表</el-button>
         </div>
         <div class="table_content">
             <el-table
@@ -82,23 +83,14 @@
         <el-dialog :title="title" :visible.sync="analyseUnitVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
             <el-form ref="analyseUnitForm" :rules="analyseUnitFormRules" :model="analyseUnitForm" label-position="right" label-width="165px">
                 <el-form-item label="责任部门" prop="hazardDep">
-                    <el-row>
-                        <el-col :span="21">
-                            <el-select v-model="analyseUnitForm.hazardDep" value-key="item" class="analyseUnit_input" @change="departmentChange" @clear="departmentClear">
-                                <el-option
-                                    v-for="item in departmentList"
-                                    :key="item.id"
-                                    :value="item"
-                                    :label="item.department"
-                                ></el-option>
-                            </el-select>
-                        </el-col>
-                        <el-col :span="3">
-                            <img src="../../../../assets/map.png" class="image" @click="showDepartmentChart"></img>
-                        </el-col>
-                    </el-row>
-
-
+                    <el-select v-model="analyseUnitForm.hazardDep" value-key="item" class="analyseUnit_input" @change="departmentChange" @clear="departmentClear">
+                        <el-option
+                            v-for="item in departmentList"
+                            :key="item.id"
+                            :value="item"
+                            :label="item.department"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="责任人" prop="hazardLiablePerson">
                     <el-select v-model="analyseUnitForm.hazardLiablePerson" value-key="item" class="analyseUnit_input"@change="personChange" @clear="personClear" >

--
Gitblit v1.9.2