diff --git a/src/api/daily/index.js b/src/api/daily/index.js
index ca7783b..5ca4e8d 100644
--- a/src/api/daily/index.js
+++ b/src/api/daily/index.js
@@ -34,7 +34,7 @@ export function del(safety_task_id) {
   })
 }
 
-export function get(safety_task_id) {
+export function getdaily(safety_task_id) {
   return request({
     url: '/api/admin/task/show',
     method: 'get',
diff --git a/src/api/improvement/score.js b/src/api/improvement/score.js
new file mode 100644
index 0000000..5f95a75
--- /dev/null
+++ b/src/api/improvement/score.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+export function list(params) {
+  return request({
+    url: '/api/admin/score/index',
+    method: 'get',
+    params:params
+  })
+}
+
+export function store(data) {
+  return request({
+    url: '/api/admin/score/store',
+    method: 'post',
+    data
+  })
+}
+
+export function save(data) {
+  return request({
+    url: '/api/admin/score/save',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: '/api/admin/score/destroy',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export function get(id) {
+  return request({
+    url: '/api/admin/score/show',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
diff --git a/src/api/practise/index.js b/src/api/practise/index.js
new file mode 100644
index 0000000..c7d9580
--- /dev/null
+++ b/src/api/practise/index.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+export function list(params) {
+  return request({
+    url: '/api/admin/practise/index',
+    method: 'get',
+    params:params
+  })
+}
+
+export function store(data) {
+  return request({
+    url: '/api/admin/practise/store',
+    method: 'post',
+    data
+  })
+}
+
+export function save(data) {
+  return request({
+    url: '/api/admin/practise/save',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: '/api/admin/practise/destroy',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export function get(id) {
+  return request({
+    url: '/api/admin/practise/show',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
diff --git a/src/styles/iconfont.css b/src/styles/iconfont.css
index 57a86d7..ff44b2e 100644
--- a/src/styles/iconfont.css
+++ b/src/styles/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
-  font-family: 'iconfont';  /* Project id 3299651 */
-  src: url('//at.alicdn.com/t/font_3299651_zlpd7k90w2.woff2?t=1649318040170') format('woff2'),
-       url('//at.alicdn.com/t/font_3299651_zlpd7k90w2.woff?t=1649318040170') format('woff'),
-       url('//at.alicdn.com/t/font_3299651_zlpd7k90w2.ttf?t=1649318040170') format('truetype');
+  font-family: "iconfont"; /* Project id 3299651 */
+  src: url('//at.alicdn.com/t/font_3299651_jr61je4b4x.woff2?t=1651135362336') format('woff2'),
+       url('//at.alicdn.com/t/font_3299651_jr61je4b4x.woff?t=1651135362336') format('woff'),
+       url('//at.alicdn.com/t/font_3299651_jr61je4b4x.ttf?t=1651135362336') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,66 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-zhiduliucheng:before {
+  content: "\e69d";
+}
+
+.icon-peixunjihua:before {
+  content: "\e66c";
+}
+
+.icon-_xiangmuguanli:before {
+  content: "\e603";
+}
+
+.icon-jixiao:before {
+  content: "\e619";
+}
+
+.icon-chakan:before {
+  content: "\e706";
+}
+
+.icon-yinhuanpaichazhili:before {
+  content: "\e66d";
+}
+
+.icon-zhongdaweixianyuanxinxiguanli:before {
+  content: "\e66e";
+}
+
+.icon-anquanfengxian:before {
+  content: "\e61e";
+}
+
+.icon-yingjiyanlian:before {
+  content: "\e60d";
+}
+
+.icon-zhiyejiankang:before {
+  content: "\e66f";
+}
+
+.icon-peixunzuzhizhe-peixunjihua:before {
+  content: "\e606";
+}
+
+.icon-a-neirongguanliStroke:before {
+  content: "\e670";
+}
+
+.icon-a-shigushangbao3x:before {
+  content: "\e60b";
+}
+
+.icon-a-115-lanmuguanli:before {
+  content: "\e8da";
+}
+
+.icon-huiyijiyao:before {
+  content: "\e696";
+}
+
 .icon-jiaoyupeixun:before {
   content: "\e66b";
 }
@@ -320,4 +380,3 @@
 .icon-lianjie:before {
   content: "\e63e";
 }
-
diff --git a/src/views/daily/index.vue b/src/views/daily/index.vue
index 84139d3..324f858 100644
--- a/src/views/daily/index.vue
+++ b/src/views/daily/index.vue
@@ -115,7 +115,7 @@
     save,
     store,
     del,
-    get,
+    getdaily,
     listtask
 
   } from "../../api/daily/index.js";
@@ -306,7 +306,7 @@
       },
       info(obj) {
         var that = this;
-        get(obj.id).then(res => {
+        getdaily(obj.id).then(res => {
           let result = Object.assign(that.form, res);
           that.form = result;
           let _files = [];
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 77ae59a..e1a6ac5 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,13 +1,130 @@
-<template>
-  <div class="dashboard-container">
-    <div class="dashboard-text">name: {{ name }}</div>
-    <div class="dashboard-text">roles: <span v-for="role in roles" :key="role">{{ role }}</span></div>
-  </div>
+<template>
+  <div class="container">
+    <!-- 查询配置 -->
+    <div style="padding: 0px 20px">
+
+      <div ref="lxTable" class="table-tree">
+       <div style="padding: 15px;background-color: #fff;" class="form-sub-title">
+          <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">法律法规</el-link>
+          <p class="no-redirect">浏览最近上传的法律法规</p>
+        </div>
+        <el-table :data="tableData" class="v-table" height="300px" style="width: 100%">
+          <el-table-column :prop="column.field" :fixed="column.fixed" :align="column.align"
+            v-for="(column,index) in lawcolumns" :label="column.title" :width="column.width">
+            <template slot-scope="scope">
+              <div v-if="column.type=='opt'">
+                <Button ghost size="small" @click="show(scope.row)" type="primary"
+                  style="margin-left: 10px;">查看</Button>
+              </div>
+              <div v-else-if="column.type=='menu'">
+                  {{scope.row.menu?scope.row.menu.name:"无"}}
+              </div>
+              <div v-else>{{scope.row[column.field]}}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+
+     <el-dialog title="内容查看" :visible.sync="dialogLawViewVisible" fullscreen>
+        <div class="dialogConcent" :style="{height:clientHeight+'px'}">
+          <el-scrollbar style="flex: 1">
+            <el-form :model="this.lawform" ref="lawform" label-position="right" :label-width="formLabelWidth">
+              <el-form-item label="标题" prop="title">
+                {{lawform.title}}
+              </el-form-item>
+
+              <el-form-item label="目录" prop="menu">
+                <el-tag>{{lawform.menu?lawform.menu.name:"无"}}</el-tag>
+              </el-form-item>
+
+              <el-form-item label="内容" prop="content">
+                <div style="width: 99.9%;" v-html="lawform.content">
+                </div>
+              </el-form-item>
+              <el-form-item label="附件" prop="files">
+                <el-link v-for="item in lawform.files" target="_blank" :href="item.url" type="primary">{{item.original_name}}</el-link>
+              </el-form-item>
+            </el-form>
+          </el-scrollbar>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogLawViewVisible=false">关 闭</el-button>
+        </div>
+      </el-dialog>
+
+      <div ref="lxTable" class="table-tree" style="margin-top:15px">
+       <div style="padding: 15px;background-color: #fff;" class="form-sub-title">
+          <el-link type="primary" href="#/daily/index" style="font-size:18px">代办事项</el-link>
+        </div>
+        <el-table :data="dailytableData" class="v-table" height="300px" style="width: 100%">
+          <el-table-column :prop="column.field" :fixed="column.fixed" :align="column.align"
+            v-for="(column,index) in dailycolumns" :label="column.title" :width="column.width">
+            <template slot-scope="scope">
+              <div v-if="column.type=='opt'">
+                <Button ghost size="small" @click="showdaily(scope.row)" type="primary"
+                  style="margin-left: 10px;">查看</Button>
+              </div>
+              <div v-else-if="column.type=='status'">
+                  {{scope.row.is_read===1?"已查看":"待阅读"}}
+              </div>
+              <div v-else>{{scope.row[column.field]}}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <el-dialog title="内容查看1" :visible.sync="dialogDailyViewVisible" fullscreen>
+         <div class="dialogConcent" :style="{height:clientHeight+'px'}">
+           <el-scrollbar style="flex: 1">
+             <el-form :model="this.dailyform" ref="lawform" label-position="right" :label-width="formLabelWidth">
+               <el-form-item label="标题" prop="title">
+                 {{dailyform.title}}
+               </el-form-item>
+               <el-form-item label="开始时间" prop="start_date">
+                 {{dailyform.start_date}}
+               </el-form-item>
+               <el-form-item label="结束时间" prop="end_date">
+                 {{dailyform.end_date}}
+               </el-form-item>
+               <el-form-item label="内容" prop="content">
+                 <div style="width: 99.9%;" v-html="dailyform.content">
+                 </div>
+               </el-form-item>
+               <el-form-item label="附件" prop="files">
+                 <el-link v-for="item in dailyform.files" target="_blank" :href="item.url" type="primary">{{item.original_name}}</el-link>
+               </el-form-item>
+             </el-form>
+           </el-scrollbar>
+         </div>
+         <div slot="footer" class="dialog-footer">
+           <el-button @click="dialogDailyViewVisible=false">关 闭</el-button>
+         </div>
+       </el-dialog>
+
+    </div>
+
+
+
+
+  </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-
+import {
+  getToken
+} from '@/utils/auth';
+import LxHeader from "@/components/LxHeader/index.vue";
+import Tinymce from '@/components/Tinymce';
+import {
+    listarticle,
+    get
+  } from "../../api/lawsfile/article.js";
+import {
+  getdaily,
+  listtask
+} from "../../api/daily/index.js";
 export default {
   name: 'Dashboard',
   computed: {
@@ -15,11 +132,191 @@ export default {
       'name',
       'roles'
     ])
+  },
+  components: {
+    LxHeader,
+    Tinymce
+  },
+  data() {
+      return {
+        paginations: {
+          page: 1,
+          page_size: 5,
+        },
+        dialogLawViewVisible:false,
+        dialogDailyViewVisible:false,
+        tableHeight: 0,
+        clientHeight: 0,
+        tableData: [],
+        dailytableData:[],
+        formLabelWidth: "120px",
+        lawform:{
+          title:"",
+          menu:"",
+          content:"",
+          files:""
+        },
+        dailyform: {
+          title: "",
+          content: "",
+          file_list: "",
+          start_date: "",
+          end_date: "",
+          department_list: [],
+          daterange: null
+        },
+        lawcolumns: [{
+            field: "created_at",
+            title: "日期",
+            type: "string",
+            width: 200,
+            align: "center"
+          },
+          {
+            field: "menu",
+            title: "栏目",
+            type: "menu",
+            width: 200,
+            align: "center"
+          },
+          {
+            field: "title",
+            title: "标题",
+            align: "left"
+          },
+          {
+            field: "操作",
+            title: "操作",
+            width: 220,
+            type: "opt",
+          }
+        ],
+        dailycolumns: [
+          {
+            field: "start_date",
+            title: "开始时间",
+            type: "string",
+            align: "center",
+            width: 200,
+          },
+          {
+            field: "end_date",
+            title: "结束时间",
+            align: "center",
+            type:"string",
+            width: 200,
+          },
+          {
+              field: "title",
+              title: "任务名称",
+              type: "string",
+              align: "left"
+            },
+          {
+            field: "操作",
+            title: "操作",
+            width: 220,
+            type: "opt",
+          }
+        ],
+        uploadOther: {
+          token: ""
+        },
+      }
+    },
+    created() {
+      this.uploadOther.token = getToken();
+      // this.initLoad();
+      this.load();
+
+    },
+    methods: {
+      initLoad() {
+        var that = this;
+        var clientHeight = document.documentElement.clientHeight
+        var lxHeader_height = 96.5; //查询 头部
+        var paginationHeight = 37; //分页的高度
+        var topHeight = 50; //页面 头部
+        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
+        that.tableHeight = tableHeight;
+      },
+
+      load() {
+        listarticle({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size
+        }).then(res => {
+          this.tableData = res.data;
+
+        }).catch(error => {
+
+        });
+        listtask({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size,
+          show_self:1
+        }).then(response => {
+          this.dailytableData = response.data;
+
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
+      },
+
+      show(obj) {
+        this.clientHeight = document.documentElement.clientHeight - 84 - 110;
+        this.dialogDailyViewVisible = false;
+        this.dialogLawViewVisible = true;
+        this.info(obj);
+      },
+
+      showdaily(obj) {
+        this.clientHeight = document.documentElement.clientHeight - 84 - 110;
+        this.dialoglawViewVisible=false;
+        this.dialogDailyViewVisible = true;
+        this.infodaily(obj);
+      },
+      info(obj) {
+        var that = this;
+        get(obj.id).then(res => {
+          let result = Object.assign(that.lawform, res);
+          that.lawform = result;
+          let _files = [];
+          for (var mod of result.files) {
+            let m = Object.assign({}, mod);
+            m.name = mod.original_name;
+            m.url = mod.url;
+            _files.push(m);
+          }
+          that.lawform.files = _files;
+        }).catch(error => {
+          //reject(error)
+        });
+      },
+      infodaily(obj) {
+        var that = this;
+        getdaily(obj.id).then(res => {
+          let result = Object.assign(that.lawform, res);
+          that.dailyform = result;
+          let _files = [];
+          for (var mod of result.files) {
+            let m = Object.assign({}, mod);
+            m.name = mod.original_name;
+            m.url = mod.url;
+            _files.push(m);
+          }
+          that.dailyform.files = _files;
+        }).catch(error => {
+          //reject(error)
+        });
+      },
+
+    }
   }
-}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .dashboard {
   &-container {
     margin: 30px;
@@ -29,4 +326,7 @@ export default {
     line-height: 46px;
   }
 }
+  .dialogConcent {
+    overflow-y: auto;
+  }
 </style>
diff --git a/src/views/improvement/score.vue b/src/views/improvement/score.vue
new file mode 100644
index 0000000..fec361d
--- /dev/null
+++ b/src/views/improvement/score.vue
@@ -0,0 +1,571 @@
+<template>
+  <div class="container">
+    <!-- 查询配置 -->
+    <div style="padding: 0px 20px">
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="绩效评定" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+          <slot>
+            <div>
+              <Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
+
+              <Button type="primary" @click="search" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
+            </div>
+          </slot>
+        </LxHeader>
+      </div>
+      <div ref="lxTable" class="table-tree">
+        <el-table :data="tableData" class="v-table" :height="tableHeight" style="width: 100%">
+          <el-table-column type="index" fixed width="50" align="center"> </el-table-column>
+          <el-table-column :prop="column.field" :fixed="column.fixed" :align="column.align"
+            v-for="(column,index) in columns" :label="column.title" :width="column.width">
+            <template slot-scope="scope">
+              <div v-if="column.type=='opt'">
+                <Button ghost size="small" @click="edit(scope.row)" type="primary"
+                  style="margin-left: 10px;">编辑</Button>
+                <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
+              </div>
+              <div v-else-if="column.type=='unit'" v-for="item in deptOptions">
+                <div v-if='scope.row[column.field]==item.id'>
+                  {{item.name}}
+                </div>
+              </div>
+              <div v-else>{{scope.row[column.field]}}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination">
+          <el-pagination @current-change="handleCurrentChange" :current-page="paginations.page"
+            :page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
+          </el-pagination>
+        </div>
+      </div>
+
+    </div>
+
+    <el-dialog title="绩效评定编辑" :visible.sync="dialogFormVisible" fullscreen width="90%">
+      <div class="dialogConcent" :style="{height:clientHeight+'px'}">
+        <el-scrollbar style="flex: 1">
+          <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="科室" prop="unit">
+                  <el-select v-model="form.unit" placeholder="请选择科室" style="width: 100%">
+                    <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" :offset="8">
+                <el-form-item label="年份" prop="year">
+                  <el-date-picker style="width:100%" type="year" v-model="form.year" value-format="yyyy"
+                    placeholder="请选择年份">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item class="longtext" label="目标职责运行质量" prop="duty">
+              <el-input type="textarea" v-model="form.duty" :rows="3" placeholder="请填写目标职责运行质量" autocomplete="off">
+              </el-input>
+            </el-form-item>
+            <el-form-item class="longtext">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList.duty_files">
+                <el-button size="small" type="primary" @click="toupload('duty_files_list')">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item class="longtext" label="制度化管理运行质量" prop="regulation">
+              <el-input type="textarea" v-model="form.regulation" :rows="3" placeholder="请填写制度化管理运行质量" autocomplete="off">
+              </el-input>
+            </el-form-item>
+            <el-form-item class="longtext">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList.regulation_files">
+                <el-button size="small" type="primary" @click="toupload('regulation_files_list')">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item class="longtext" label="教育培训运行质量" prop="education">
+              <el-input type="textarea" v-model="form.education" :rows="3" placeholder="请填写教育培训运行质量" autocomplete="off">
+              </el-input>
+            </el-form-item>
+            <el-form-item class="longtext">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList.education_files">
+                <el-button size="small" type="primary" @click="toupload('education_files_list')">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+
+            <el-form-item class="longtext" label="现场管理运行质量" prop="scene">
+              <el-input type="textarea" v-model="form.scene" :rows="3" placeholder="请填写现场管理运行质量" autocomplete="off">
+              </el-input>
+            </el-form-item>
+            <el-form-item class="longtext">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList.scene_files">
+                <el-button size="small" type="primary" @click="toupload('scene_files_list')">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+
+            <el-form-item class="longtext" label="安全风险管控及隐患排查治理运行质量" prop="risk">
+              <el-input type="textarea" v-model="form.risk" :rows="3" placeholder="请填写安全风险管控及隐患排查治理运行质量" autocomplete="off">
+              </el-input>
+            </el-form-item>
+            <el-form-item class="longtext">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList.risk_files">
+                <el-button size="small" type="primary" @click="toupload('risk_files_list')">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+
+            <el-form-item class="longtext" label="应急管理运行质量" prop="measure">
+              <el-input type="textarea" v-model="form.measure" :rows="3" placeholder="请填写应急管理运行质量" autocomplete="off">
+              </el-input>
+            </el-form-item>
+            <el-form-item class="longtext">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList.measure_files">
+                <el-button size="small" type="primary" @click="toupload('measure_files_list')">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+
+            <el-form-item class="longtext" label="事故管理运行质量" prop="accident">
+              <el-input type="textarea" v-model="form.accident" :rows="3" placeholder="请填写事故管理运行质量" autocomplete="off">
+              </el-input>
+            </el-form-item>
+            <el-form-item class="longtext">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList.accident_files">
+                <el-button size="small" type="primary" @click="toupload('accident_files_list')">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+
+            <el-form-item class="longtext" label="持续改进运行质量" prop="continue">
+              <el-input type="textarea" v-model="form.continue" :rows="3" placeholder="请填写持续改进运行质量" autocomplete="off">
+              </el-input>
+            </el-form-item>
+            <el-form-item class="longtext">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList.continue_files">
+                <el-button size="small" type="primary" @click="toupload('continue_files_list')">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+
+            <el-form-item class="longtext" label="安全生产标准化总体运行质量" prop="evaluation">
+              <el-input type="textarea" v-model="form.evaluation" :rows="3" placeholder="请填写安全生产标准化总体运行质量" autocomplete="off">
+              </el-input>
+            </el-form-item>
+            <el-form-item class="longtext">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList.evaluation_files">
+                <el-button size="small" type="primary" @click="toupload('evaluation_files_list')">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+
+            <el-form-item class="longtext" label="备注" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="3" placeholder="请填写备注" autocomplete="off">
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </el-scrollbar>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" v-preventReClick @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+  import {
+    getToken
+  } from '@/utils/auth'
+  import LxHeader from "@/components/LxHeader/index.vue";
+  import Tinymce from '@/components/Tinymce';
+  import {
+    getparameteritem
+  } from "../../api/system/dictionary.js"
+  import {
+    save,
+    store,
+    del,
+    get,
+    list
+  } from "../../api/improvement/score.js";
+  import {
+    listdept
+  } from "../../api/system/department.js"
+  export default {
+    components: {
+      LxHeader,
+      Tinymce
+    },
+    data() {
+      return {
+        touploadType: "",
+        checkAll: false,
+        isIndeterminate: true,
+        parameters: {
+          accidentType: [],
+          accidentLevel: []
+        },
+        paginations: {
+          page: 1,
+          page_size: 15,
+          total: 0
+        },
+
+        tableHeight: 0,
+        dialogFormVisible: false,
+        formLabelWidth: "120px",
+        clientHeight: 0,
+        form: {
+          unit: "",
+          year: "",
+          remark: "",
+          duty: "",
+          regulation: "",
+          education: "",
+          scene: "",
+          risk: "",
+          measure:"",
+          accident:"",
+          continue:"",
+          evaluation:"",
+
+          duty_files_list:[],
+          regulation_files_list:[],
+          education_files_list:[],
+          scene_files_list:[],
+          risk_files_list:[],
+          measure_files_list:[],
+          accident_files_list:[],
+          continue_files_list:[],
+          evaluation_files_list:[],
+
+        },
+        fileList: {
+          duty_files:[],
+          regulation_files:[],
+          education_files:[],
+          scene_files:[],
+          risk_files:[],
+          measure_files:[],
+          accident_files:[],
+          continue_files:[],
+          evaluation_files:[],
+        },
+        tableData: [],
+        rules: {
+          unit: [{
+            required: true,
+            message: '请选择科室',
+            trigger: 'blur'
+          }],
+          year: [{
+            required: true,
+            message: '请选择年份',
+            trigger: 'blur'
+          }],
+        },
+        tableHeight: 900,
+        searchFields: {
+          KeyWord: ""
+        },
+        columns: [{
+            field: "year",
+            title: "年份",
+            type: "string",
+            width: 200,
+            align: "center"
+          },
+          {
+            field: "unit",
+            title: "科室",
+            type: "unit",
+            align: "left"
+          },
+          {
+            field: "created_at",
+            title: "创建信息",
+            type: "string",
+            width: 180,
+            align: "center"
+          },
+          {
+            field: "操作",
+            title: "操作",
+            width: 220,
+            type: "opt",
+          }
+        ],
+        uploadOther: {
+          token: ""
+        },
+        deptOptions: [],
+        all_files: [],
+      }
+    },
+    created() {
+      this.uploadOther.token = getToken();
+      this.loadDeptOptions();
+      this.initLoad();
+      this.load();
+
+    },
+    methods: {
+      toupload(type) {
+        console.log(type)
+        this.touploadType = type;
+      },
+      loadDeptOptions() {
+        listdept().
+        then((res) => {
+          this.deptOptions = res;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
+      },
+      initLoad() {
+        var that = this;
+        var clientHeight = document.documentElement.clientHeight
+        var lxHeader_height = 96.5; //查询 头部
+        var paginationHeight = 37; //分页的高度
+        var topHeight = 50; //页面 头部
+        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
+        that.tableHeight = tableHeight;
+
+      },
+      handleCurrentChange(page) {
+        this.paginations.page = page;
+        this.load();
+      },
+      search() {
+        this.paginations.page = 1;
+        this.load();
+      },
+      load() {
+        list({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size
+        }).then(res => {
+          this.tableData = res.data;
+          this.paginations.total = res.total
+        }).catch(error => {
+
+        })
+      },
+      del(obj) {
+        var that = this;
+        if (obj) {
+          this.$Modal.confirm({
+            title: '确认要删除数据？',
+            onOk: () => {
+              del(obj.id).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
+        }
+      },
+      show(obj) {
+        this.clientHeight = document.documentElement.clientHeight - 84 - 110;
+        this.dialogViewVisible = true;
+        this.info(obj);
+      },
+      info(obj) {
+        var that = this;
+        get(obj.id).then(res => {
+          let result = Object.assign(that.form, res);
+          that.form = result;
+          Object.keys(this.fileList).map(key => {
+            if (result[key].length != 0) {
+              let _files = [];
+              for (var mod of result[key]) {
+                let m = Object.assign({}, mod.files);
+                m.name = mod.files.original_name;
+                _files.push(m);
+                m.touploadType = key;
+                that.all_files.push(m);
+              }
+              that.fileList[key] = _files;
+
+            }
+
+          })
+
+
+        }).catch(error => {
+          //reject(error)
+        })
+      },
+      edit(obj) {
+        var that = this;
+        this.form = this.$options.data().form;
+
+        that.fileList.duty_files=[];
+        that.fileList.regulation_files=[];
+        that.fileList.education_files=[];
+        that.fileList.scene_files=[];
+        that.fileList.risk_files=[];
+        that.fileList.measure_files=[];
+        that.fileList.accident_files=[];
+        that.fileList.continue_files=[];
+        that.fileList.evaluation_files=[];
+        this.clientHeight = document.documentElement.clientHeight - 84 - 110;
+        if (obj) {
+
+          that.info(obj);
+        } else {}
+        this.dialogFormVisible = true;
+      },
+      submitForm(formName) {
+        var that = this;
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            if (that.form.id) {
+              save(that.form).then(response => {
+                //console.log(response)
+                this.$Message.success('操作成功');
+                that.load();
+                that.dialogFormVisible = false;
+
+              }).catch(error => {
+                //reject(error)
+              })
+            } else {
+              // console.log("that.form",that.form);
+              // return;
+              store(that.form).then(response => {
+                //console.log(response)
+                this.$Message.success('操作成功');
+                that.load();
+                that.dialogFormVisible = false;
+              }).catch(error => {
+                //reject(error)
+              })
+            }
+           that.fileList.duty_files=[];
+           that.fileList.regulation_files=[];
+           that.fileList.education_files=[];
+           that.fileList.scene_files=[];
+           that.fileList.risk_files=[];
+           that.fileList.measure_files=[];
+           that.fileList.accident_files=[];
+           that.fileList.continue_files=[];
+           that.fileList.evaluation_files=[];
+          } else {
+            this.$Message.error('数据校验失败');
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      handleRemove(file, fileList) {
+        var _touploadType = this.all_files.filter((x) => {
+          return x.uid == file.uid;
+        })[0].touploadType;
+
+        console.log(_touploadType);
+        var type = 1;
+        let listUrl = [];
+        for (var m of fileList) {
+          if (m.response)
+            listUrl.push({
+              upload_id: m.response.id,
+              type: type
+            });
+          else
+            listUrl.push({
+              upload_id: m.id,
+              type: type
+            });
+        }
+        this.form[_touploadType] = listUrl;
+      },
+      handleExceed(files, fileList) {},
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${ file.name }？`);
+      },
+      handlesuccess(response, file, fileList) {
+        //console.log(response,file,fileList);
+        let listUrl = [];
+        var type = 1;
+
+        Object.keys(this.fileList).map((key, index) => {
+          if (this.touploadType == key)
+            type = index + 1
+        })
+        for (var m of fileList) {
+          if (m.response)
+            listUrl.push({
+              upload_id: m.response.id,
+              type: type
+            });
+          else
+            listUrl.push({
+              upload_id: m.id,
+              type: type
+            });
+        }
+        file.touploadType = this.touploadType;
+        this.all_files.push(file);
+        this.form[this.touploadType] = listUrl;
+      },
+      resetForm(formName) {
+        var that = this;
+        that.fileList.duty_files=[];
+        that.fileList.regulation_files=[];
+        that.fileList.education_files=[];
+        that.fileList.scene_files=[];
+        that.fileList.risk_files=[];
+        that.fileList.measure_files=[];
+        that.fileList.accident_files=[];
+        that.fileList.continue_files=[];
+        that.fileList.evaluation_files=[];
+        this.$refs[formName].resetFields();
+        that.dialogFormVisible = false;
+      },
+    }
+  }
+</script>
+
+<style>
+  .dialogConcent {
+    overflow-y: auto;
+  }
+
+  .units label {
+    line-height: 22px;
+  }
+  .longtext{
+    margin-left:70px;
+  }
+  .longtext label{
+    float:none;
+    text-align: left;
+  }
+  .longtext .el-form-item__content{
+    margin-left:0!important;
+  }
+</style>
diff --git a/src/views/practise/index.vue b/src/views/practise/index.vue
new file mode 100644
index 0000000..534906c
--- /dev/null
+++ b/src/views/practise/index.vue
@@ -0,0 +1,772 @@
+<template>
+  <div class="container">
+    <!-- 查询配置 -->
+    <div style="padding: 0px 20px">
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="应急演练记录" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+          <slot>
+            <div>
+              <Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
+            </div>
+          </slot>
+        </LxHeader>
+      </div>
+      <div ref="lxTable">
+        <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+          <el-table-column type="index" width="50" align="center"> </el-table-column>
+          <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
+            :label="column.title" :width="column.width">
+            <template slot-scope="scope">
+              <div v-if="column.type=='opt'">
+                <Button ghost size="small" @click="edit(scope.row)" type="primary"
+                  style="margin-left: 10px;">编辑</Button>
+                <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
+              </div>
+              <div v-else-if="column.type=='level'" v-for="item in parameters.practiseLevel">
+                <div v-if='scope.row[column.field]==item.id'>
+                  {{item.value}}
+                </div>
+              </div>
+              <div v-else>{{scope.row[column.field]}}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination">
+          <el-pagination @current-change="handleCurrentChange" :current-page="paginations.page"
+            :page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
+          </el-pagination>
+        </div>
+      </div>
+
+    </div>
+
+    <el-dialog title="应急演练记录编辑" :visible.sync="dialogFormVisible" fullscreen width="90%">
+      <div class="dialogConcent" :style="{height:clientHeight+'px'}">
+        <el-scrollbar style="flex: 1">
+          <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="演练运维管理单位" prop="practise_unit" class="units">
+                  <el-select v-model="form.practise_unit" placeholder="请选择科室,运维管理单位" style="width: 100%">
+                    <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.name">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="演练级别" prop="level" label-position="right">
+                  <el-select v-model="form.level" placeholder="请选择演练级别" style="width: 100%">
+                    <el-option v-for="item in parameters.practiseLevel" :key="item.id" :label="item.value"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" :offset="8">
+                <el-form-item label="演练时间" prop="date">
+                  <el-date-picker style="width:100%"
+                        v-model="form.date"
+                        type="datetime"
+                        placeholder="选择演练时间"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm">
+                      </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="演练地点" prop="address" label-position="right">
+              <el-input v-model="form.address" placeholder="请填写演练地点" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="组织运维管理单位" prop="organize_unit" class="units">
+                  <el-select v-model="form.organize_unit" placeholder="请选择组织运维管理单位" style="width: 100%">
+                    <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" :offset="8">
+                <el-form-item label="演练负责人" prop="responsible_person" class="">
+                  <el-select v-model="form.responsible_person" placeholder="请选择演练负责人" style="width: 100%">
+                    <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="参加部门和运维管理单位" prop="joins_list" class="units" label-position="right">
+              <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
+              </el-checkbox>
+              <div style="margin: 15px 0;"></div>
+              <el-checkbox-group v-model="form.joins_list" @change="handleCheckedDeptChange">
+                <el-checkbox v-for="dept in deptOptions" :label="dept.id" :key="dept.id">{{dept.name}}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+            <el-form-item label="演练过程和描述" prop="introduce">
+              <el-input type="textarea" :rows="3" v-model="form.introduce" placeholder="请填写演练过程和描述" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="附件" prop="file_list">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList">
+                <el-button size="small" type="primary">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+            <div style="padding: 20px 0px;" class="form-sub-title">
+              <span>评估
+              </span>
+            </div>
+            <div class="form-sub-title form-sub-title-lab">
+              <span>预案评估</span>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="适应性" prop="evaluate_plan_suit">
+                    <el-radio v-for="item in this.evaluate.evaluate_plan_suit" v-model="form.evaluate_plan_suit" :label="item.id">{{item.value}}</el-radio>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" :offset="8">
+                  <el-form-item label="充分性" prop="evaluate_plan_full">
+                    <el-radio v-for="item in this.evaluate.evaluate_plan_full" v-model="form.evaluate_plan_full" :label="item.id">{{item.value}}</el-radio>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+            <div class="form-sub-title form-sub-title-lab">
+              <span>演练评估</span>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="参加人员" prop="evaluate_practise_join">
+                    <el-radio v-for="item in this.evaluate.evaluate_practise_join" v-model="form.evaluate_practise_join" :label="item.id">{{item.value}}</el-radio>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" :offset="8">
+                  <el-form-item label="现场物资" prop="evaluate_practise_material">
+                    <el-radio v-for="item in this.evaluate.evaluate_practise_material" v-model="form.evaluate_practise_material" :label="item.id">{{item.value}}</el-radio>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="个人防护" prop="evaluate_practise_protect">
+                    <el-radio v-for="item in this.evaluate.evaluate_practise_protect" v-model="form.evaluate_practise_protect" :label="item.id">{{item.value}}</el-radio>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+            <div class="form-sub-title-lab form-sub-title">
+              <span>指挥评估</span>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="整体组织指挥" prop="evaluate_direct_whole">
+                    <el-radio v-for="item in this.evaluate.evaluate_direct_whole" v-model="form.evaluate_direct_whole" :label="item.id">{{item.value}}</el-radio>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" :offset="8">
+                  <el-form-item label="各抢险分工" prop="evaluate_direct_divide">
+                    <el-radio v-for="item in this.evaluate.evaluate_direct_divide" v-model="form.evaluate_direct_divide" :label="item.id">{{item.value}}</el-radio>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+            <div class="form-sub-title" style="padding:20px 0">
+              <span>协作评估
+              </span>
+            </div>
+            <el-form-item label="报告上级" prop="evaluate_cooperate_report">
+              <el-radio v-for="item in this.evaluate.evaluate_cooperate_report" v-model="form.evaluate_cooperate_report" :label="item.id">{{item.value}}</el-radio>
+            </el-form-item>
+            <el-form-item label="消防科室" prop="evaluate_cooperate_fire">
+              <el-radio v-for="item in this.evaluate.evaluate_cooperate_fire" v-model="form.evaluate_cooperate_fire" :label="item.id">{{item.value}}</el-radio>
+            </el-form-item>
+            <el-form-item label="医疗救援科室" prop="evaluate_cooperate_medical">
+              <el-radio v-for="item in this.evaluate.evaluate_cooperate_medical" v-model="form.evaluate_cooperate_medical" :label="item.id">{{item.value}}</el-radio>
+            </el-form-item>
+            <el-form-item label="周边政府配合" prop="evaluate_cooperate_government">
+              <el-radio v-for="item in this.evaluate.evaluate_cooperate_government" v-model="form.evaluate_cooperate_government" :label="item.id">{{item.value}}</el-radio>
+            </el-form-item>
+            <el-form-item label="其他参与运维管理单位" class="units" prop="evaluate_cooperate_other">
+              <el-radio v-for="item in this.evaluate.evaluate_cooperate_other" v-model="form.evaluate_cooperate_other" :label="item.id">{{item.value}}</el-radio>
+            </el-form-item>
+            <el-form-item label="总体评价" prop="evaluate_cooperate_full">
+              <el-radio v-for="item in this.evaluate.evaluate_cooperate_full" v-model="form.evaluate_cooperate_full" :label="item.id">{{item.value}}</el-radio>
+            </el-form-item>
+
+
+
+
+          </el-form>
+        </el-scrollbar>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" v-preventReClick @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+  import {
+    getToken
+  } from '@/utils/auth'
+  import LxHeader from "@/components/LxHeader/index.vue";
+  import Tinymce from '@/components/Tinymce'
+  import {
+    save,
+    store,
+    del,
+    get,
+    list
+  } from "../../api/practise/index.js";
+  import {
+    getparameteritem
+  } from "../../api/system/dictionary.js";
+  import {
+    listdept
+  } from "../../api/system/department.js";
+  import {
+    listuser
+  } from "../../api/system/user.js";
+  export default {
+    components: {
+      LxHeader,
+      Tinymce
+    },
+    data() {
+      return {
+        parameters: {
+          practiseLevel: [],
+        },
+        paginations: {
+          page: 1,
+          page_size: 15,
+          total: 0
+        },
+        checkAll:false,
+        isIndeterminate: true,
+        tableHeight: 0,
+        dialogFormVisible: false,
+        formLabelWidth: "120px",
+        clientHeight: 0,
+        form: {
+          practise_unit: "",
+          level: "",
+          date: "",
+          address: "",
+          organize_unit: "",
+          responsible_person: "",
+          introduce: "",
+          evaluate_plan_suit: 1,
+          evaluate_plan_full:1,
+          evaluate_practise_join:1,
+          evaluate_practise_material: 1,
+          evaluate_practise_protect: 1,
+          evaluate_direct_whole: 1,
+          evaluate_direct_divide: 1,
+          evaluate_cooperate_report: 1,
+          evaluate_cooperate_fire: 1,
+          evaluate_cooperate_medical: 1,
+          evaluate_cooperate_government: 1,
+          evaluate_cooperate_other: 1,
+          evaluate_cooperate_full: 1,
+          file_list:"",
+          joins_list:[]
+        },
+
+        fileList: [],
+        tableData: [],
+        rules: {
+          practise_unit: [{
+            required: true,
+            message: '请选择演练运维管理单位',
+            trigger: 'blur'
+          }],
+          level: [{
+            required: true,
+            message: '请选择演练级别',
+            trigger: 'blur'
+          }],
+          organize_unit: [{
+            required: true,
+            message: '请选择组织运维管理单位',
+            trigger: 'blur'
+          }]
+        },
+        tableHeight: 900,
+        searchFields: {
+          KeyWord: ""
+        },
+        columns: [{
+            field: "level",
+            title: "演练级别",
+            type: "level",
+            align:"left",
+            width: 180
+          },
+          {
+            field: "date",
+            title: "演练时间",
+            type: "string",
+            width: 180,
+            align:"center",
+          },
+          {
+            field: "address",
+            title: "演练地点",
+            type: "string",
+            align:"left"
+          },
+          {
+            field: "practise_unit",
+            title: "演练运维管理单位",
+            type: "unit",
+            width: 200,
+            align:"center",
+          },
+          {
+            field: "introduce",
+            title: "描述",
+            type: "string",
+          },
+          {
+            field: "created_at",
+            title: "创建信息",
+            type: "string",
+            width: 180,
+            align: "center"
+          },
+          {
+            field: "操作",
+            title: "操作",
+            width: 220,
+            type: "opt",
+          }
+        ],
+        //查询条件字段
+        searchFields: {
+          KeyWord: ""
+        },
+        uploadOther: {
+          token: ""
+        },
+        deptOptions: [],
+        userOptions: [],
+        evaluate:{
+          evaluate_plan_suit:[
+            {
+              id:1,
+              value:"全部能够执行"
+            },
+            {
+              id:2,
+              value:"执行过程不够顺利"
+            },
+            {
+              id:3,
+              value:"不适宜"
+            }
+          ],
+          evaluate_plan_full:[
+            {
+              id:1,
+              value:"能满足应急要求"
+            },
+            {
+              id:2,
+              value:"基本满足"
+            },
+            {
+              id:3,
+              value:"必须修改"
+            }
+          ],
+          evaluate_practise_join:[
+            {
+              id:1,
+              value:"好"
+            },
+            {
+              id:2,
+              value:"较好"
+            },
+            {
+              id:3,
+              value:"基本到位"
+            },{
+              id:4,
+              value:"不到位"
+            }
+          ],
+          evaluate_practise_material:[
+            {
+              id:1,
+              value:"好"
+            },
+            {
+              id:2,
+              value:"较好"
+            },
+            {
+              id:3,
+              value:"基本到位"
+            },{
+              id:4,
+              value:"不到位"
+            }
+          ],
+          evaluate_practise_protect:[
+            {
+              id:1,
+              value:"好"
+            },
+            {
+              id:2,
+              value:"较好"
+            },
+            {
+              id:3,
+              value:"基本到位"
+            },{
+              id:4,
+              value:"不到位"
+            }
+          ],
+          evaluate_direct_whole:[
+            {
+              id:1,
+              value:"好"
+            },
+            {
+              id:2,
+              value:"较好"
+            },
+            {
+              id:3,
+              value:"基本到位"
+            },{
+              id:4,
+              value:"不到位"
+            }
+          ],
+          evaluate_direct_divide:[
+            {
+              id:1,
+              value:"好"
+            },
+            {
+              id:2,
+              value:"较好"
+            },
+            {
+              id:3,
+              value:"基本到位"
+            },{
+              id:4,
+              value:"不到位"
+            }
+          ],
+          evaluate_cooperate_report:[
+            {
+              id:1,
+              value:"报告及时"
+            },
+            {
+              id:2,
+              value:"基本到位"
+            },
+            {
+              id:3,
+              value:"联系不上"
+            }
+          ],
+          evaluate_cooperate_fire:[
+            {
+              id:1,
+              value:"按照要求协作"
+            },
+            {
+              id:2,
+              value:"基本到位"
+            },
+            {
+              id:3,
+              value:"行动迟缓"
+            }
+          ],
+          evaluate_cooperate_medical:[
+            {
+              id:1,
+              value:"按照要求协作"
+            },
+            {
+              id:2,
+              value:"基本到位"
+            },
+            {
+              id:3,
+              value:"行动迟缓"
+            }
+          ],
+          evaluate_cooperate_government:[
+            {
+              id:1,
+              value:"按照要求协作"
+            },
+            {
+              id:2,
+              value:"基本到位"
+            },
+            {
+              id:3,
+              value:"不配合"
+            }
+          ],
+          evaluate_cooperate_other:[
+            {
+              id:1,
+              value:"报告及时"
+            },
+            {
+              id:2,
+              value:"基本到位"
+            },
+            {
+              id:3,
+              value:"不配合"
+            }
+          ],
+          evaluate_cooperate_full:[
+            {
+              id:1,
+              value:"优秀"
+            },
+            {
+              id:2,
+              value:"良好"
+            },
+            {
+              id:3,
+              value:"基本合格"
+            },
+            {
+              id:4,
+              value:"不合格"
+            }
+          ]
+        }
+      }
+    },
+    created() {
+      this.uploadOther.token = getToken();
+      this.loadDeptOptions();
+      this.loadUserOptions();
+      this.initLoad();
+      this.load();
+
+    },
+    methods: {
+      loadDeptOptions() {
+        listdept().
+        then((res) => {
+          this.deptOptions = res;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
+      },
+      loadUserOptions() {
+        listuser().
+        then((res) => {
+          this.userOptions = res.data;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
+      },
+      initLoad() {
+        var that = this;
+        var clientHeight = document.documentElement.clientHeight
+        var lxHeader_height = 96.5; //查询 头部
+        var paginationHeight = 37; //分页的高度
+        var topHeight = 50; //页面 头部
+        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
+        that.tableHeight = tableHeight;
+        //加载自定义参数
+        getparameteritem("practiseLevel").then(res => {
+          this.parameters.practiseLevel = res.detail;
+        });
+      },
+      handleCurrentChange(page) {
+        this.paginations.page = page;
+        this.load();
+      },
+      load() {
+        list({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size,
+        }).then(response => {
+          this.tableData = response.data;
+          this.paginations.total = response.total;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
+
+      },
+      del(obj) {
+        var that = this;
+        if (obj) {
+          this.$Modal.confirm({
+            title: '确认要删除数据？',
+            onOk: () => {
+              del(obj.id).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
+        }
+      },
+      info(obj) {
+        var that = this;
+        get(obj.id).then(res => {
+          let result = Object.assign(that.form, res);
+          that.form = result;
+          let _files = [];
+          for (var mod of result.practise_files) {
+            let m = Object.assign({}, mod["files"]);
+            m.name = mod["files"].original_name;
+            _files.push(m);
+          }
+          that.fileList = _files;
+          for (var m of result.joins) {
+            if (m.department_id)
+              that.form.joins_list.push(m.department_id)
+          }
+        }).catch(error => {
+          //reject(error)
+        })
+      },
+      edit(obj) {
+        this.form = this.$options.data().form;
+        this.clientHeight = document.documentElement.clientHeight - 84 - 110;
+        if (obj) {
+          var that = this;
+          that.info(obj);
+        } else {}
+        this.dialogFormVisible = true;
+      },
+      submitForm(formName) {
+        var that = this;
+        var arrs = [];
+            for (var m of this.form.joins_list) {
+              arrs.push({
+                department_id: m
+              })
+            }
+            this.form.joins_list = arrs;
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            if (that.form.id) {
+              that.form.id = that.form.id;
+              save(that.form).then(response => {
+                //console.log(response)
+                this.$Message.success('操作成功');
+                that.load();
+                that.dialogFormVisible = false;
+
+              }).catch(error => {
+                //reject(error)
+              })
+            } else {
+              store(that.form).then(response => {
+                //console.log(response)
+                this.$Message.success('操作成功');
+                that.load();
+                that.dialogFormVisible = false;
+              }).catch(error => {
+                //reject(error)
+              })
+            }
+            that.fileList = [];
+          } else {
+            this.$Message.error('数据校验失败');
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      handleRemove(file, fileList) {
+        let listUrl = [];
+        for (var m of fileList) {
+          if (m.response)
+            listUrl.push({"upload_id":m.response.id});
+          else
+            listUrl.push({"upload_id":m.id});
+        }
+        this.form.file_list = listUrl;
+      },
+      handleExceed(files, fileList) {},
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${ file.name }？`);
+      },
+      handlesuccess(response, file, fileList) {
+        let listUrl = [];
+        for (var m of fileList) {
+          if (m.response)
+            listUrl.push({"upload_id":m.response.id});
+          else
+            listUrl.push({"upload_id":m.id});
+
+        }
+        this.form.file_list = listUrl;
+      },
+      handleCheckAllChange(val) {
+        console.log(val)
+        let options = [];
+        for (var m of this.deptOptions) {
+          options.push({
+            department_id:m.id
+          });
+        }
+        this.form.joins_list = val ? options : [];
+        this.isIndeterminate = false;
+      },
+      handleCheckedDeptChange(value) {
+        let checkedCount = value.length;
+        this.checkAll = checkedCount === this.deptOptions.length;
+        this.isIndeterminate = checkedCount > 0 && checkedCount < this.deptOptions.length;
+      },
+      resetForm(formName) {
+        var that = this;
+        that.fileList = [];
+        this.$refs[formName].resetFields();
+        that.dialogFormVisible = false;
+      },
+    }
+  }
+</script>
+
+<style>
+  .dialogConcent {
+    overflow-y: auto;
+  }
+  .units label{
+    line-height: 22px;
+  }
+  .form-sub-title-lab{
+    padding: 20px;border:1px solid #ccc;margin-top:10px
+  }
+</style>
diff --git a/src/views/risk/riskindex.vue b/src/views/risk/riskindex.vue
index 30141eb..509af27 100644
--- a/src/views/risk/riskindex.vue
+++ b/src/views/risk/riskindex.vue
@@ -88,6 +88,13 @@
             <el-form-item class="longtext" label="备注" prop="remark">
               <el-input type="textarea" :rows="3" v-model="form.remark" placeholder="请填写备注" autocomplete="off"></el-input>
             </el-form-item>
+            <el-form-item class="uploads" label="附件" prop="files_list">
+              <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
+                action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
+                :on-exceed="handleExceed" :file-list="fileList">
+                <el-button size="small" type="primary">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
             <div style="padding: 20px 0px;" class="form-sub-title">
               <span>详细信息
               </span>
@@ -188,7 +195,8 @@
           overview: "",
           measure: "",
           level: "",
-          remark: "",
+          remark: "",
+          files_list: [],
           details_list: [{
             element:"",
             evaluate_way:"",
@@ -198,7 +206,8 @@
         //查询条件字段
         searchFields: {
           KeyWord: ""
-        },
+        },
+        fileList: [],
         details_list: [],
         tableData: [],
         rules: {
@@ -275,10 +284,14 @@
             width: 220,
             type: "opt",
           }
-        ]
+        ],
+        uploadOther: {
+          token: ""
+        },
       }
     },
-    created() {
+    created() {
+      this.uploadOther.token = getToken();
       this.initLoad();
       this.load();
 
@@ -360,6 +373,13 @@
         get(obj.id).then(res => {
           let result = Object.assign(that.form, res);
           that.form = result;
+          let _files = [];
+          for (var mod of result.safety_risk_files) {
+            let m = Object.assign({}, mod["files"]);
+            m.name = mod["files"].original_name;
+            _files.push(m);
+          }
+          that.fileList = _files;
           that.form.details_list = result.details;
         }).catch(error => {
           //reject(error)
@@ -387,7 +407,8 @@
                 that.dialogFormVisible = false;
               }).catch(error => {
                 //reject(error)
-              })
+              })
+
             } else {
               store(that.form).then(response => {
                 //console.log(response)
@@ -397,16 +418,42 @@
               }).catch(error => {
                 //reject(error)
               })
-            }
+            }
+            that.fileList = [];
           } else {
             this.$Message.error('数据校验失败');
             console.log('error submit!!');
             return false;
           }
         });
+      },
+      handleRemove(file, fileList) {
+        let listUrl = [];
+        for (var m of fileList) {
+          if (m.response)
+            listUrl.push({"upload_id":m.response.id});
+          else
+            listUrl.push({"upload_id":m.id});
+        }
+        this.form.files_list = listUrl;
+      },
+      handleExceed(files, fileList) {},
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${ file.name }？`);
+      },
+      handlesuccess(response, file, fileList) {
+        let listUrl = [];
+        for (var m of fileList) {
+          if (m.response)
+            listUrl.push({"upload_id":m.response.id});
+          else
+            listUrl.push({"upload_id":m.id});
+        }
+        this.form.files_list = listUrl;
       },
       resetForm(formName) {
-        var that = this;
+        var that = this;
+        that.fileList = [];
         this.$refs[formName].resetFields();
         that.dialogFormVisible = false;
       },
@@ -432,5 +479,12 @@
   .tableswidth table{
     width:100%!important;
   }
+  .uploads label{
+        width: 85px!important;
+  }
+  .uploads .el-form-item__content{
+    margin-left: 90px!important;
+  }
+      
 
 </style>
diff --git a/src/views/site/health.vue b/src/views/site/health.vue
index a4517fd..f3bbe3b 100644
--- a/src/views/site/health.vue
+++ b/src/views/site/health.vue
@@ -124,7 +124,7 @@
             <el-form-item class="" label="备注" prop="remark">
               <el-input type="textarea" :rows="3" v-model="form.remark" placeholder="请填写备注" autocomplete="off"></el-input>
             </el-form-item>
-            <el-form-item label="附件" prop="file_list">
+            <el-form-item label="附件" prop="files_list">
               <el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
                 action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
                 :on-exceed="handleExceed" :file-list="fileList">
@@ -414,11 +414,11 @@
             _files.push(m);
           }
           that.fileList = _files;
-          for (var m of res.distinguish_people) {
+          for (var m of result.distinguish_people) {
             if (m.admins)
               that.form.distinguish_people_list.push(m.admins.id)
           }
-          for (var m of res.distinguish_units) {
+          for (var m of result.distinguish_units) {
             if (m.department_id)
               that.form.distinguish_units_list.push(m.department_id)
           }