Skip to content

B
BCDH-APP
Commit aa08eb62 authored by 王明朋's avatar 王明朋
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

parents 0e19d442 20adfe02
Pipeline #7700 passed with stage
    in 11 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 146 additions and 16 deletions
    package-lock.json
    View file @ aa08eb62
    ......@@ -1691,6 +1691,21 @@
    "integrity": "sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0=",
    "dev": true
    },
    "@zxing/library": {
    "version": "0.18.6",
    "resolved": "https://registry.npmjs.org/@zxing/library/-/library-0.18.6.tgz",
    "integrity": "sha512-bulZ9JHoLFd9W36pi+7e7DnEYNJhljYjZ1UTsKPOoLMU3qtC+REHITeCRNx40zTRJZx18W5TBRXt5pq2Uopjsw==",
    "requires": {
    "@zxing/text-encoding": "~0.9.0",
    "ts-custom-error": "^3.0.0"
    }
    },
    "@zxing/text-encoding": {
    "version": "0.9.0",
    "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz",
    "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==",
    "optional": true
    },
    "accepts": {
    "version": "1.3.7",
    "resolved": "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz",
    ......@@ -2150,6 +2165,15 @@
    "resolved": "http://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz",
    "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
    },
    "barcode-detector": {
    "version": "1.0.0",
    "resolved": "https://registry.npmjs.org/barcode-detector/-/barcode-detector-1.0.0.tgz",
    "integrity": "sha512-LZSyqjumoq2WmMOeQZ2BiYYAqwnTlkXgqKOTcJlathpFS6IejsdSb6aIGmoSyOCjBgFNATzLgMJ9shNfklnz6A==",
    "requires": {
    "@zxing/library": "^0.18.4",
    "jsqr": "^1.3.1"
    }
    },
    "base": {
    "version": "0.11.2",
    "resolved": "https://registry.npm.taobao.org/base/download/base-0.11.2.tgz",
    ......@@ -2661,6 +2685,11 @@
    "caller-callsite": "^2.0.0"
    }
    },
    "callforth": {
    "version": "0.3.1",
    "resolved": "https://registry.npmjs.org/callforth/-/callforth-0.3.1.tgz",
    "integrity": "sha512-Q2zPfqnwoKsb1DTVCr4lmhe49wKNBsMmNlbudjleu3/co+Nw1pOqFHYJHrW3VZ253ou9AAr+xauQR0C55NPdzA=="
    },
    "callsites": {
    "version": "2.0.0",
    "resolved": "https://registry.npm.taobao.org/callsites/download/callsites-2.0.0.tgz",
    ......@@ -5984,7 +6013,7 @@
    },
    "global": {
    "version": "4.3.2",
    "resolved": "https://registry.nlark.com/global/download/global-4.3.2.tgz",
    "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
    "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
    "dev": true,
    "requires": {
    ......@@ -5994,7 +6023,7 @@
    "dependencies": {
    "process": {
    "version": "0.5.2",
    "resolved": "https://registry.npm.taobao.org/process/download/process-0.5.2.tgz",
    "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
    "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
    "dev": true
    }
    ......@@ -7100,6 +7129,11 @@
    "verror": "1.10.0"
    }
    },
    "jsqr": {
    "version": "1.4.0",
    "resolved": "https://registry.npmjs.org/jsqr/-/jsqr-1.4.0.tgz",
    "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A=="
    },
    "killable": {
    "version": "1.0.1",
    "resolved": "http://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
    ......@@ -8048,7 +8082,8 @@
    "object-assign": {
    "version": "4.1.1",
    "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
    "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
    "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
    "dev": true
    },
    "object-copy": {
    "version": "0.1.0",
    ......@@ -9277,7 +9312,8 @@
    "process": {
    "version": "0.11.10",
    "resolved": "http://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
    "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
    "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
    "dev": true
    },
    "process-nextick-args": {
    "version": "2.0.1",
    ......@@ -10121,6 +10157,14 @@
    "inherits": "^2.0.1"
    }
    },
    "rtcpeerconnection-shim": {
    "version": "1.2.15",
    "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.15.tgz",
    "integrity": "sha512-C6DxhXt7bssQ1nHb154lqeL0SXz5Dx4RczXZu2Aa/L1NJFnEVDxFwCBo3fqtuljhHIGceg5JKBV4XJ0gW5JKyw==",
    "requires": {
    "sdp": "^2.6.0"
    }
    },
    "run-async": {
    "version": "2.3.0",
    "resolved": "https://registry.npm.taobao.org/run-async/download/run-async-2.3.0.tgz",
    ......@@ -10207,6 +10251,11 @@
    "ajv-keywords": "^3.4.1"
    }
    },
    "sdp": {
    "version": "2.12.0",
    "resolved": "https://registry.npmjs.org/sdp/-/sdp-2.12.0.tgz",
    "integrity": "sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw=="
    },
    "select-hose": {
    "version": "2.0.0",
    "resolved": "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz",
    ......@@ -11347,6 +11396,11 @@
    "integrity": "sha1-8shUBoALmw90yfdGW4HqrSQSUvg=",
    "dev": true
    },
    "ts-custom-error": {
    "version": "3.2.0",
    "resolved": "https://registry.npmjs.org/ts-custom-error/-/ts-custom-error-3.2.0.tgz",
    "integrity": "sha512-cBvC2QjtvJ9JfWLvstVnI45Y46Y5dMxIaG1TDMGAD/R87hpvqFL+7LhvUDhnRCfOnx/xitollFWWvUKKKhbN0A=="
    },
    "tslib": {
    "version": "1.10.0",
    "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.10.0.tgz",
    ......@@ -11906,6 +11960,30 @@
    "vue-style-loader": "^4.1.0"
    }
    },
    "vue-qrcode-reader": {
    "version": "3.1.0",
    "resolved": "https://registry.npmjs.org/vue-qrcode-reader/-/vue-qrcode-reader-3.1.0.tgz",
    "integrity": "sha512-k2uoUjibxzdHJPfmsL1T9KVNzKPG/xIzKWMgBTXExoJlvZ5VKrBIFpP3P+rXNylfL3yw5AftE3K1yf4CoTkfkQ==",
    "requires": {
    "barcode-detector": "^1.0.0",
    "callforth": "^0.3.1",
    "core-js": "^3.6.5",
    "vue": "^2.6.11",
    "webrtc-adapter": "7.7.0"
    },
    "dependencies": {
    "core-js": {
    "version": "3.20.1",
    "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.1.tgz",
    "integrity": "sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg=="
    },
    "vue": {
    "version": "2.6.14",
    "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
    "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
    }
    }
    },
    "vue-router": {
    "version": "3.0.7",
    "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.7.tgz",
    ......@@ -12309,6 +12387,15 @@
    }
    }
    },
    "webrtc-adapter": {
    "version": "7.7.0",
    "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-7.7.0.tgz",
    "integrity": "sha512-7Bp9OBnx642oJRkom1tNAbeJjUadAq2rh5xLL9YXPw5hVyt2h4hHr5bcoPYDs1stp/mZHSPSQA34YISdnr0DBQ==",
    "requires": {
    "rtcpeerconnection-shim": "^1.2.15",
    "sdp": "^2.12.0"
    }
    },
    "websocket-driver": {
    "version": "0.7.3",
    "resolved": "https://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.3.tgz",
    ......@@ -12455,7 +12542,8 @@
    "xtend": {
    "version": "4.0.2",
    "resolved": "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz",
    "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q="
    "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=",
    "dev": true
    },
    "y18n": {
    "version": "4.0.0",
    ......
    src/views/checked/problem/list/index.vue
    View file @ aa08eb62
    ......@@ -66,16 +66,16 @@
    </van-popup>
    <van-field name="uploader" label="图像上传" >
    <template #input>
    <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
    <van-uploader :before-read="beforeReadImage" multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
    </template>
    </van-field>
    <van-field name="uploader2" label="视频上传" >
    <template #input>
    <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderVideo" />
    <van-uploader :before-read="beforeReadVideo" accept="video/*" multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderVideo" />
    </template>
    </van-field>
    <div style="margin: 0.5rem">
    <van-button round block type="info" native-type="submit">提交</van-button>
    <van-button round block type="info" native-type="submit">保存</van-button>
    </div>
    </van-form>
    <tab-bar :index="1"></tab-bar>
    ......@@ -240,7 +240,21 @@ export default {
    this.value+=item.text+' / '
    })
    this.showPicker = false;
    }
    },
    beforeReadVideo(file) {
    if (file.type.indexOf('video')==-1) {
    this.$toast.fail('请上传视频！');
    return false;
    }
    return true;
    },
    beforeReadImage(file) {
    if (file.type.indexOf('image')==-1) {
    this.$toast.fail('请上传图片！');
    return false;
    }
    return true;
    },
    }
    }
    </script>
    ......
    src/views/checked/problem/note/edit/index.vue
    View file @ aa08eb62
    ......@@ -55,12 +55,12 @@
    </van-popup>
    <van-field name="uploader" label="图像上传" >
    <template #input>
    <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.pictures" />
    <van-uploader :before-read="beforeReadImage" multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.pictures" />
    </template>
    </van-field>
    <van-field name="uploader2" label="视频上传" >
    <template #input>
    <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.videos" />
    <van-uploader :before-read="beforeReadVideo" accept="video/*" multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.videos" />
    </template>
    </van-field>
    <div style="margin: 0.5rem">
    ......@@ -208,7 +208,21 @@ export default {
    this.editObj.value+=item.text+' / '
    })
    this.showPicker = false;
    }
    },
    beforeReadVideo(file) {
    if (file.type.indexOf('video')==-1) {
    this.$toast.fail('请上传视频！');
    return false;
    }
    return true;
    },
    beforeReadImage(file) {
    if (file.type.indexOf('image')==-1) {
    this.$toast.fail('请上传图片！');
    return false;
    }
    return true;
    },
    }
    }
    </script>
    ......
    src/views/notice/noticeList/edit/index.vue
    View file @ aa08eb62
    ......@@ -55,12 +55,12 @@
    </van-popup>
    <van-field name="uploader" label="图像上传">
    <template #input>
    <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.pictures" />
    <van-uploader :before-read="beforeReadImage" multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.pictures" />
    </template>
    </van-field>
    <van-field name="uploader2" label="视频上传">
    <template #input>
    <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.videos" />
    <van-uploader :before-read="beforeReadVideo" accept="video/*" multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.videos" />
    </template>
    </van-field>
    <div style="margin: 0.5rem">
    ......@@ -208,7 +208,21 @@ export default {
    this.editObj.value+=item.text+' / '
    })
    this.showPicker = false;
    }
    },
    beforeReadVideo(file) {
    if (file.type.indexOf('video')==-1) {
    this.$toast.fail('请上传视频！');
    return false;
    }
    return true;
    },
    beforeReadImage(file) {
    if (file.type.indexOf('image')==-1) {
    this.$toast.fail('请上传图片！');
    return false;
    }
    return true;
    },
    }
    }
    </script>
    ......
    src/views/notice/noticeList/sign/index.vue
    View file @ aa08eb62
    ......@@ -2,7 +2,7 @@
    <div>
    <LHeader v-bind:text="text"></LHeader>
    <div style="border: 2px solid #E6E6E6 ;background-color: white">
    <vue-esign ref="esign" :width="800" :height="300" :isCrop="isCrop" :lineWidth="lineWidth" :lineColor="lineColor" :bgColor.sync="bgColor" />
    <vue-esign ref="esign" :width="800" :height="600" :isCrop="isCrop" :lineWidth="lineWidth" :lineColor="lineColor" :bgColor.sync="bgColor" />
    </div>
    <div class="page-footer">
    <p>请在上方空白处书写您的签字</p>
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment