粮情监测页面

shanXiPlatform/package.json

@@ -30,6 +30,7 @@
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
     "jszip": "3.2.1",
+    "lint-staged": "^8.1.5",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
@@ -62,7 +63,7 @@
     "eslint-plugin-vue": "6.2.2",
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
-    "lint-staged": "8.1.5",
+    "lint-staged": "^8.1.5",
     "mockjs": "1.0.1-beta3",
     "plop": "2.3.0",
     "runjs": "4.3.2",

shanXiPlatform/src/router/index.js

@@ -17,7 +17,7 @@ import organizationalStructureTabs from '@/views/systemManagement/organizational
 
 import userTabs from '@/views/systemManagement/userManagement/userTabs'
 import safeTabs from '@/views/safeProduction/safeTabs'
-
+import reservesTabs from '@/views/reservesManagement/grainCheck/reservesTabs'
 /**
  * Note: sub-menu only appear when route children.length >= 1
  * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -183,11 +183,45 @@ export const constantRoutes = [
     children: [
       {
         path: 'grainCheck',
-        component: () => import('@/views/reservesManagement/grainCheck'),
+        component: reservesTabs,
         name: 'GrainCheck',
-        meta: { title: '粮情检测', icon: 'dashboard', affix: false }
+        redirect: 'grainCheck/newGrain',
+        meta: { title: '粮情检测', icon: 'dashboard', affix: false },
+
+        children: [
+          //   储量管理/粮情检测/最新粮情
+          {
+            path: 'newGrain',
+            component: () => import('@/views/reservesManagement/grainCheck/newGrain/index'),
+            name: 'NewGrain',
+
+            hidden: true,
+            meta: { title: '最新粮情检查记录', icon: 'dashboard', affix: false }
+          },
+
+          //   储量管理/粮情检测/全部粮情
+          {
+            path: 'allGrain',
+            component: () => import('@/views/reservesManagement/grainCheck/allGrain/index'),
+            name: 'AllGrain',
+
+            hidden: true,
+            meta: { title: '最新粮情检查记录', icon: 'dashboard', affix: false }
+          }
+
+        ]
 
       },
+
+      //  储量管理/粮情检测/新增最新粮情
+      {
+        path: '/grainCheck/addNewGrain',
+        component: () => import('@/views/reservesManagement/grainCheck/newGrain/addNewGrain'),
+        name: 'AddNewGrain',
+        hidden: true,
+        meta: { title: '新增最新粮情', icon: 'dashboard', affix: false, noCache: true }
+      },
+
       //  储量管理/机械通风
       {
         path: 'mechanicalVentilation',
@@ -274,32 +308,50 @@ export const constantRoutes = [
 
   // 安全生产
   {
+    // path: '/safeProduction',
+    // component: safeTabs,
+
+    // redirect: 'safeProduction/newSafe',
+    // name: 'SafeProduction',
+    // meta: { title: '安全生产', icon: 'dashboard', affix: false },
+
     path: '/safeProduction',
-    component: safeTabs,
+    component: Layout,
 
-    redirect: 'safeProduction/newSafe',
     name: 'SafeProduction',
     meta: { title: '安全生产', icon: 'dashboard', affix: false },
 
-    //   安全生产/最新安全巡查记录
     children: [
       {
-        path: 'newSafe',
 
-        component: () => import('@/views/safeProduction/newSafe'),
-        name: 'NewSafe',
-        hidden: true,
-        meta: { title: '最新安全巡查记录', icon: 'dashboard', affix: false }
-      },
-      //   安全生产/全部安全巡查记录
-      {
-        path: 'allSafe',
-        component: () => import('@/views/safeProduction/allSafe'),
-        name: 'AllSafe',
-        hidden: true,
-        meta: { title: '全部安全巡查记录', icon: 'dashboard', affix: false }
+        path: 'safeTabs',
+        component: safeTabs,
+        name: 'SafeTabs',
+        redirect: 'newSafe',
+
+        //   安全生产/最新安全巡查记录
+        children: [
+          {
+            path: 'newSafe',
+
+            component: () => import('@/views/safeProduction/newSafe'),
+            name: 'NewSafe',
+            hidden: true,
+            meta: { title: '最新安全巡查记录', icon: 'dashboard', affix: false }
+          },
+          //   安全生产/全部安全巡查记录
+          {
+            path: 'allSafe',
+            component: () => import('@/views/safeProduction/allSafe'),
+            name: 'AllSafe',
+            hidden: true,
+            meta: { title: '全部安全巡查记录', icon: 'dashboard', affix: false }
+          }
+        ]
       }
+
     ]
+
   },
 
   // 监督检查

shanXiPlatform/src/views/reservesManagement/grainCheck.vue

@@ -1,5 +0,0 @@
-<template>
-    <div>
-        粮情监测
-    </div>
-</template>

shanXiPlatform/src/views/reservesManagement/grainCheck/allGrain/index.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+    全部粮情检查记录
+  </div>
+</template>
+<script>
+export default {
+  name: 'AllGrain',
+  data() {
+    return {
+
+    }
+  }
+}
+</script>

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/addNewGrain.vue

@@ -0,0 +1,191 @@
+<template>
+  <div class="global">
+    <div class="mainContainer">
+      <div class="header">
+        <span>粮情检测类型:</span>
+        <span>保管员每周检查粮情</span>
+      </div>
+
+      <div class="table">
+        <el-table border stripe highlight-current-row :data="weekData" height="550">
+          <el-table-column
+            type="index"
+            align="center"
+            label="序号"
+            width="50px"
+          />
+          <el-table-column prop="checkTime" label="检查时间" align="center" />
+          <el-table-column prop="checkItem" label="检查项" align="center" />
+          <el-table-column prop="option" label="选项" align="center">
+            <template slot-scope="scope">
+              <el-radio-group v-model="scope.row.option.radio">
+                <el-radio label="1">{{ scope.row.option.status1 }}</el-radio>
+                <el-radio label="0">{{ scope.row.option.status2 }}</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <div class="btns">
+        <el-button type="success" plain>取消</el-button>
+        <el-button type="success">保存</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'AddNewGrain',
+  data() {
+    return {
+      // 每周数据
+      weekData: [
+        {
+          checkTime: '',
+          checkItem: ' 打印粮温检测结果',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+        {
+          checkTime: '',
+          checkItem: '开灯',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+
+        {
+          checkTime: '',
+          checkItem: '双人进仓',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+
+        {
+          checkTime: '',
+          checkItem: '气体浓度是否达标（氧气、磷化氢）',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+        {
+          checkTime: '',
+          checkItem: '照明灯是否正常',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+        {
+          checkTime: '',
+          checkItem: '色泽、气味是否正常',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+        {
+          checkTime: '',
+          checkItem: ' 虫害异常',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+        {
+          checkTime: '',
+          checkItem: '水分检测异常',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+
+        {
+          checkTime: '',
+          checkItem: '异常粮情',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+
+        {
+          checkTime: '',
+          checkItem: '锁门',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+
+        {
+          checkTime: '',
+          checkItem: '关灯',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+
+        {
+          checkTime: '',
+          checkItem: '粮情作业簿填写',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+
+        {
+          checkTime: '',
+          checkItem: '保管日志填写',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        },
+
+        {
+          checkTime: '',
+          checkItem: ' 粮情分析会',
+          option: {
+            status1: '是',
+            status1: '否',
+            radio: ''
+          }
+        }
+      ]
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.header {
+  margin-bottom: 20px;
+}
+.btns{
+    text-align:right;
+    margin-top:20px;
+}
+</style>

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/index.vue

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <div class="table">
+      <el-table
+        border
+        stripe
+        :data="newGrainData"
+        highlight-current-row
+      >
+        <el-table-column
+          type="index"
+          align="center"
+          label="序号"
+          width="50px"
+        />
+        <el-table-column prop="name" label="检查类型" align="center" />
+        <el-table-column prop="realName" label="最后记录时间" align="center" />
+        <el-table-column prop="role" label="状态" align="center" />
+        <el-table-column prop="position" label="有无异常" align="center" />
+        <el-table-column prop="telephone" label="异常项" align="center" />
+
+        <el-table-column
+          prop="operation"
+          label="操作"
+          align="center"
+          width="200px"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="add(scope.$index, scope.row)"
+            >新增</el-button>
+            <el-button
+              size="mini"
+              @click="moreRecords(scope.$index, scope.row)"
+            >更多记录</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'NewGrain',
+  data() {
+    return {
+      // 用户列表
+      newGrainData: [
+        {
+          name: 'aa',
+          realName: 'AA',
+          role: 'a',
+          warehouse: 'a',
+          telephone: 'a',
+          position: 'a',
+          btnStatus: true
+        },
+        {
+          name: 'aa',
+          realName: 'AA',
+          role: 'a',
+          warehouse: 'a',
+          telephone: 'a',
+          position: 'a',
+          btnStatus: false
+        },
+        {
+          name: 'aa',
+          realName: 'AA',
+          role: 'a',
+          warehouse: 'a',
+          telephone: 'a',
+          position: 'a',
+          btnStatus: true
+        }
+      ]
+    }
+  },
+
+  methods: {
+    // 新增按钮
+    add(index, row) {
+      this.$router.push({ path: '/grainCheck/addNewGrain' })
+    },
+
+    // 更多记录
+    moreRecords() {
+
+    }
+  }
+}
+</script>

shanXiPlatform/src/views/reservesManagement/grainCheck/reservesTabs.vue

@@ -0,0 +1,36 @@
+<template>
+  <div class="global">
+    <div class="mainContainer">
+      <div class="tab">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="最新粮情检查记录" name="NewGrain" />
+          <el-tab-pane label="全部粮情检查记录" name="AllGrain" />
+
+        </el-tabs>
+      </div>
+      <div id="main">
+
+        <router-view id="mainRight" />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'NewGrain',
+  data() {
+    return {
+      activeName: 'NewGrain'
+    }
+  },
+  mounted() {
+    this.activeName = this.$route.name
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event)
+      this.$router.push(tab.name)
+    }
+  }
+}
+</script>

shanXiPlatform/src/views/safeProduction/safeTabs.vue

@@ -17,6 +17,7 @@
 </template>
 <script>
 export default {
+  name: 'SafeTabs',
   data() {
     return {
       activeName: 'NewSafe'