Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

shanXiPlatform/src/api/app-versions/app-json.json

@@ -1,148 +1,156 @@
 {
   "info": [
-      {
-          "versionName": "1.19",
-          "versionCode": 19,
-          "content": " · 修复已知bug",
-          "fileName": "sxzcl_release_1.19_19.apk",
-          "must": false,
-          "time": "2020-01-14"
-      },
-      {
-          "versionName": "1.18",
-          "versionCode": 18,
-          "content": " · 优化通知内容\n · 优化饼图颜色",
-          "fileName": "sxzcl_release_1.18_18.apk",
-          "must": true,
-          "time": "2020-01-13"
-      },
-      {
-          "versionName": "1.17",
-          "versionCode": 17,
-          "content": " · 取消转场动画\n · 优化饼图百分比计算",
-          "fileName": "sxzcl_release_1.17_17.apk",
-          "must": true,
-          "time": "2020-01-12"
-      },
-      {
-          "versionName": "1.16",
-          "versionCode": 16,
-          "content": " · 增加版本信息页\n · 增加版本记录页\n · 修复饼图百分比\n · 修复切换账号信息不刷新的问题",
-          "fileName": "sxzcl_release_1.16_16.apk",
-          "must": true,
-          "time": "2020-01-12"
-      },
-      {
-          "versionName": "1.15",
-          "versionCode": 15,
-          "content": " · 新的版本更新逻辑及UI\n · 修改统计图的颜色\n · 修改饼图百分比为小数点后两位\n · 粮情检查根据角色自动切换页面",
-          "fileName": "sxzcl_release_1.15_15.apk",
-          "must": true,
-          "time": "2020-01-11"
-      },
-      {
-          "versionName": "1.14",
-          "versionCode": 14,
-          "content": " · 增加列表页的动画\n · 新版工作台\n · 修复粮情检查待办bug\n · 处理粮情检查待办逻辑优化\n · 增加饼图颜色\n · 修改版本更新时机",
-          "fileName": "sxzcl_release_1.14_14.apk",
-          "must": true,
-          "time": "2020-01-07"
-      },
-      {
-          "versionName": "1.13",
-          "versionCode": 13,
-          "content": " · 优化文本\n · 修复公告闪退\n · 不显示没有人员的部门\n · 作业页面对登录人进行权限控制\n · 待办中增加粮情检查\n · 粮情检查中处理待办",
-          "fileName": "sxzcl_release_1.13_13.apk",
-          "must": true,
-          "time": "2020-01-06"
-      },
-      {
-          "versionName": "1.12",
-          "versionCode": 12,
-          "content": " · 增加公告阅读状态修改\n · 增加通知阅读状态修改",
-          "fileName": "sxzcl_release_1.12_12.apk",
-          "must": true,
-          "time": "2020-12-31"
-      },
-      {
-          "versionName": "1.11",
-          "versionCode": 11,
-          "content": " · 机械通风控制角色关系\n · 优化公告时间显示\n · 优化人员结构增加头像和职位展示\n · 粮情检查控制角色关系\n · 异常退出增加弹出框提示\n · 登录人只能选择自己所管理的仓房\n · 机械通风详情可直接跳转待办\n · 优化未选择库时作业页面弹出框时机\n · 饼图数值由小数改为整数",
-          "fileName": "sxzcl_release_1.11_11.apk",
-          "must": true,
-          "time": "2020-12-30"
-      },
-      {
-          "versionName": "1.9",
-          "versionCode": 9,
-          "content": " · 修改基类逻辑\n · 增加机械通风页标题切换仓房\n · 增加粮情检查页标题切换仓房\n · 待办和机械通风字段修改\n · 机械通风非本人查看时只显示已填流程",
-          "fileName": "sxzcl_release_1.9_9.apk",
-          "must": true,
-          "time": "2020-12-29"
-      },
-      {
-          "versionName": "1.8",
-          "versionCode": 8,
-          "content": " · 修改等待框\n · 输入密码点击完成可直接登录\n · 退出登录时增加提醒\n · 修改饼状图文字大小及颜色\n · 首页后退时增加退出确认\n · 审批流程增加状态图标",
-          "fileName": "sxzcl_release_1.8_8.apk",
-          "must": true,
-          "time": "2020-12-29"
-      },
-      {
-          "versionName": "1.7",
-          "versionCode": 7,
-          "content": " · 修改作业图标\n · 登录增加历史回显",
-          "fileName": "sxzcl_release_1.7_7.apk",
-          "must": false,
-          "time": "2020-12-28"
-      },
-      {
-          "versionName": "1.6",
-          "versionCode": 6,
-          "content": " · 优化库信息统计图\n · 优化员信息UI\n · 优化公告页面UI\n · 机械通风增加无审批人提示\n · 优化选企业逻辑\n · 修改头像刷新页面",
-          "fileName": "sxzcl_release_1.6_6.apk",
-          "must": true,
-          "time": "2020-12-28"
-      },
-      {
-          "versionName": "1.5",
-          "versionCode": 5,
-          "content": " · 作业功能修改图标\n · 增加公告列表与详情\n · 增加修改头像功能",
-          "fileName": "sxzcl_release_1.5_5.apk",
-          "must": true,
-          "time": "2020-12-27"
-      },
-      {
-          "versionName": "1.4",
-          "versionCode": 4,
-          "content": " · 修改桌面图标、页面字体、颜色样式等\n · 修改登录页\n · 等待动画调整\n · 修改部分bug\n · 完善仓房信息\n · 完善保管员信息\n · 解决登录bug",
-          "fileName": "sxzcl_release_1.4_4.apk",
-          "must": false,
-          "time": "2020-12-26"
-      },
-      {
-          "versionName": "1.3",
-          "versionCode": 3,
-          "content": " · 增加版本控制",
-          "fileName": "sxzcl_release_1.3_3.apk",
-          "must": true,
-          "time": "2020-12-24"
-      },
-      {
-          "versionName": "1.2",
-          "versionCode": 2,
-          "content": " · 优化功能\n · 修复bug",
-          "fileName": "sxzcl_release_1.2_2.apk",
-          "must": false,
-          "time": "2020-12-20"
-      },
-      {
-          "versionName": "1.0",
-          "versionCode": 1,
-          "content": " · 发布第一版",
-          "fileName": "sxzcl_release_1.0_1.apk",
-          "must": false,
-          "time": "2020-12-12"
-      }
+    {
+      "versionName": "1.20",
+      "versionCode": 20,
+      "content": " · 增加登录历史\n · 增加药剂采购\n · 增加药剂领用\n · 增加药剂采购\n · 增加库存管理\n · 增加出库质量管理\n · 增加政策制度\n · 修改功能列表UI\n · 增加权限控制\n · 增加接收推送",
+      "fileName": "sxzcl_release_1.20_20.apk",
+      "must": true,
+      "time": "2020-02-08"
+    },
+    {
+      "versionName": "1.19",
+      "versionCode": 19,
+      "content": " · 修复已知bug",
+      "fileName": "sxzcl_release_1.19_19.apk",
+      "must": false,
+      "time": "2020-01-14"
+    },
+    {
+      "versionName": "1.18",
+      "versionCode": 18,
+      "content": " · 优化通知内容\n · 优化饼图颜色",
+      "fileName": "sxzcl_release_1.18_18.apk",
+      "must": true,
+      "time": "2020-01-13"
+    },
+    {
+      "versionName": "1.17",
+      "versionCode": 17,
+      "content": " · 取消转场动画\n · 优化饼图百分比计算",
+      "fileName": "sxzcl_release_1.17_17.apk",
+      "must": true,
+      "time": "2020-01-12"
+    },
+    {
+      "versionName": "1.16",
+      "versionCode": 16,
+      "content": " · 增加版本信息页\n · 增加版本记录页\n · 修复饼图百分比\n · 修复切换账号信息不刷新的问题",
+      "fileName": "sxzcl_release_1.16_16.apk",
+      "must": true,
+      "time": "2020-01-12"
+    },
+    {
+      "versionName": "1.15",
+      "versionCode": 15,
+      "content": " · 新的版本更新逻辑及UI\n · 修改统计图的颜色\n · 修改饼图百分比为小数点后两位\n · 粮情检查根据角色自动切换页面",
+      "fileName": "sxzcl_release_1.15_15.apk",
+      "must": true,
+      "time": "2020-01-11"
+    },
+    {
+      "versionName": "1.14",
+      "versionCode": 14,
+      "content": " · 增加列表页的动画\n · 新版工作台\n · 修复粮情检查待办bug\n · 处理粮情检查待办逻辑优化\n · 增加饼图颜色\n · 修改版本更新时机",
+      "fileName": "sxzcl_release_1.14_14.apk",
+      "must": true,
+      "time": "2020-01-07"
+    },
+    {
+      "versionName": "1.13",
+      "versionCode": 13,
+      "content": " · 优化文本\n · 修复公告闪退\n · 不显示没有人员的部门\n · 作业页面对登录人进行权限控制\n · 待办中增加粮情检查\n · 粮情检查中处理待办",
+      "fileName": "sxzcl_release_1.13_13.apk",
+      "must": true,
+      "time": "2020-01-06"
+    },
+    {
+      "versionName": "1.12",
+      "versionCode": 12,
+      "content": " · 增加公告阅读状态修改\n · 增加通知阅读状态修改",
+      "fileName": "sxzcl_release_1.12_12.apk",
+      "must": true,
+      "time": "2020-12-31"
+    },
+    {
+      "versionName": "1.11",
+      "versionCode": 11,
+      "content": " · 机械通风控制角色关系\n · 优化公告时间显示\n · 优化人员结构增加头像和职位展示\n · 粮情检查控制角色关系\n · 异常退出增加弹出框提示\n · 登录人只能选择自己所管理的仓房\n · 机械通风详情可直接跳转待办\n · 优化未选择库时作业页面弹出框时机\n · 饼图数值由小数改为整数",
+      "fileName": "sxzcl_release_1.11_11.apk",
+      "must": true,
+      "time": "2020-12-30"
+    },
+    {
+      "versionName": "1.9",
+      "versionCode": 9,
+      "content": " · 修改基类逻辑\n · 增加机械通风页标题切换仓房\n · 增加粮情检查页标题切换仓房\n · 待办和机械通风字段修改\n · 机械通风非本人查看时只显示已填流程",
+      "fileName": "sxzcl_release_1.9_9.apk",
+      "must": true,
+      "time": "2020-12-29"
+    },
+    {
+      "versionName": "1.8",
+      "versionCode": 8,
+      "content": " · 修改等待框\n · 输入密码点击完成可直接登录\n · 退出登录时增加提醒\n · 修改饼状图文字大小及颜色\n · 首页后退时增加退出确认\n · 审批流程增加状态图标",
+      "fileName": "sxzcl_release_1.8_8.apk",
+      "must": true,
+      "time": "2020-12-29"
+    },
+    {
+      "versionName": "1.7",
+      "versionCode": 7,
+      "content": " · 修改作业图标\n · 登录增加历史回显",
+      "fileName": "sxzcl_release_1.7_7.apk",
+      "must": false,
+      "time": "2020-12-28"
+    },
+    {
+      "versionName": "1.6",
+      "versionCode": 6,
+      "content": " · 优化库信息统计图\n · 优化员信息UI\n · 优化公告页面UI\n · 机械通风增加无审批人提示\n · 优化选企业逻辑\n · 修改头像刷新页面",
+      "fileName": "sxzcl_release_1.6_6.apk",
+      "must": true,
+      "time": "2020-12-28"
+    },
+    {
+      "versionName": "1.5",
+      "versionCode": 5,
+      "content": " · 作业功能修改图标\n · 增加公告列表与详情\n · 增加修改头像功能",
+      "fileName": "sxzcl_release_1.5_5.apk",
+      "must": true,
+      "time": "2020-12-27"
+    },
+    {
+      "versionName": "1.4",
+      "versionCode": 4,
+      "content": " · 修改桌面图标、页面字体、颜色样式等\n · 修改登录页\n · 等待动画调整\n · 修改部分bug\n · 完善仓房信息\n · 完善保管员信息\n · 解决登录bug",
+      "fileName": "sxzcl_release_1.4_4.apk",
+      "must": false,
+      "time": "2020-12-26"
+    },
+    {
+      "versionName": "1.3",
+      "versionCode": 3,
+      "content": " · 增加版本控制",
+      "fileName": "sxzcl_release_1.3_3.apk",
+      "must": true,
+      "time": "2020-12-24"
+    },
+    {
+      "versionName": "1.2",
+      "versionCode": 2,
+      "content": " · 优化功能\n · 修复bug",
+      "fileName": "sxzcl_release_1.2_2.apk",
+      "must": false,
+      "time": "2020-12-20"
+    },
+    {
+      "versionName": "1.0",
+      "versionCode": 1,
+      "content": " · 发布第一版",
+      "fileName": "sxzcl_release_1.0_1.apk",
+      "must": false,
+      "time": "2020-12-12"
+    }
   ]
 }

