xiaojincai 5 years ago
parent
commit
3282a4a1a1

+ 13 - 5
src/views/company/Company.vue

@@ -71,13 +71,21 @@
                 label="时间">
                 </el-table-column>
                 <el-table-column fixed="right"
-                prop="zip"  width="320"
+                prop="zip"  width="160"
                 label="操作">
                 <template slot-scope="scope">
-                    <el-button icon="el-icon-view" size="mini" @click="$router.push({path:'/monitjob',query:{id:scope.row.id}})"  type="success">查看巡检记录</el-button>
-                    <el-button icon="el-icon-view" size="mini" @click="detail(scope.row.id)"  type="success">查看</el-button>
-                    <el-button icon="el-icon-edit" @click="$router.push({path:'/company/add',query:{id:scope.row.id}})" size="mini" type="warning">编辑</el-button>
-                    <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
+                    <el-tooltip class="item" effect="dark" content="查看巡检记录" placement="top-start">
+                        <el-button icon="el-icon-document" size="mini" @click="$router.push({path:'/monitjob',query:{id:scope.row.id}})"  type="success"></el-button>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
+                        <el-button icon="el-icon-view" size="mini" @click="detail(scope.row.id)"  type="success"></el-button>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
+                        <el-button icon="el-icon-edit" @click="$router.push({path:'/company/add',query:{id:scope.row.id}})" size="mini" type="warning"></el-button>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                        <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger"></el-button>
+                    </el-tooltip>
                 </template>
                 </el-table-column>
         </el-table>

+ 10 - 4
src/views/company/Department.vue

@@ -93,12 +93,18 @@
                         label="时间">
                         </el-table-column>
                         <el-table-column fixed="right"
-                        prop="zip"  width="230"
+                        prop="zip"  width="120"
                         label="操作">
                         <template slot-scope="scope">
-                            <el-button  @click="viewStaff(scope.row.id)" size="mini" type="warning">查看员工</el-button>
-                            <el-button icon="el-icon-edit" @click="edit(scope.row)" size="mini" type="warning">编辑</el-button>
-                            <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
+                            <el-tooltip class="item" effect="dark" content="查看员工" placement="top-start">
+                                <el-button icon="el-icon-view"  @click="viewStaff(scope.row.id)" size="mini" type="warning"></el-button>
+                            </el-tooltip>
+                            <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
+                                <el-button icon="el-icon-edit" @click="edit(scope.row)" size="mini" type="warning"></el-button>
+                            </el-tooltip>
+                            <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                                <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger"></el-button>
+                            </el-tooltip>
                         </template>
                         </el-table-column>
                 </el-table>

+ 7 - 3
src/views/company/Staff.vue

@@ -105,11 +105,15 @@
                         label="时间">
                         </el-table-column>
                         <el-table-column fixed="right"
-                        prop="zip"  width="150"
+                        prop="zip"  width="85"
                         label="操作">
                         <template slot-scope="scope">
-                            <el-button icon="el-icon-edit" @click="edit(scope.row)" size="mini" type="warning">编辑</el-button>
-                            <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
+                            <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
+                                <el-button icon="el-icon-edit" @click="edit(scope.row)" size="mini" type="warning"></el-button>
+                            </el-tooltip>
+                            <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                                <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger"></el-button>
+                            </el-tooltip>
                         </template>
                         </el-table-column>
                 </el-table>

+ 7 - 3
src/views/message/Index.vue

@@ -58,11 +58,15 @@
                 </template> -->
                 </el-table-column>
                 <el-table-column fixed="right"
-                prop="zip"  width="220"
+                prop="zip"  width="85"
                 label="操作">
                 <template slot-scope="scope">
-                    <el-button icon="el-icon-view" @click="open(scope.row)" size="mini"  type="success">查看</el-button>
-                    <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
+                    <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
+                        <el-button icon="el-icon-view" @click="open(scope.row)" size="mini"  type="success"></el-button>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                        <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger"></el-button>
+                    </el-tooltip>
                 </template>
                 </el-table-column>
         </el-table>

+ 7 - 3
src/views/message/System.vue

@@ -54,11 +54,15 @@
                 </template> -->
                 </el-table-column>
                 <el-table-column fixed="right"
-                prop="zip"  width="220"
+                prop="zip"  width="85"
                 label="操作">
                 <template slot-scope="scope">
-                    <el-button icon="el-icon-view" @click="open(scope.row.title,scope.row.content)" size="mini"  type="success">查看</el-button>
-                    <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
+                    <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
+                        <el-button icon="el-icon-view" @click="open(scope.row.title,scope.row.content)" size="mini"  type="success"></el-button>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                        <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger"></el-button>
+                    </el-tooltip>
                 </template>
                 </el-table-column>
         </el-table>

