修复2525 2479bug

dev_202304
wangchenguang 2 years ago
parent 8af136c343
commit b6c3591b67
  1. 6
      package-lock.json
  2. 4
      package.json
  3. 7
      src/components/img-upload/Cropper.vue
  4. 2
      src/setting.js
  5. 2
      src/views/parnerOperation/learnMg.vue

6
package-lock.json generated

@ -12709,9 +12709,9 @@
} }
}, },
"vue-cropper": { "vue-cropper": {
"version": "0.5.10", "version": "0.5.6",
"resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.10.tgz", "resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.6.tgz",
"integrity": "sha512-v76nyDwMI4jvNppPlgWWpm8fQ3qVtoGZ758yLfoBRF762nJ68sjQ6z4m5Xc4d6VUbjDORm7NEduYKagxhO1MtQ==" "integrity": "sha512-54Z/AipXDBcE5nzJweTM+BryzSAcC0FCTMQLvLt6f4XanP4AWB3mPkQw3PG3NRICo7knljHO+N+pjZxYAKoTLQ=="
}, },
"vue-cropperjs": { "vue-cropperjs": {
"version": "3.0.0", "version": "3.0.0",

@ -8,8 +8,8 @@
"build": "vue-cli-service build" "build": "vue-cli-service build"
}, },
"dependencies": { "dependencies": {
"axios": "^0.18.0",
"@tinymce/tinymce-vue": "^3.2.8", "@tinymce/tinymce-vue": "^3.2.8",
"axios": "^0.18.0",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"blueimp-md5": "^2.19.0", "blueimp-md5": "^2.19.0",
"clipboard": "^2.0.11", "clipboard": "^2.0.11",
@ -25,7 +25,7 @@
"sortablejs": "^1.14.0", "sortablejs": "^1.14.0",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-codemirror": "^4.0.6", "vue-codemirror": "^4.0.6",
"vue-cropper": "^0.5.10", "vue-cropper": "^0.5.5",
"vue-cropperjs": "^3.0.0", "vue-cropperjs": "^3.0.0",
"vue-pdf": "^4.3.0", "vue-pdf": "^4.3.0",
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",

@ -19,13 +19,15 @@
:fixed-box="option.fixedBox" :fixed-box="option.fixedBox"
:fixed="fixed" :fixed="fixed"
:fixed-number="fixedNumber" :fixed-number="fixedNumber"
@realTime="realTime" /> @realTime="realTimes"
></vueCropper>
<!-- <vueCropper ref="cropper" :img="option.img" :outputSize="option.size" :outputType="option.outputType"></vueCropper> --> <!-- <vueCropper ref="cropper" :img="option.img" :outputSize="option.size" :outputType="option.outputType"></vueCropper> -->
</div> </div>
<!-- 预览框 --> <!-- 预览框 -->
<div <div
class="show-preview" class="show-preview"
:style="{'width': '500px', 'height': '400px', 'overflow': 'hidden', 'margin': '0 25px', 'display':'flex', 'align-items' : 'center'}"> :style="{'width': '500px', 'height': '400px', 'overflow': 'hidden', 'margin': '0 25px', 'display':'flex', 'align-items' : 'center'}">
<div :style="previews.div" class="preview"> <div :style="previews.div" class="preview">
<img :src="previews.url" :style="previews.img" /> <img :src="previews.url" :style="previews.img" />
</div> </div>
@ -128,7 +130,8 @@ export default {
this.option.img = file.url this.option.img = file.url
this.option.size = file.size / 1024 > 200 ? 0.9 : 0.95 this.option.size = file.size / 1024 > 200 ? 0.9 : 0.95
}, },
realTime(data) { realTimes(data) {
console.log('data=>',data)
// //
this.previews = data this.previews = data
}, },

@ -11,7 +11,7 @@ if (isDev) {
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
host = 'http://121.37.12.51/' host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/' // host = 'https://huorantech.cn/'
host = 'http://192.168.31.151:9000/'// 榕 // host = 'http://192.168.31.151:9000/'// 榕
// host = 'http://192.168.31.117:9000/'// 赓 // host = 'http://192.168.31.117:9000/'// 赓
} else if (isPro) { } else if (isPro) {
jumpPath = 'https://www.huorantech.cn/judgmentPoint/' jumpPath = 'https://www.huorantech.cn/judgmentPoint/'

@ -646,7 +646,7 @@ export default {
}).then(() => { }).then(() => {
this.submit(this.form.isRelease) this.submit(this.form.isRelease)
}).catch(() => { }).catch(() => {
this.$router.back() // this.$router.back()
}) })
} else { } else {
this.$router.back() this.$router.back()

Loading…
Cancel
Save