shanXiPlatform/src/icons/svg/sheshi.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<path d="M20,12.7v-2.2l-1.7-0.3c-0.1-0.2-0.2-0.4-0.2-0.6l1-1.4l-1.6-1.6l-1.4,1c-0.2-0.1-0.4-0.2-0.6-0.3l-0.3-1.7H13l-0.3,1.7
+	c-0.2,0.1-0.4,0.2-0.6,0.3l-1.4-1L9.2,8.2l1,1.4C10.1,9.8,10,10,9.9,10.2l-1.7,0.3v2.2l1.7,0.3c0.1,0.2,0.2,0.4,0.2,0.6l-1,1.4
+	l1.6,1.6l1.4-1c0.2,0.1,0.4,0.2,0.6,0.2l0.3,1.7h2.2l0.3-1.7c0.2-0.1,0.4-0.1,0.6-0.2l1.4,1l1.6-1.6l-1-1.4c0.1-0.2,0.2-0.4,0.2-0.6
+	L20,12.7L20,12.7z M14.1,13.3c-1,0-1.8-0.8-1.8-1.8c0-1,0.8-1.8,1.8-1.8c1,0,1.8,0.8,1.8,1.8C15.9,12.5,15.1,13.3,14.1,13.3z"/>
+<path d="M1.4,3.7h16.2v1.1l1.4,1.4V1.2c0-0.7-0.6-1.2-1.2-1.2H1.2C0.6,0,0,0.6,0,1.2v15c0,0.7,0.6,1.2,1.2,1.2H9L7.5,16H1.4V3.7z"/>
+<path d="M3,6.2h5.6v1.3H3L3,6.2L3,6.2z M3,8.7h3.8V10H3C3,10,3,8.7,3,8.7z M3,11.2h3.8v1.3H3V11.2L3,11.2z"/>
+</svg>

