Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

Dockerfile

+FROM node:lts-alpine
+MAINTAINER 1516330897@qq.com
+RUN npm install -g cnpm --registry=https://registry.npm.taobao.org && cnpm install -g pm2@latest && mkdir /app
+WORKDIR /app
+COPY . /app
+EXPOSE 8133
+RUN chmod 755 ./pm2-start.sh
+CMD ["./pm2-start.sh"]

package.json

@@ -8,6 +8,7 @@
     "dev": "cross-env NODE_ENV=development nodemon server/index.js --watch server",
     "build": "nuxt build",
     "start": "cross-env NODE_ENV=production node server/index.js",
+    "zhyf": "cross-env NODE_ENV=zhyf STATIC_URL=http://static.lims.com nuxt build",
     "test": "cross-env NODE_ENV=testing node server/index.js",
     "pertest": "cross-env NODE_ENV=pertesting node server/index.js",
     "devtest": "cross-env NODE_ENV=devtest node server/index.js",
@@ -31,7 +32,7 @@
     "iview": "^3.3.3",
     "koa": "^2.6.2",
     "mescroll.js": "^1.4.2",
-    "node-schedule": "^1.3.0",
+    "node-schedule": "1.3.0",
     "nuxt": "^2.4.0",
     "nuxt-start": "^2.5.1",
     "script-loader": "^0.7.2",

pages/soil-test-manage/test-input/SoilAppendix.vue

@@ -75,9 +75,12 @@ export default {
         { type: 'md-trash', id: '', name: '删除' }
       ],
       pageColumns: [
-        { title: '附录名称', key: 'title' },
-        { title: '填写人', key: 'uname' },
-        { title: '创建时间', key: 'ctime', dateTime: true }
+        { title: '附录标题', key: 'title', width: 85 },
+        { title: '附录名称', key: 'name', width: 120 },
+        { title: '附件类型', key: 'remark', width: 85 },
+        { title: '样品编号', key: 'sampleCode', width: 90 },
+        { title: '填写人', key: 'uname', width: 85 },
+        { title: '创建时间', key: 'ctime', dateTime: true, width: 120 }
       ],
       formObj: {
         entrustId: ''

pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue

@@ -165,6 +165,7 @@ export default {
         { title: '试验项目', key: 'name', width: 120, fixed: 'left' },
         { title: '缩写', key: 'shortName', width: 90 },
         { title: '试样编号', key: 'sampleCode', width: 150 },
+        { title: '现场编号', key: 'siteNo', width: 150 },
         { title: '原始记录填写', key: 'recorded', width: 120 },
         { title: '试样深度', key: 'sampleDepth', width: 110 },
         { title: '检测方法', key: 'testMethod', width: 140 },

pm2-start.sh

+#docker 容器启动脚本
+#!/bin/bash
+# 防止container启动后退出，使用命令 tail -f /dev/null
+pm2 start ecosystem.config.js && tail -f /dev/null