zhuxinbo преди 5 години
родител
ревизия
79622e8121

+ 15 - 4
debug.log

@@ -3,9 +3,20 @@
 [0529/112937.608:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [0619/110835.729:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [0701/153438.192:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-<<<<<<< HEAD
-[0708/055752.148:ERROR:process_info.cc(375)] NtQuerySystemInformation SystemExtendedHandleInformation: {没有足够配额} 没有足够的虚拟内存或分页文件配额以完成指定的操作。 (0xc0000017)
+[0708/055752.148:ERROR:process_info.cc(375)] NtQuerySystemInformation SystemExtendedHandleInformation: {没锟斤拷锟姐够锟斤拷锟絵 没锟斤拷锟姐够锟斤拷锟斤拷锟斤拷锟节达拷锟斤拷页锟侥硷拷锟斤拷锟斤拷锟斤拷锟斤拷指锟斤拷锟侥诧拷锟斤拷锟斤拷 (0xc0000017)
 [0708/055807.088:ERROR:process_info.cc(359)] UncheckedAllocate
 [0713/163350.208:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-=======
->>>>>>> test-2
+[0716/000711.554:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
+[0716/000711.558:ERROR:exception_snapshot_win.cc(98)] thread ID 12948 not found in process
+[0716/000711.559:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
+[0716/000711.560:ERROR:exception_snapshot_win.cc(98)] thread ID 15736 not found in process
+[0716/000711.577:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
+[0716/000711.577:ERROR:exception_snapshot_win.cc(98)] thread ID 2072 not found in process
+[0716/000711.592:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
+[0716/000711.593:ERROR:exception_snapshot_win.cc(98)] thread ID 12744 not found in process
+[0716/000711.593:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
+[0716/000711.593:ERROR:exception_snapshot_win.cc(98)] thread ID 17220 not found in process
+[0716/000711.615:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
+[0716/000711.615:ERROR:exception_snapshot_win.cc(98)] thread ID 18896 not found in process
+[0716/000711.616:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
+[0716/000711.617:ERROR:exception_snapshot_win.cc(98)] thread ID 15368 not found in process

+ 2 - 3
src/components/ctop/ActorModal.vue

@@ -8,7 +8,6 @@
           <a-input placeholder="请输入演员姓名" v-decorator="['name', validatorRules.name ]" />
         </a-form-item>
         <a-form-item label="封面" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          {{coverUrl}}
           <!-- <upload-to-ali
             v-model="coverUrl"
             :customDomain="customDomain"
@@ -25,13 +24,13 @@
           <uploadFile :value.sync="coverUrl" :fileCount="1" uploadType="image" :multiple="false" />
         </a-form-item>
         <a-form-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="!model.name">
-          <uploadFile :value.sync="imageUrl" :fileCount="1" uploadType="image" :multiple="false" />
+          <uploadFile :value.sync="imageUrl" :fileCount="10" uploadType="image"  />
           <!-- <upload-to-ali v-model="imageUrl" :customDomain="customDomain" multiple preview :region="region"
             :bucket="bucket" :accept="acceptImage" :max="10" :size="1024000" :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"></upload-to-ali> -->
         </a-form-item>
         <a-form-item label="视频作品" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="!model.name">
-          <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" :multiple="false" />
+          <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" />
           <!-- <upload-to-ali v-model="videoUrl" :customDomain="customDomain" multiple preview :region="region"
             :bucket="bucket" :accept="acceptVideo" :max="10" :size="1024000" :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"></upload-to-ali> -->

+ 1 - 1
src/views/modules/prop/modules/ActorModal.vue

@@ -9,7 +9,7 @@
           <a-input placeholder="请输入道具名称" v-decorator="['name', validatorRules.name ]" />
         </a-form-item>
         <a-form-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <uploadFile :value.sync="imageUrl" @overUpload="overUpload" :fileCount="10"
+          <uploadFile  v-if="visible" :value.sync="imageUrl" :fileCount="10"
             uploadType="image" />
           <!-- <upload-to-ali v-model="imageUrl" :customDomain="customDomain" multiple preview :region="region"
             :bucket="bucket" :accept="acceptImage" :max="10" :size="1024000" :accessKeyId="accessKeyId"

+ 2 - 2
src/views/modules/yard/modules/YardModal.vue

@@ -28,7 +28,7 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
         >
-        <uploadFile :value.sync="imageUrl" :fileCount="1" uploadType="image" :multiple="false" />
+        <uploadFile v-if="visible" :value.sync="imageUrl" :fileCount="10" uploadType="image" />
           <!-- <upload-to-ali
             v-model="imageUrl"
             :customDomain="customDomain"
@@ -49,7 +49,7 @@
           :wrapperCol="wrapperCol"
         >
 
-         <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" :multiple="false" />
+         <uploadFile  v-if="visible" :value.sync="videoUrl" :fileCount="1" uploadType="video" />
           <!-- <upload-to-ali
             v-model="videoUrl"
             :customDomain="customDomain"

+ 1 - 1
src/views/ureport/UReportFileBindUserList.vue

@@ -97,7 +97,7 @@ export default {
       if (process.env.NODE_ENV === 'development') {
         url = 'http://39.106.184.70:8080/jeecg-boot/ureport/preview?_u=mysql:' + item.fileName
       } else if (process.env.NODE_ENV === 'production') {
-        url = 'http://api.tjyourong.com.cn/jeecg-boot/ureport/preview?_u=mysql:' + item.fileName
+        url = 'http://129.28.150.229:8804/jeecg-boot/ureport/preview?_u=mysql:' + item.fileName
       }
       window.open(url, '_blank')
     }

+ 1 - 1
src/views/ureport/UReportFileList.vue

@@ -191,7 +191,7 @@ export default {
       if (process.env.NODE_ENV === 'development') {
         url = 'http://api.tjyourong.com.cn/jeecg-boot/ureport/designer?_u=mysql:' + item.name
       } else if (process.env.NODE_ENV === 'production') {
-        url = 'http://api.tjyourong.com.cn/jeecg-boot/ureport/designer?_u=mysql:' + item.name
+        url = 'http://129.28.150.229:8804/jeecg-boot/ureport/designer?_u=mysql:' + item.name
       }
       window.open(url, '_blank')
     },

+ 2 - 2
vue.config.js

@@ -71,9 +71,9 @@ module.exports = {
        
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8804', //请求本地 需要jeecg-boot后台项目  孙震
-        // target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+        target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8848', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
+        // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://192.168.1.251:8088', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目