shanXiPlatform/src/icons/svg/zuzhishu.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<path d="M19.3,12.1h-1.6V8.3c0-0.2-0.2-0.4-0.4-0.4h0l-6.8,0V6.1H14c0.4,0,0.7-0.3,0.7-0.7V0.7C14.7,0.3,14.4,0,14,0H6
+	C5.6,0,5.3,0.3,5.3,0.7v4.8c0,0.4,0.3,0.7,0.7,0.7h3.5v1.7l-6.8,0C2.4,7.8,2.3,8,2.3,8.2c0,0,0,0,0,0v0.2c0,0,0,0,0,0v3.6H0.7
+	c-0.4,0-0.7,0.3-0.7,0.7v2.8c0,0.4,0.3,0.7,0.7,0.7h4.2c0.4,0,0.7-0.3,0.7-0.7v-2.8c0-0.4-0.3-0.7-0.7-0.7H3.3V8.8l6.3,0v3.3H7.9
+	c-0.4,0-0.7,0.3-0.7,0.7v2.8c0,0.4,0.3,0.7,0.7,0.7h4.2c0.4,0,0.7-0.3,0.7-0.7v-2.8c0-0.4-0.3-0.7-0.7-0.7h-1.6V8.8l6.3,0v3.3h-1.6
+	c-0.4,0-0.7,0.3-0.7,0.7v2.8c0,0.4,0.3,0.7,0.7,0.7h4.2c0.4,0,0.7-0.3,0.7-0.7v-2.8C20,12.4,19.7,12.1,19.3,12.1L19.3,12.1z"/>
+</svg>

