添加隐患图片展示

src/components/HeaderMessage/index.vue

@@ -10,14 +10,14 @@
       >
         <el-row>
           <el-col :span="8">
-            <el-link>
+            <el-link @click="jumpReform">
               <i class="el-icon-help" />
               待整改
               <span>({{ 11 }})</span>
             </el-link>
           </el-col>
           <el-col :span="8">
-            <el-link>
+            <el-link @click="jumpReview">
               <i class="el-icon-s-help" />
               待验收
               <span>({{ 22 }})</span>
@@ -83,6 +83,12 @@ export default {
   mounted() {
   },
   methods: {
+    jumpReform() {
+      this.$router.push({ path: '/hidden_danger/hidden_reform', query: { isBacklog: true }})
+    },
+    jumpReview() {
+      this.$router.push({ path: '/hidden_danger/hidden_review', query: { isBacklog: true }})
+    }
   }
 }
 </script>

src/components/selDept/index.vue

@@ -352,6 +352,9 @@ export default {
 <style lang="scss" scoped>
   .el-card {
     margin-top: 0px;
+    ::v-deep.el-table__row{
+      font-size: 14px;
+    }
   }
   .app-container{
     padding: 0px;

src/components/show_images/api/index.js

@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+import store from '@/store/modules/user'
+
+var roles = store.state.roles.replace(/;/g, '')
+
+export default {
+  getDate(pageSize, pageNo, data_id, table_name) {
+    return request({
+      url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_attach&user_id=${roles}`,
+      method: 'post',
+      data: `start=${pageNo}&limit=${pageSize}&where_sql=sys_attach.data_id = ? and sys_attach.table_name = ?&where_type=string;string&where_value=${data_id};${table_name}`
+    }).then(response => response.data)
+  },
+  Delete(ids) {
+    let keys = ''
+    ids.forEach(d => {
+      keys += 'keyid=' + d + '&'
+    })
+    return request({
+      url: `/commonAction.do`,
+      method: 'post',
+      data: `funid=sys_attach&${keys}pagetype=editgrid&eventcode=delete&user_id=${roles}&dataType=json`
+    }).then(response => response.data)
+  },
+  getFormDate(id) {
+    return request({
+      url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=safe_insp&user_id=${roles}`,
+      method: 'post',
+      data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
+    }).then(response => response.data)
+  },
+  downLoad(keys) {
+    const timestamp = new Date().getTime()
+    return request({
+      url: `fileAction.do?funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=${timestamp}`,
+      method: 'get'
+      // data: `funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=${timestamp}`
+    })
+  }
+}

src/components/show_images/index.vue

@@ -0,0 +1,262 @@
+<template>
+  <el-card>
+    <div v-for="(item , i) in imgList" :key="i" class="img">
+      <el-image :preview-src-list="imgPathList" :src="baseUrl +'?funid=sys_attach&pagetype=editgrid&eventcode=down&nousercheck=1&dataType=byte&keyid='+ item.sys_attach__attach_id +'&is_highimage=1'" />
+    </div>
+  </el-card>
+</template>
+
+<script>
+import api from './api'
+import store from '@/store/modules/user'
+
+var roles = store.state.roles.replace(/;/g, '')
+export default {
+  name: 'SafeIdsp',
+  components: {
+    // buttons
+  },
+  props: {
+    dataId: {
+      type: String,
+      default: null
+    },
+    tableName: {
+      type: String,
+      default: null
+    },
+    funId: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      data: [],
+      deptTree: [],
+      ids: [],
+      levels: [],
+      pager: {
+        pageNo: 0,
+        pageSize: 100,
+        total: 0
+      },
+      value: '',
+      dept_id: '',
+      level: '',
+      id: '',
+      parent_id: '',
+      form: {
+        dept_name: '',
+        dept_code: '',
+        memo: ''
+      },
+      dialogFormVisible: false,
+      dialogEditVisible: false,
+      formLabelWidth: '120px',
+      auditForm: {},
+      saveFrom: {},
+      treeData: [],
+      defaultProps: {
+        children: 'children',
+        label: 'sys_dept__dept_name'
+      },
+      treeList: [],
+      whereSql: false,
+      whereValue: '',
+      formData: {},
+      attach_path: null,
+      baseUrl: window.location.origin + '/bwhse/fileAction.do',
+      href: '',
+      imgList: [],
+      imgPathList: []
+    }
+  },
+  created() {
+    this.getList()
+    this.initFormData()
+  },
+  mounted() {
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      let pageNo = this.pager.pageNo * this.pager.pageSize - this.pager.pageSize
+      if (pageNo < 0) {
+        pageNo = 0
+      }
+      api.getDate(
+        this.pager.pageSize,
+        pageNo,
+        this.dataId,
+        this.tableName
+      ).then(data => {
+        if (data.success) {
+          this.data = data.data.root
+
+          this.imgList = this.data.filter(d => {
+            return d.sys_attach__content_type === 'image/png'
+          })
+          this.imgPathList = this.imgList.map(d => {
+            return `${this.baseUrl}?funid=sys_attach&pagetype=editgrid&eventcode=down&nousercheck=1&dataType=byte&keyid=${d.sys_attach__attach_id}&is_highimage=1`
+          })
+          console.log(this.imgList, 'this.imgList')
+          this.pager.total = data.data.total
+          setTimeout(() => {
+            this.loading = false
+          }, 200)
+        } else {
+          this.$message.error(data.message)
+        }
+      })
+    },
+    initFormData() {
+      this.formData.attach_path = ''
+      this.formData.funid = 'sys_attach'
+      this.formData.eventcode = 'create'
+      this.formData.nousercheck = '1'
+      this.formData.table_name = this.tableName
+      this.formData.datafunid = this.funId
+      this.formData.user_id = 'administrator'
+      this.formData.dataid = this.dataId[0]
+    },
+    create() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          const data = `funid=sys_dept&parentId=${this.dept_id}&levelCol=sys_dept.dept_level&keyid=&pagetype=editgrid&eventcode=save_eg&sys_dept__dept_code=${this.form.dept_code}&sys_dept__dept_name=${this.form.dept_name}&sys_dept__memo=${this.form.memo}&sys_dept__is_novalid=0&sys_dept__dept_id=&sys_dept__dept_level=${Number(this.level) + 1}&user_id=administrator&dataType= json`
+          api.Crerte(data).then(data => {
+            if (data.success) {
+              this.getList()
+              this.dialogFormVisible = false
+              this.$refs['form'].resetFields()
+              this.form.dept_name = ''
+              this.form.dept_code = ''
+              this.$message.success('新增成功！')
+            } else {
+              this.$message.error(data.message)
+            }
+          })
+        }
+      })
+    },
+    Delete(row) {
+      this.ids = []
+      this.ids.push(row.sys_attach__attach_id)
+      this.editDelete()
+    },
+    editDelete() {
+      if (this.ids && this.ids.length > 0) {
+        this.$confirm('确认删除附件？').then(() => {
+          api.Delete(this.ids).then(data => {
+            if (data.success) {
+              this.getList()
+              this.$message.success('删除成功！')
+            } else {
+              this.$message.error(data.message)
+            }
+          })
+        }).catch(() => {})
+      } else {
+        this.$message.warning('请选择数据进行删除')
+      }
+    },
+    editSave() {
+      console.log('editSave')
+    },
+    upload() {
+      console.log('upload')
+    },
+    edit(row) {
+      this.id = row.attach_id
+      this.parent_id = this.id.substring(0, this.id.length - 4)
+      console.log(this.parent_id, this.id)
+      this.auditForm = row
+      this.dialogEditVisible = true
+    },
+    auditFormChange(form) {
+      this.saveFrom = form
+    },
+    cellDblclick(row) {
+    },
+    sizeChange(size) {
+      this.pager.pageSize = size
+      this.getList()
+    },
+    pageChange(page) {
+      this.pager.pageNo = page
+      this.getList()
+    },
+    handleSelectionChange(val) {
+      console.log(val)
+      this.ids = val.map(d => d.sys_attach__attach_id)
+    },
+    async downLoadAttach(row) {
+      const timestamp = new Date().getTime()
+      this.href = `${this.baseUrl}?funid=sys_attach&keyid=${row.sys_attach__attach_id}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=${timestamp}`
+      // await api.downLoad(row.sys_attach__attach_id)
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList)
+    },
+    handlePreview(file) {
+      console.log(file)
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 9 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
+    },
+    onChange(file) {
+      this.formData.attach_path = file.raw
+    },
+    onSuccess() {
+      this.$message.success('上传成功！')
+      this.getList()
+      this.$refs.upload.clearFiles()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .el-card {
+    margin-top: 10px;
+  }
+  .el-table__row {
+    a {
+      color: blue;
+      text-decoration: underline;
+    }
+  }
+  .buttons{
+    display: flex;
+  }
+  .el-button--primary {
+    height: 26.8px;
+    margin-right: 10px;
+  }
+  .pagination{
+    overflow: auto;
+  }
+  .img{
+    display: inline-block;
+    width: 188px;
+    height: 108px;
+    text-align: center;
+    line-height: 58px;
+    border-radius: 4px;
+    overflow: hidden;
+    background: #fff;
+    position: relative;
+    box-shadow: 2px 2px 5px;
+    margin-right: 4px;
+    box-sizing: border-box;
+    padding: 10px;
+    margin: 20px;
+    .el-image{
+      width: 100%;
+      height: 100%;
+    }
+  }
+</style>

src/store/getters.js

@@ -5,6 +5,10 @@ const getters = {
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,
+  userName: state => state.user.userName,
+  userId: state => state.user.userId,
+  deptName: state => state.user.deptName,
+  deptId: state => state.user.deptId,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   introduction: state => state.user.introduction,

src/store/modules/user.js

@@ -8,7 +8,11 @@ const state = {
   name: '',
   avatar: '',
   introduction: '',
-  roles: []
+  roles: [],
+  userName: '',
+  userId: '',
+  deptName: '',
+  deptId: ''
 }
 
 const mutations = {
@@ -26,6 +30,18 @@ const mutations = {
   },
   SET_ROLES: (state, roles) => {
     state.roles = roles
+  },
+  USER_NAME: (state, userName) => {
+    state.userName = userName
+  },
+  USER_ID: (state, userId) => {
+    state.userId = userId
+  },
+  DEPT_NAME: (state, deptName) => {
+    state.deptName = deptName
+  },
+  DEPT_ID: (state, deptId) => {
+    state.deptId = deptId
   }
 }
 
@@ -39,8 +55,16 @@ const actions = {
           commit('SET_ROLES', res.data.data.role_id)
           // const { data } = res.data
           commit('SET_TOKEN', 'bwhse')
+          commit('USER_NAME', res.data.data.user_name)
+          commit('USER_ID', res.data.data.user_id)
+          commit('DEPT_NAME', res.data.data.dept_name)
+          commit('DEPT_ID', res.data.data.dept_id)
           setToken('bwhse')
           sessionStorage.setItem('ROLES', res.data.data.role_id)
+          sessionStorage.setItem('USER_NAME', res.data.data.user_name)
+          sessionStorage.setItem('USER_ID', res.data.data.user_id)
+          sessionStorage.setItem('DEPT_NAME', res.data.data.dept_name)
+          sessionStorage.setItem('DEPT_ID', res.data.data.dept_id)
           resolve()
         } else {
           Vue.prototype.$message.error(res.data.message)
@@ -85,6 +109,10 @@ const actions = {
       // logout(state.token).then(() => {
       commit('SET_TOKEN', '')
       commit('SET_ROLES', [])
+      commit('USER_NAME', '')
+      commit('USER_ID', '')
+      commit('DEPT_NAME', '')
+      commit('DEPT_ID', '')
       sessionStorage.clear
       removeToken()
       resetRouter()
@@ -104,6 +132,10 @@ const actions = {
   getRoles({ commit }, roles) {
     return new Promise(resolve => {
       commit('SET_ROLES', roles)
+      commit('USER_NAME', sessionStorage.getItem('USER_NAME'))
+      commit('USER_ID', sessionStorage.getItem('USER_ID'))
+      commit('DEPT_NAME', sessionStorage.getItem('DEPT_NAME'))
+      commit('DEPT_ID', sessionStorage.getItem('DEPT_ID'))
       resolve()
     })
   },

src/styles/element-ui.scss

@@ -158,3 +158,38 @@
 // .el-input--medium .el-input__icon {
 //   line-height: 26.8px;
 // }
+
+.el-tree .el-tree-node__expand-icon.expanded {
+  -webkit-transform: rotate(0deg);
+  transform: rotate(0deg);
+}
+//有子节点 且未展开
+.el-tree .el-icon-caret-right:before {
+  background: url("../assets/images/1.png") no-repeat;
+  content: "";
+  display: block;
+  width: 16px;
+  height: 16px;
+  font-size: 16px;
+  background-size: 16px;
+}
+//有子节点 且已展开
+.el-tree .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
+  background: url("../assets/images/2.png") no-repeat 0 3px;
+  content: "";
+  display: block;
+  width: 16px;
+  height: 16px;
+  font-size: 16px;
+  background-size: 16px;
+}
+//没有子节点
+.el-tree .el-tree-node__expand-icon.is-leaf::before {
+  background: url("../assets/images/3.png") no-repeat;
+  content: "";
+  display: block;
+  width: 16px;
+  height: 16px;
+  font-size: 16px;
+  background-size: 16px;
+}

src/utils/index.js

@@ -78,7 +78,7 @@ export function parseDay(time, cFormat) {
   }
   const formatObj = {
     y: date.getFullYear(),
-    m: date.getMonth() + 2,
+    m: date.getMonth() + 1,
     d: date.getDate(),
     h: date.getHours(),
     i: date.getMinutes(),

src/views/hidden_check/components/create/index.vue

@@ -54,19 +54,19 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="检查地点">
-              <el-input v-model="form.hidden_danger__check_location" />
+              <el-input v-model="form.hidden_danger__check_location" maxlength="250" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="7">
             <el-form-item label="检查内容">
-              <el-input v-model="form.hidden_danger__check_content" type="textarea" />
+              <el-input v-model="form.hidden_danger__check_content" type="textarea" maxlength="500" />
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="隐患描述" prop="hidden_danger__check_problem">
-              <el-input v-model="form.hidden_danger__check_problem" type="textarea" />
+              <el-input v-model="form.hidden_danger__check_problem" type="textarea" maxlength="500" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -148,7 +148,7 @@
     >
       <SelDept ref="ReformDept" @updateDept="getReformDept" />
       <span>
-        <el-button @click="reformDeptVisible = false">取 消</el-button>
+        <!-- <el-button @click="reformDeptVisible = false">取 消</el-button> -->
         <el-button type="primary" @click="selReformDept">确 定</el-button>
       </span>
     </el-dialog>
@@ -161,6 +161,7 @@ import publicApi from '@/api/public'
 import buttons from '@/components/formBtn'
 import SelUser from '@/components/selUser'
 import SelDept from '@/components/selDept'
+import { parseDay } from '@/utils/index'
 export default {
   name: 'HiddenCheckCreateForm',
   components: {
@@ -177,9 +178,9 @@ export default {
       form: {
         hidden_danger__hidden_code: '',
         hidden_danger__hidden_state: '1',
-        hidden_danger__check_man: '',
+        hidden_danger__check_man: this.$store.state.user.userName,
-        hidden_danger__check_dept: '',
+        hidden_danger__check_dept: this.$store.state.user.deptName,
-        hidden_danger__check_date: '',
+        hidden_danger__check_date: parseDay(new Date()),
         hidden_danger__check_location: '',
         hidden_danger__check_content: '',
         hidden_danger__check_problem: '',
@@ -195,8 +196,8 @@ export default {
         hidden_danger__insp_det_id: '',
         hidden_danger__hidden_danger_id: '',
         hidden_danger__dept_id: '',
-        hidden_danger__check_man_id: '',
+        hidden_danger__check_man_id: this.$store.state.user.userId,
-        hidden_danger__check_dept_id: ''
+        hidden_danger__check_dept_id: this.$store.state.user.deptId
       },
       rules: {
         hidden_danger__check_man: [
@@ -230,6 +231,8 @@ export default {
     }
   },
   created() {
+    console.log(this.$store)
+    console.log(this.form)
     this.getHiddenState()
   },
   methods: {

src/views/hidden_check/components/edit_form/index.vue

@@ -54,19 +54,19 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="检查地点">
-              <el-input v-model="form.hidden_danger__check_location" />
+              <el-input v-model="form.hidden_danger__check_location" maxlength="250" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="7">
             <el-form-item label="检查内容">
-              <el-input v-model="form.hidden_danger__check_content" type="textarea" />
+              <el-input v-model="form.hidden_danger__check_content" type="textarea" maxlength="500" />
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="隐患描述" prop="hidden_danger__check_problem">
-              <el-input v-model="form.hidden_danger__check_problem" type="textarea" />
+              <el-input v-model="form.hidden_danger__check_problem" type="textarea" maxlength="500" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -100,6 +100,16 @@
         </el-row>
       </el-form>
     </el-card>
+    <el-row>
+      <el-col class="img" :span="12">
+        <span class="img-title">隐患排查图片</span>
+        <ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_check" />
+      </el-col>
+      <el-col class="img" :span="12">
+        <span class="img-title">隐患整改图片</span>
+        <ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_check" />
+      </el-col>
+    </el-row>
     <el-dialog
       v-if="checkManVisible"
       title="选择人员"
@@ -161,12 +171,14 @@ import publicApi from '@/api/public'
 import buttons from '@/components/formBtn'
 import SelUser from '@/components/selUser'
 import SelDept from '@/components/selDept'
+import ShowImages from '@/components/show_images'
 export default {
   name: 'HiddenCheckAuditForm',
   components: {
     buttons,
     SelUser,
-    SelDept
+    SelDept,
+    ShowImages
   },
   // props: {
   //   id: { type: String, default: () => '' }
@@ -356,9 +368,6 @@ export default {
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
 }
-.el-col{
-  margin-left: 2%;
-}
 .buttons {
   display: flex;
   .el-button--primary {
@@ -366,4 +375,11 @@ export default {
     height: 26.8px;
   }
 }
+.img{
+    margin-top: 10px;
+    text-align: center;
+  span{
+    width: 100%;
+  }
+}
 </style>

src/views/hidden_reform/components/edit_form/index.vue

@@ -6,6 +6,9 @@
         <el-button type="primary" @click="back">返回列表</el-button>
       </div>
       <el-form ref="form" :model="form" label-width="80px" :rules="rules">
+        <div class="classify">
+          <div class="classify-title">|  <span>隐患排查</span></div>
+        </div>
         <el-row>
           <el-col :span="7">
             <el-form-item label="隐患编号">
@@ -100,6 +103,11 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="classify">
+          <div class="classify-title">
+            | <span>隐患整改</span>
+          </div>
+        </div>
         <el-row>
           <el-col :span="7">
             <el-form-item label="整改时间" prop="hidden_danger__reform_date">
@@ -120,7 +128,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="整改情况">
-              <el-input v-model="form.hidden_danger__reform_desc" placeholder="请输入整改情况" class="input-with-select" type="textarea" clearable />
+              <el-input v-model="form.hidden_danger__reform_desc" placeholder="请输入整改情况" class="input-with-select" type="textarea" clearable maxlength="500" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -382,4 +390,14 @@ export default {
     height: 26.8px;
   }
 }
+.classify{
+  width: 100%;
+  // display: inline-block;
+  padding: 10px 0;
+  font-weight: bold;
+  color: #1890ff;
+  span{
+    color: #000;
+  }
+}
 </style>

src/views/hidden_reform/index.vue

@@ -94,6 +94,7 @@ export default {
       data: [],
       deptTree: [],
       ids: [],
+      isBacklog: this.$route.query.isBacklog || false,
       levels: [],
       pager: {
         pageNo: 0,
@@ -198,6 +199,9 @@ export default {
     }
   },
   created() {
+    if (this.isBacklog) {
+      this.whereSql = ''
+    }
     this.getList()
   },
   mounted() {

src/views/hidden_review/components/edit_form/index.vue

@@ -6,6 +6,9 @@
         <el-button type="primary" @click="back">返回列表</el-button>
       </div>
       <el-form ref="form" :model="form" label-width="80px" :rules="rules">
+        <div class="classify">
+          <div class="classify-title">|  <span>隐患排查</span></div>
+        </div>
         <el-row>
           <el-col :span="7">
             <el-form-item label="隐患编号">
@@ -100,6 +103,9 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="classify">
+          <div class="classify-title">|  <span>隐患整改</span></div>
+        </div>
         <el-row>
           <el-col :span="7">
             <el-form-item label="整改时间" prop="hidden_danger__reform_date">
@@ -125,6 +131,9 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="classify">
+          <div class="classify-title">|  <span>隐患验收</span></div>
+        </div>
         <el-row>
           <el-col :span="7">
             <el-form-item label="验收时间" prop="hidden_danger__review_date">
@@ -147,7 +156,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="验收情况">
-              <el-input v-model="form.hidden_danger__review_desc" placeholder="请输入整改情况" class="input-with-select" type="textarea" clearable />
+              <el-input v-model="form.hidden_danger__review_desc" placeholder="请输入整改情况" class="input-with-select" type="textarea" clearable maxlength="500" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -436,4 +445,16 @@ export default {
     height: 26.8px;
   }
 }
+.classify{
+  width: 100%;
+  // display: inline-block;
+  padding: 10px 0;
+  font-weight: bold;
+  color: #1890ff;
+  span{
+    height: 100%;
+    line-height: 18.4px;
+    color: #000;
+  }
+}
 </style>

src/views/hidden_review/index.vue

@@ -90,6 +90,7 @@ export default {
       data: [],
       deptTree: [],
       ids: [],
+      isBacklog: this.$route.query.isBacklog || false,
       levels: [],
       pager: {
         pageNo: 0,
@@ -174,6 +175,9 @@ export default {
     }
   },
   created() {
+    if (this.isBacklog) {
+      this.whereSql = ''
+    }
     this.getList()
   },
   mounted() {
@@ -188,8 +192,7 @@ export default {
       api.getDate(
         this.pager.pageSize,
         pageNo,
-        this.whereSql,
+        this.whereSql
-        this.whereValue
       ).then(data => {
         if (data.success) {
           this.data = data.data.root

src/views/insp_name/components/edit_form/index.vue

@@ -26,7 +26,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="巡检名称">
-              <el-input v-model="form.safe_insp__insp_name" />
+              <el-input v-model="form.safe_insp__insp_name" maxlength="250" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -52,7 +52,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="备注">
-              <el-input v-model="form.safe_insp__insp_memo" />
+              <el-input v-model="form.safe_insp__insp_memo" maxlength="500" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/safe_insp/components/create/index.vue

@@ -9,7 +9,7 @@
         <el-row>
           <el-col :span="7">
             <el-form-item label="巡检单编号">
-              <el-input v-model="form.safe_insp__insp_code" />
+              <el-input v-model="form.safe_insp__insp_code" maxlength="250" />
             </el-form-item>
           </el-col>
           <el-col :span="7">
@@ -27,7 +27,7 @@
           <el-col :span="7">
             <el-form-item ref="safe_insp__insp_name" label="巡检名称" prop="safe_insp__insp_name">
               <el-input v-model="form.safe_insp__insp_name" placeholder="请选择巡检名称" class="input-with-select" clearable>
-                <el-button slot="append" icon="el-icon-search" @click="inspNameVisible = !inspNameVisible" />
+                <el-button slot="append" icon="el-icon-search" maxlength="250" @click="inspNameVisible = !inspNameVisible" />
               </el-input>
             </el-form-item>
           </el-col>
@@ -54,7 +54,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="备注">
-              <el-input v-model="form.safe_insp__insp_memo" />
+              <el-input v-model="form.safe_insp__insp_memo" maxlength="500" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/safe_insp/components/edit_form/index.vue

@@ -54,7 +54,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="备注">
-              <el-input v-model="form.safe_insp__insp_memo" />
+              <el-input v-model="form.safe_insp__insp_memo" maxlength="500" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -199,6 +199,7 @@ export default {
     console.log(this.id)
     this.getList()
     this.getTypeSel()
+    this.getInsptimes()
   },
   methods: {
     getList() {
@@ -215,7 +216,7 @@ export default {
       })
     },
     async getTypeSel() {
-      await publicApi.getTypeSel('insptimes').then(data => {
+      await publicApi.getTypeSel('inspstate').then(data => {
         if (data.success) {
           this.options = data.data.root
         } else {
@@ -227,6 +228,7 @@ export default {
       await publicApi.getTypeSel('insptimes').then(data => {
         if (data.success) {
           this.insptimes = data.data.root
+          console.log(this.insptimes, 'this.insptimes')
         } else {
           this.$message.error(data.message)
         }

src/views/safe_insp/components/insp_det/index.vue

@@ -56,6 +56,15 @@
 
     <el-dialog v-if="dialogFormVisible" :title="title" :visible.sync="dialogFormVisible" @close="closeDialog">
       <el-form ref="form" :model="form" :rules="rules">
+        <el-form-item label="巡检项目" :label-width="formLabelWidth" prop="det_desc">
+          <el-input v-model="form.insp_det__det_name" type="text" disabled="false" />
+        </el-form-item>
+        <el-form-item label="巡检标准" :label-width="formLabelWidth" prop="det_desc">
+          <el-input v-model="form.insp_det__det_std" type="text" disabled="false" />
+        </el-form-item>
+        <el-form-item label="巡检方法" :label-width="formLabelWidth" prop="det_desc">
+          <el-input v-model="form.insp_det__det_way" type="text" disabled="false" />
+        </el-form-item>
         <el-form-item label="巡检结果" :label-width="formLabelWidth" prop="insp_det__det_result">
           <el-select v-model="form.insp_det__det_result" placeholder="请选择">
             <el-option
@@ -67,7 +76,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="不符合描述" :label-width="formLabelWidth" prop="det_desc">
-          <el-input v-model="form.insp_det__det_desc" type="textarea" />
+          <el-input v-model="form.insp_det__det_desc" type="textarea" maxlength="500" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/sys_dept/components/auditDept.vue

@@ -13,13 +13,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="部门编码" :label-width="formLabelWidth" prop="sys_dept__dept_code">
-          <el-input v-model="form.sys_dept__dept_code" @change="change" />
+          <el-input v-model="form.sys_dept__dept_code" maxlength="40" @change="change" />
         </el-form-item>
         <el-form-item label="部门名称" :label-width="formLabelWidth" prop="sys_dept__dept_name">
           <el-input v-model="form.sys_dept__dept_name" @change="change" />
         </el-form-item>
         <el-form-item label="备注" :label-width="formLabelWidth" prop="sys_dept__memo">
-          <el-input v-model="form.sys_dept__memo" @change="change" />
+          <el-input v-model="form.sys_dept__memo" maxlength="100" @change="change" />
         </el-form-item>
         <el-form-item label="是否注销" :label-width="formLabelWidth">
           <el-select v-model="form.sys_dept__is_novalid" placeholder="请选择" @change="change">

src/views/sys_dept/index.vue

@@ -40,7 +40,7 @@
                   </div>
                   <div v-else-if="d.label === '操作'">
                     <el-button icon="el-icon-view" type="text" title="编辑" @click="edit(scope.row)" />
-                    <el-button v-if="scope.row.status !== 'NULLIFY'" icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" />
+                    <!-- <el-button v-if="scope.row.status !== 'NULLIFY'" icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" /> -->
                   </div>
                   <div v-else>{{ scope.row[d.prop] }}</div>
                 </template>
@@ -416,4 +416,9 @@ export default {
   .el-card {
     margin-top: 10px;
   }
+  .el-tree{
+    height: 500px;
+    overflow-x:auto;
+    overflow-y:auto;
+  }
 </style>

src/views/sys_user/components/auditUser.vue

@@ -14,7 +14,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="部门名称" prop="sys_dept__dept_name">
+            <el-form-item ref="sys_dept__dept_name" label="部门名称" prop="sys_dept__dept_name">
               <el-input v-model="form.sys_dept__dept_name" placeholder="请选择部门" class="input-with-select" clearable>
                 <el-button slot="append" icon="el-icon-search" @click="selDeptVisible = !selDeptVisible" />
               </el-input>
@@ -84,7 +84,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="备注">
-              <el-input v-model="form.sys_user__memo" @change="change" />
+              <el-input v-model="form.sys_user__memo" maxlength="100" @change="change" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -100,7 +100,7 @@
     >
       <SelDept ref="seLDept" selective="single" @updateDept="updateDept" @updateDepts="updateDepts" />
       <span>
-        <el-button @click="selDeptVisible = false">取 消</el-button>
+        <el-button @click="reformDeptVisible = false">取 消</el-button>
       </span>
     </el-dialog>
   </div>
@@ -157,6 +157,14 @@ export default {
       selDeptVisible: false
     }
   },
+  watch: {
+    'form.sys_dept__dept_name': {
+      handler(val, oldVal) {
+        this.$refs['sys_dept__dept_name'].clearValidate()
+      },
+      deep: true
+    }
+  },
   async created() {
     await this.getYesNo()
     await this.getSex()

src/views/sys_user/index.vue

@@ -51,7 +51,7 @@
                   </div>
                   <div v-else-if="d.label === '操作'">
                     <el-button icon="el-icon-view" type="text" title="编辑" @click="edit(scope.row)" />
-                    <el-button v-if="scope.row.status !== 'NULLIFY'" icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" />
+                    <!-- <el-button v-if="scope.row.status !== 'NULLIFY'" icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" /> -->
                   </div>
                   <div v-else>{{ scope.row[d.prop] }}</div>
                 </template>