+ 7 - 3
src/views/message/WarningList.vue

@@ -114,11 +114,15 @@
                         </template> -->
                         </el-table-column>
                         <el-table-column fixed="right"
-                        prop="zip"  width="220"
+                        prop="zip"  width="85"
                         label="操作">
                         <template slot-scope="scope">
-                            <el-button icon="el-icon-view" @click="open(scope.row.title,scope.row.content)" size="mini"  type="success">查看</el-button>
-                            <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
+                            <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
+                                <el-button icon="el-icon-view" @click="open(scope.row.title,scope.row.content)" size="mini"  type="success"></el-button>
+                            </el-tooltip>
+                            <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                                <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger"></el-button>
+                            </el-tooltip>
                         </template>
                         </el-table-column>
                 </el-table>

+ 17 - 11
src/views/task/DangerTask.vue

@@ -177,12 +177,16 @@
                                 <el-table-column prop="cycle" label="管控周期"></el-table-column>
                             </el-table-column>
                             <el-table-column fixed="right"
-                            prop="zip"  width="150" v-if="utype!=2"
+                            prop="zip"  width="85" v-if="utype!=2"
                             label="操作">
                             <template slot-scope="scope">
                                 <!-- <el-button icon="el-icon-view" size="mini"  type="success">查看</el-button> -->
-                                <el-button icon="el-icon-edit" @click="change(scope.row)" size="mini" type="warning">编辑</el-button>
-                                <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
+                                <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
+                                    <el-button class="123123" icon="el-icon-edit" @click="change(scope.row)" size="mini" type="warning"></el-button>
+                                </el-tooltip>
+                                <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                                    <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger"></el-button>
+                                </el-tooltip>
                             </template>
                             </el-table-column>
                     </el-table>
@@ -229,19 +233,23 @@
                                 </el-table-column>
                                 <el-table-column width="200" prop="monit_method" label="新增风险管控措施或纳入隐患治理及期间的管控措施"></el-table-column>
                             </el-table-column>
-                            <el-table-column label="风险管控要求"  align="center">
+                            <el-table-column label="风险管控要求11"  align="center">
                                 <el-table-column prop="" label="部门"></el-table-column>
                                 <el-table-column prop="held_person" label="责任人"></el-table-column>
                                 <el-table-column prop="held_person_phone" label="电话"></el-table-column>
                                 <el-table-column prop="cycle" label="管控周期"></el-table-column>
                             </el-table-column>
                             <el-table-column fixed="right"
-                            prop="zip"  width="150"
+                            prop="zip"  width="85"
                             label="操作">
                             <template slot-scope="scope">
                                 <!-- <el-button icon="el-icon-view" size="mini"  type="success">查看</el-button> -->
-                                <el-button icon="el-icon-edit" @click="change(scope.row)" size="mini" type="warning">编辑</el-button>
-                                <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
+                                <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
+                                    <el-button class="123123" icon="el-icon-edit" @click="change(scope.row)" size="mini" type="warning"></el-button>
+                                </el-tooltip>
+                                <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                                    <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger"></el-button>
+                                </el-tooltip>
                             </template>
                             </el-table-column>
                     </el-table>
@@ -348,7 +356,7 @@ export default {
 		};
     },
     watch: {
-      filterText(val) {
+      filterText() {
         this.getRisk();
       }
     },
@@ -492,7 +500,7 @@ export default {
                 this.$confirm('确定删除吗', '提示', {
                         type: 'warning'
                     }).then(() => {
-                    this.$api.deleteMonittask({id:id}).then((res)=>{
+                    this.$api.deleteMonittask({id:id}).then(()=>{
                             this.$message({
                                 message: '删除成功',
                                 type: 'success'
@@ -504,7 +512,6 @@ export default {
         add(){
             let parm=this.rsk;
             parm.riskpoint_item=this.riskpoint_item;
-            console.log(parm)
             // if(!parm.name){
             //     this.$message.error('请输入部门名称');
             //     return;
@@ -547,7 +554,6 @@ export default {
             data.append("file",file[0])
           this.$api.uploadMonittask(data).then(res=>{
               if(res.data.code==0){
-                  console.log(res.data)
                       this.dialogVisible=false
                       this.getData();
                       let message = '<p>成功导入'+res.data.data.success+'个任务!</p><p>由于数据原因有'+res.data.data.failed.length+'个任务导入失败!请修改好数据后重新导入,失败任务如下:</p>'