shanXiPlatform/src/router/index.js

@@ -834,7 +834,7 @@ export const constantRoutes = [
       component: Layout,
       // redirect: '/guide/index',
       name: 'FacilitiesEquipment',
-      meta: { title: '设施设备', icon: 'dashboard',noCache: true, affix: false, relation: 'house', istable: true},
+      meta: { title: '设施设备', icon: 'sheshi',noCache: true, affix: false, relation: 'house', istable: true},
       resourceCode: 242,
       //  设施设备/设施管理
       children: [
@@ -1474,8 +1474,8 @@ export const constantRoutes = [
         path: 'treeStructure',
         component: () => import('@/views/systemManagement/tree/treeStructure'),
         name: 'TreeStructure',
-        hidden: false,
-        meta: { title: '组织树', icon: 'dashboard', affix: false, noCache: true, navigation: true },
+        hidden: true,
+        meta: { title: '组织树', icon: 'zuzhishu', affix: false, noCache: true, navigation: true },
         resourceCode:5,
         children: []
       },

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/allFacilities/index.vue

@@ -18,7 +18,8 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                value-format="yyyy-MM-dd"
+                :default-time="['00:00:00', '23:59:59']"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
         </el-form-item>

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/newFacilities/index.vue

@@ -17,7 +17,7 @@
       </el-table-column>
       <el-table-column prop="checkTime" label="最近记录时间" align="center">
         <template slot-scope="scope">
-         <span>{{ scope.row.checkTime.slice(0,16) }}</span>
+         <span>{{ scope.row.checkTime == null?scope.row.checkTime:scope.row.checkTime.slice(0,16) }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="checkState" label="状态" align="center">