1014

src/layout/components/Sidebar/SidebarItem.vue

@@ -2,16 +2,16 @@
   <div v-if="!item.hidden">
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
+        <el-menu-item  style="padding-left: 25px;":index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
          <!-- <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" /> -->
 
-         <div  style="display: inline-block;text-align: center;" :class="{'open':!sidebar.opened,'close':sidebar.opened}">
+        <div  style="display: inline-block;text-align: center;" :class="{'open':!sidebar.opened,'close':sidebar.opened}">
               <i :class="(item.meta&&item.meta.icon)?('fa '+item.meta.icon):'fa fa-file-o'  " style="font-size: 14px;color: #fff;" ></i>
           </div>
           <el-tooltip class="item" effect="dark" :content="(item&&item.meta&&item.meta.title)?item.meta.title:item.title||onlyOneChild.meta.title" placement="right">
                <span>{{(item&&item.meta&&item.meta.title)?item.meta.title:item.title||onlyOneChild.meta.title}}</span>
            </el-tooltip>
-           
+
         </el-menu-item>
       </app-link>
     </template>

src/router/index.js

@@ -96,7 +96,7 @@ export const constantRoutes = [
     hidden: false,
     alwaysShow:true,
     redirect: 'noredirect',
-    meta: {title: "基础数据", icon: "system", noCache: false, link: null,mkid:105000000},
+    meta: {title: "基础数据", icon: "fa-cog", noCache: false, link: null,mkid:105000000},
     children: [
       {
        commonComponent:'organizationalManagement',
@@ -104,7 +104,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "组织管理",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -118,7 +118,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "公告管理",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -132,7 +132,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "安全文档管理",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -146,7 +146,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "标准作业文档管理",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -163,7 +163,7 @@ export const constantRoutes = [
     hidden: false,
     alwaysShow:true,
     redirect: 'noredirect',
-    meta: {title: "隐患管理", icon: "system", noCache: false, link: null,mkid:105000000},
+    meta: {title: "隐患管理", icon: "fa-cog", noCache: false, link: null,mkid:105000000},
     children: [
       {
        commonComponent:'maintenanceDg',
@@ -171,7 +171,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "维护隐患检查标准",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -185,7 +185,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "录入安全隐患记录",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -199,7 +199,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "安全隐患处理记录",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -214,7 +214,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "录入隐患整改情况",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -229,7 +229,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "录入隐患复查记录",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -243,7 +243,7 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "查询安全隐患记录",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
@@ -260,7 +260,7 @@ export const constantRoutes = [
     hidden: false,
     alwaysShow:true,
     redirect: 'screeningCriteria',
-    meta: {title: "风险预控", icon: "system", noCache: false, link: null,mkid:105000000},
+    meta: {title: "风险预控", icon: "fa-cog", noCache: false, link: null,mkid:105000000},
     children: [
       {
        commonComponent:'screeningCriteria',
@@ -268,13 +268,27 @@ export const constantRoutes = [
        hidden:false,
        meta:{
            "title": "维护风险排查标准",
-           "icon": "user",
+           "icon": "",
            "noCache": false,
            "link": null,
            "mkid":101001300,
        },
        name:'screeningCriteria',
        path:"screeningCriteria"
+      },
+      {
+       commonComponent:'maintenanceRiskTask',
+       component:() => import( "@/views/riskPrecontrol/maintenanceRiskTask/index"),
+       hidden:false,
+       meta:{
+           "title": "维护风险排查任务",
+           "icon": "",
+           "noCache": false,
+           "link": null,
+           "mkid":101001300,
+       },
+       name:'maintenanceRiskTask',
+       path:"maintenanceRiskTask"
       }
     ]
   },

src/views/login.vue

 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">格物后台管理系统</h3>
+      <h3 class="title">陕钢安全管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

src/views/riskPrecontrol/maintenanceRiskTask/content.vue

+<template>
+  <div class="min_full" style="height: calc(84vh - 75px);">
+    <!-- 按钮操作-->
+    <el-row class="tool-bar">
+		<PrintButton :app='app'></PrintButton>
+      <ViewButton ref="view" :app='app'></ViewButton>
+      <AddButton ref="add" :app='app'></AddButton>
+      <CopyButton ref="copy" :app='app'></CopyButton>
+      <EditButton ref="edit" :app='app'></EditButton>
+	  <FieldButton  :app='app'></FieldButton>
+      <ExcelButton :app='app'></ExcelButton>
+    </el-row>
+    <!-- 表格-->
+    <div class="tablePagers">
+      <TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
+        @getRow='getRow'>
+        <!-- 自定义列 slot="tabCustom",格式参照elementUi,自定义事件用this.$refs['TablePager']调用/或者v-slot通信/-->
+      </TablePager>
+    </div>
+  </div>
+</template>
+
+<script>
+  /* 引入需要的接口*/
+  import {
+    QueryAppversion,
+    QueryApptype,
+    AddAppversion,
+    DelAppversion,
+    UpdateAppversion
+  } from "common/src/api/system/dmgSystem.js";
+  /* edit页面*/
+    import {tableMixin} from 'common'
+  export default {
+    mixins: [tableMixin],
+    name: 'appVersion',
+    /* 初始额外赋值*/
+    async mounted() {
+      await this.$asRun(
+      [QueryApptype(),
+      res => {
+        var data = res['data']['records'];
+        let typeMap = []
+        for (var i in data) {
+          typeMap[data[i].id] = data[i].name
+        }
+        this.systemType = data
+        this.typeMap = typeMap
+      }
+      ]
+      )
+      this.$refs['TablePager'].pageQuery()
+    },
+    data() {
+      return {
+        /*需要的额外参数 */
+        typeMap: [],
+        systemType: [],
+        baseUrl: 'kzzx/appversion',
+        /* 查询参数*/
+        queryParams: {},
+        /* 表格标题对应参数*/
+        tableTitle: [{
+            prop: 'appid',
+            label: 'APPID',
+            width: '120'
+          },
+          {
+            prop: 'name',
+            label: 'APP名称',
+            width: '120'
+          },
+          {
+            prop: 'type',
+            label: '系统类型',
+            width: '120',
+            formatter: (row, column, cellValue, index) => {
+              var text = this.typeMap[cellValue]
+              return text;
+            }
+          },
+          {
+            prop: 'version',
+            label: 'app版本',
+            width: '120'
+          },
+          {
+            prop: 'url',
+            label: '下载路径',
+            width: '350'
+          },
+          {
+            prop: 'bz',
+            label: '备注',
+            width: '140'
+          },
+          {
+            prop: 'whr',
+            label: '维护人',
+            width: '100'
+          },
+          {
+            prop: 'whsj',
+            label: '维护时间',
+            ...this.$common('ftDateTime')
+          },
+        ]
+      }
+    },
+    methods: {
+      /* 基础查询*/
+      query: QueryAppversion,
+      /* 基础增*/
+      apiAdd: AddAppversion,
+      /* 基础更新*/
+      apiUpdate: UpdateAppversion,
+      /* 删除操作*/
+      apiDelete: DelAppversion,
+      /* 初始化赋值操作*/
+    },
+    /* 注册组件*/
+    components: {
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/riskPrecontrol/maintenanceRiskTask/cycle.vue

+<template>
+  <div class="min_full" style="height: calc(84vh - 75px);">
+    <!-- 按钮操作-->
+    <el-row class="tool-bar">
+		<PrintButton :app='app'></PrintButton>
+      <ViewButton ref="view" :app='app'></ViewButton>
+      <AddButton ref="add" :app='app'></AddButton>
+      <CopyButton ref="copy" :app='app'></CopyButton>
+      <EditButton ref="edit" :app='app'></EditButton>
+	  <FieldButton  :app='app'></FieldButton>
+      <ExcelButton :app='app'></ExcelButton>
+    </el-row>
+    <!-- 表格-->
+    <div class="tablePagers">
+      <TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
+        @getRow='getRow'>
+        <!-- 自定义列 slot="tabCustom",格式参照elementUi,自定义事件用this.$refs['TablePager']调用/或者v-slot通信/-->
+      </TablePager>
+    </div>
+  </div>
+</template>
+
+<script>
+  /* 引入需要的接口*/
+  import {
+    QueryAppversion,
+    QueryApptype,
+    AddAppversion,
+    DelAppversion,
+    UpdateAppversion
+  } from "common/src/api/system/dmgSystem.js";
+  /* edit页面*/
+    import {tableMixin} from 'common'
+  export default {
+    mixins: [tableMixin],
+    name: 'appVersion',
+    /* 初始额外赋值*/
+    async mounted() {
+      await this.$asRun(
+      [QueryApptype(),
+      res => {
+        var data = res['data']['records'];
+        let typeMap = []
+        for (var i in data) {
+          typeMap[data[i].id] = data[i].name
+        }
+        this.systemType = data
+        this.typeMap = typeMap
+      }
+      ]
+      )
+      this.$refs['TablePager'].pageQuery()
+    },
+    data() {
+      return {
+        /*需要的额外参数 */
+        typeMap: [],
+        systemType: [],
+        baseUrl: 'kzzx/appversion',
+        /* 查询参数*/
+        queryParams: {},
+        /* 表格标题对应参数*/
+        tableTitle: [{
+            prop: 'appid',
+            label: 'APPID',
+            width: '120'
+          },
+          {
+            prop: 'name',
+            label: 'APP名称',
+            width: '120'
+          },
+          {
+            prop: 'type',
+            label: '系统类型',
+            width: '120',
+            formatter: (row, column, cellValue, index) => {
+              var text = this.typeMap[cellValue]
+              return text;
+            }
+          },
+          {
+            prop: 'version',
+            label: 'app版本',
+            width: '120'
+          },
+          {
+            prop: 'url',
+            label: '下载路径',
+            width: '350'
+          },
+          {
+            prop: 'bz',
+            label: '备注',
+            width: '140'
+          },
+          {
+            prop: 'whr',
+            label: '维护人',
+            width: '100'
+          },
+          {
+            prop: 'whsj',
+            label: '维护时间',
+            ...this.$common('ftDateTime')
+          },
+        ]
+      }
+    },
+    methods: {
+      /* 基础查询*/
+      query: QueryAppversion,
+      /* 基础增*/
+      apiAdd: AddAppversion,
+      /* 基础更新*/
+      apiUpdate: UpdateAppversion,
+      /* 删除操作*/
+      apiDelete: DelAppversion,
+      /* 初始化赋值操作*/
+    },
+    /* 注册组件*/
+    components: {
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/riskPrecontrol/maintenanceRiskTask/details.vue

+<template>
+  <div class="form-detail">
+    <el-form ref="form" label-width='auto'  :model="form" >
+       <el-row :gutter="20">
+         <el-col :span="8">
+           <el-form-item label="部门或分厂">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="车间">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="岗位">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="地点">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="作业活动设施风险点">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="事故类型">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+
+         <el-col :span="8">
+           <el-form-item label="危险等级">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="危险分值">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label=" 风险类型">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+
+         <el-col :span="8">
+           <el-form-item label="管控措施落实后等级">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="管理层级">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="拍照选项">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+
+         <el-col :span="24">
+           <el-form-item label="检查要点">
+             <el-input type="textarea">
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="24">
+           <el-form-item label="危害因素">
+             <el-input type="textarea" >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="24">
+           <el-form-item label="事故后果">
+             <el-input type="textarea">
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="24">
+           <el-form-item label="检查措施描述">
+             <el-input type="textarea">
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="24">
+           <el-form-item label="备注">
+             <el-input type="textarea" >
+             </el-input>
+           </el-form-item>
+         </el-col>
+    <el-col :span="8">
+           <el-form-item label="序号">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="图形编号">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="措施类型">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="基准精度">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="基准维度">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="责任人">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+
+       </el-row>
+     </el-form>
+  </div>
+
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+
+        methods: {
+
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .form-detail{
+    height: 500px;
+    width: 100%;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+</style>

src/views/riskPrecontrol/maintenanceRiskTask/edit.vue

+<template>
+  <RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
+    <!-- 填写表单内容，slot=form必写-->
+    <el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="标题"  ref="roleid" prop="roleid">
+            <el-input :readonly="readonly"   v-model="form.roleid"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="内容"  ref="roleid" prop="roleid">
+            <el-input :readonly="readonly" type="textarea"  v-model="form.roleid"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="有效期至">
+           <el-date-picker style="width: 100%;"
+                type="date"
+                placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="编制单位">
+           <el-select  placeholder="请选择"  style="width: 100%;" >
+            <!--  <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option> -->
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <!-- 按钮重写， -->
+    <!--   <div slot="reFooter">
+        <span slot="footer">
+           重写按钮写在这里，根据需要重写 slot(reFooter,foorer) 节点样式 重写方法需要在此页重新定义
+         </span>
+      </div> -->
+  </RelDialog>
+</template>
+<script>
+  import {editMixin} from 'common'
+  export default {
+    mixins: [editMixin],
+    /* 存放index页面传递的额外参数*/
+    mounted() {
+    },
+    /* 组件名称*/
+    name: 'roleManagementEdit',
+    /* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
+
+    data() {
+      return {
+
+        /* 额外初始化，根据需求*/
+        systemType: [],
+
+        /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
+        form: {
+          roleid: '',
+          rolename: '',
+          bz: "",
+        },
+        /* form提交时的规则,具体规则参考官网*/
+        rules: {
+          roleid: [{
+            required: true,
+            trigger: 'blur'
+          }, ],
+          rolename: [{
+            required: true,
+            trigger: 'blur'
+          }, ]
+        }
+      }
+    },
+    methods: {
+
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/riskPrecontrol/maintenanceRiskTask/index.vue

+<template>
+  <div class="min_full" style="height: 140vh;">
+
+    <div class="min_full" style="height: 40%;">
+
+      <!-- 查询条件-->
+      <div class="search" v-condition>
+        <SearchButton :app='app'></SearchButton>
+        <el-row :gutter="20" class="search-row-1">
+          <el-col :span="6" class="search-col">
+            <div class="search-item">
+              <span class="search-span">岗位:</span>
+              <el-input  style="width:60% ;"></el-input>
+            </div>
+          </el-col>
+          <el-col :span="6" class="search-col">
+            <div class="search-item">
+              <span class="search-span">设备设施风险点:</span>
+             <el-input></el-input>
+            </div>
+          </el-col>
+
+        </el-row>
+      </div>
+      <!-- 按钮操作-->
+      <el-row class="tool-bar">
+        <PrintButton :app='app'></PrintButton>
+        <ViewButton ref="view" :app='app'></ViewButton>
+        <AddButton ref="add" :app='app'></AddButton>
+        <CopyButton ref="copy" :app='app'></CopyButton>
+        <EditButton ref="edit" :app='app'></EditButton>
+        <AttachFileButton :app='app'></AttachFileButton>
+        <FieldButton :app='app'></FieldButton>
+        <ExcelButton :app='app'></ExcelButton>
+        <!-- 额外按钮-->
+        <!-- 表头设置 -->
+
+        <!-- 权限-->
+      </el-row>
+      <!-- 表格-->
+      <div class="tablePagers">
+        <TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
+          @getRow='getRow'>
+
+        </TablePager>
+      </div>
+    </div>
+    <div class="min_full" style="height: 60%;padding: 10px;">
+      <!-- tabs -->
+      <el-tabs v-model="activeName" @tab-click="handleClick"  >
+    <el-tab-pane label="详细" name="first" >
+            <Details />
+    </el-tab-pane>
+        <el-tab-pane label="检查周期" name="second">
+          <Cycle />
+        </el-tab-pane>
+        <el-tab-pane label="检查内容" name="third">
+           <Content />
+        </el-tab-pane>
+        <el-tab-pane label="责任人" name="fourth">
+           <PersonLiable />
+        </el-tab-pane>
+      </el-tabs>
+  </div>
+
+  </div>
+</template>
+
+<script>
+  /* 引入需要的接口*/
+  import {
+    QueryKzzxRole,
+    QueryApptype,
+    AddKzzxRole,
+    DeleteKzzxRole,
+    UpdateKzzxRole,
+    QtKzzxRole
+  } from "common/src/api/system/dmgSystem.js";
+  /* edit页面*/
+  import Edit from './edit'
+  import Details from './details.vue'
+  import Cycle from './cycle.vue'
+  import Content from './content.vue'
   import PersonLiable from './personLiable.vue'
+  import {
+    tableMixin
+  } from 'common'
+  export default {
+    mixins: [tableMixin],
+    name: 'appVersion',
+
+    /* 初始额外赋值*/
+    async mounted() {
+      this.$refs['TablePager'].pageQuery()
+    },
+    data() {
+      return {
+        activeName: 'first',
+        /*需要的额外参数 */
+        showDialog: false,
+        DialogName: '',
+        type: '',
+        DialogTitle: '',
+        /* 基础url*/
+        baseUrl: 'kzzx/role',
+        /* 查询参数*/
+        queryParams: {
+          ksrq: '',
+          jsrq: ''
+        },
+        /* 表格标题对应参数*/
+        tableTitle: [
+          {
+            prop: 'whsj',
+            label: '时间',
+            show:false,
+            fieldType:'ftDateTime',
+            width: '100',
+            align:'left'
+          },
+          {
+            prop: 'whsj',
+            label: '车间',
+            ...this.$common('ftDateTime')
+          },
+          {
+            prop: 'whr',
+            label: '岗位',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '地点',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '作业活动设施风险点',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '事故类型',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '危险等级',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '危险分值',
+            width: '100'
+          },
+
+          {
+            prop: 'whr',
+            label: '风险类型',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '管控措施落实后等级',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '管理层级',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '拍照选项',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '序号',
+            width: '100'
+          },
+
+          {
+            prop: 'whr',
+            label: '图形编号',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '措施类型',
+            width: '100'
+          }
+        ]
+      }
+    },
+    methods: {
+      handleClick(val){
+        console.log(val,'val')
+      },
+      /* 基础查询*/
+      query: QueryKzzxRole,
+      /* 基础增*/
+      apiAdd: AddKzzxRole,
+      /* 基础更新*/
+      apiUpdate: UpdateKzzxRole,
+      /* 删除操作*/
+      apiDelete: DeleteKzzxRole,
+      /* 初始化赋值操作*/
+      init() {
+
+      },
+      /* 启用停用*/
+      setEnable(id) {
+        this.$confirm('是否启用/停用该角色, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            id: id
+          }
+          QtKzzxRole(params).then(res => {
+            if (res.success) {
+              this.$success('操作成功')
+              this.app.$refs['TablePager'].reLoad()
+            } else {
+              this.$error(res.message || '操作失败')
+            }
+          })
+        })
+
+      }
+
+
+    },
+    components: {
+      Edit,
+      Details,
+      Cycle,
+      PersonLiable,
+      Content
+    }
+
+
+  }
+</script>
+
+<style scoped>
+  /deep/.el-tabs__item {
+    font-size: 13px;
+    color: #666;
+  }
+</style>

src/views/riskPrecontrol/maintenanceRiskTask/personLiable.vue

+<template>
+  <div class="min_full" style="height: calc(84vh - 75px);">
+    <!-- 按钮操作-->
+    <el-row class="tool-bar">
+		<PrintButton :app='app'></PrintButton>
+      <ViewButton ref="view" :app='app'></ViewButton>
+      <AddButton ref="add" :app='app'></AddButton>
+      <CopyButton ref="copy" :app='app'></CopyButton>
+      <EditButton ref="edit" :app='app'></EditButton>
+	  <FieldButton  :app='app'></FieldButton>
+      <ExcelButton :app='app'></ExcelButton>
+    </el-row>
+    <!-- 表格-->
+    <div class="tablePagers">
+      <TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
+        @getRow='getRow'>
+        <!-- 自定义列 slot="tabCustom",格式参照elementUi,自定义事件用this.$refs['TablePager']调用/或者v-slot通信/-->
+      </TablePager>
+    </div>
+  </div>
+</template>
+
+<script>
+  /* 引入需要的接口*/
+  import {
+    QueryAppversion,
+    QueryApptype,
+    AddAppversion,
+    DelAppversion,
+    UpdateAppversion
+  } from "common/src/api/system/dmgSystem.js";
+  /* edit页面*/
+    import {tableMixin} from 'common'
+  export default {
+    mixins: [tableMixin],
+    name: 'appVersion',
+    /* 初始额外赋值*/
+    async mounted() {
+      await this.$asRun(
+      [QueryApptype(),
+      res => {
+        var data = res['data']['records'];
+        let typeMap = []
+        for (var i in data) {
+          typeMap[data[i].id] = data[i].name
+        }
+        this.systemType = data
+        this.typeMap = typeMap
+      }
+      ]
+      )
+      this.$refs['TablePager'].pageQuery()
+    },
+    data() {
+      return {
+        /*需要的额外参数 */
+        typeMap: [],
+        systemType: [],
+        baseUrl: 'kzzx/appversion',
+        /* 查询参数*/
+        queryParams: {},
+        /* 表格标题对应参数*/
+        tableTitle: [{
+            prop: 'appid',
+            label: 'APPID',
+            width: '120'
+          },
+          {
+            prop: 'name',
+            label: 'APP名称',
+            width: '120'
+          },
+          {
+            prop: 'type',
+            label: '系统类型',
+            width: '120',
+            formatter: (row, column, cellValue, index) => {
+              var text = this.typeMap[cellValue]
+              return text;
+            }
+          },
+          {
+            prop: 'version',
+            label: 'app版本',
+            width: '120'
+          },
+          {
+            prop: 'url',
+            label: '下载路径',
+            width: '350'
+          },
+          {
+            prop: 'bz',
+            label: '备注',
+            width: '140'
+          },
+          {
+            prop: 'whr',
+            label: '维护人',
+            width: '100'
+          },
+          {
+            prop: 'whsj',
+            label: '维护时间',
+            ...this.$common('ftDateTime')
+          },
+        ]
+      }
+    },
+    methods: {
+      /* 基础查询*/
+      query: QueryAppversion,
+      /* 基础增*/
+      apiAdd: AddAppversion,
+      /* 基础更新*/
+      apiUpdate: UpdateAppversion,
+      /* 删除操作*/
+      apiDelete: DelAppversion,
+      /* 初始化赋值操作*/
+    },
+    /* 注册组件*/
+    components: {
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/riskPrecontrol/screeningCriteria/details.vue

 <template>
-  <div>
-    details
+  <div class="form-detail">
+    <el-form ref="form" label-width='auto'  :model="form" >
+       <el-row :gutter="20">
+         <el-col :span="8">
+           <el-form-item label="部门或分厂">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="车间">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="岗位">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="地点">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="作业活动设施风险点">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="事故类型">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+
+         <el-col :span="8">
+           <el-form-item label="危险等级">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="危险分值">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label=" 风险类型">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+
+         <el-col :span="8">
+           <el-form-item label="管控措施落实后等级">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="管理层级">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="拍照选项">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+
+         <el-col :span="24">
+           <el-form-item label="检查要点">
+             <el-input type="textarea">
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="24">
+           <el-form-item label="危害因素">
+             <el-input type="textarea" >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="24">
+           <el-form-item label="事故后果">
+             <el-input type="textarea">
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="24">
+           <el-form-item label="检查措施描述">
+             <el-input type="textarea">
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="24">
+           <el-form-item label="备注">
+             <el-input type="textarea" >
+             </el-input>
+           </el-form-item>
+         </el-col>
+    <el-col :span="8">
+           <el-form-item label="序号">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="图形编号">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="措施类型">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="基准精度">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="基准维度">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="8">
+           <el-form-item label="责任人">
+             <el-input >
+             </el-input>
+           </el-form-item>
+         </el-col>
+
+       </el-row>
+     </el-form>
   </div>
+
 </template>
 
 <script>
+  export default {
+    data() {
+      return {
+
+        methods: {
+
+        }
+      }
+    }
+  }
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style scoped>
+  .form-detail{
+    height: 500px;
+    width: 100%;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+</style>

src/views/riskPrecontrol/screeningCriteria/index.vue

@@ -9,16 +9,14 @@
         <el-row :gutter="20" class="search-row-1">
           <el-col :span="6" class="search-col">
             <div class="search-item">
-              <span class="search-span">开始日期:</span>
-              <el-date-picker v-model="queryParams.ksrq" type="date" placeholder="选择日期">
-              </el-date-picker>
+              <span class="search-span">岗位:</span>
+              <el-input  style="width:60% ;"></el-input>
             </div>
           </el-col>
           <el-col :span="6" class="search-col">
             <div class="search-item">
-              <span class="search-span">结束日期:</span>
-              <el-date-picker v-model="queryParams.jsrq" type="date" placeholder="选择日期">
-              </el-date-picker>
+              <span class="search-span">设备设施风险点:</span>
+             <el-input></el-input>
             </div>
           </el-col>
 
@@ -92,7 +90,8 @@
 
     /* 初始额外赋值*/
     async mounted() {
-      this.$refs['TablePager'].pageQuery()
+      this.$refs['TablePager'].pageQuery()
+      console.log(_)
     },
     data() {
       return {
@@ -110,36 +109,94 @@
           jsrq: ''
         },
         /* 表格标题对应参数*/
-        tableTitle: [{
+        tableTitle: [
+          {
             prop: 'whsj',
-            label: '公告日期',
-            ...this.$common('ftDateTime')
+            label: '时间',
+            show:false,
+            fieldType:'ftDateTime',
+            width: '100',
+            align:'left'
           },
           {
             prop: 'whsj',
-            label: '有效期至',
+            label: '车间',
             ...this.$common('ftDateTime')
           },
           {
             prop: 'whr',
-            label: '标题',
+            label: '岗位',
             width: '100'
           },
           {
             prop: 'whr',
-            label: '编制单位',
+            label: '地点',
             width: '100'
           },
           {
             prop: 'whr',
-            label: '内容',
+            label: '作业活动设施风险点',
             width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '事故类型',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '危险等级',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '危险分值',
+            width: '100'
+          },
+
+          {
+            prop: 'whr',
+            label: '风险类型',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '管控措施落实后等级',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '管理层级',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '拍照选项',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '序号',
+            width: '100'
+          },
+
+          {
+            prop: 'whr',
+            label: '图形编号',
+            width: '100'
+          },
+          {
+            prop: 'whr',
+            label: '措施类型',
+            width: '100'
           }
         ]
       }
     },
     methods: {
-
+      handleClick(val){
+        console.log(val,'val')
+      },
       /* 基础查询*/
       query: QueryKzzxRole,
       /* 基础增*/