From 859f86c9514dd84c51aff851da043dc778bbbbce Mon Sep 17 00:00:00 2001 From: odc.xiaohui <xiaohui@Q1> Date: 星期三, 15 十一月 2023 13:45:26 +0800 Subject: [PATCH] 修改视频专网 --- src/views/index.vue | 15 +++++++-------- vite.config.ts | 4 ++-- src/utils/request.ts | 3 ++- src/components/FileUpload/index.vue | 19 ++----------------- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 9d3474b..2fd98b9 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -18,24 +18,9 @@ </el-upload> <!-- 涓婁紶鎻愮ず --> <div class="el-upload__tip" v-if="showTip"> - 璇蜂笂浼� -<!-- <template v-if="fileSize">--> -<!-- 澶у皬涓嶈秴杩� <b style="color: #f56c6c">{{ fileSize }}MB</b>--> -<!-- </template>--> - - 鏂囦欢 + <span>璇蜂笂浼犳枃浠�</span> </div> - <!-- 鏂囦欢鍒楄〃 --> -<!-- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">--> -<!-- <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">--> -<!-- <el-link :href="`${file.url}`" :underline="false" target="_blank">--> -<!-- <span class="el-icon-document"> {{ getFileName(file.name) }} </span>--> -<!-- </el-link>--> -<!-- <div class="ele-upload-list__item-content-action">--> -<!-- <el-link :underline="false" @click="handleDelete(index)" type="danger">鍒犻櫎</el-link>--> -<!-- </div>--> -<!-- </li>--> -<!-- </transition-group>--> + </div> </template> diff --git a/src/utils/request.ts b/src/utils/request.ts index 6178701..b4f2620 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -125,7 +125,8 @@ // isRelogin.show = false; // }); // } - return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�'); + // return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�'); + return } else if (code === HttpStatus.SERVER_ERROR) { console.log(msg); ElMessage({ message: msg, type: 'error' }); diff --git a/src/views/index.vue b/src/views/index.vue index 62f6842..65df501 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -68,7 +68,7 @@ <el-form-item label="鏂囦欢鍚�"> <fileUpload ref="childFile" @closePopup="getList();lookPawsd($event)" v-model="form.file" v-if="type === 0" /> <imageUpload v-model="form.file" v-if="type === 1" /> - <video-upload v-model="form.file" v-if="type === 2" />" + <video-upload v-model="form.file" v-if="type === 2" /> </el-form-item> </el-form> <template #footer> @@ -81,16 +81,15 @@ <el-dialog :title="titleDownload" v-model="visibleCode" width="500px" append-to-body> <p style="color: red">鎻愬彇鐮佸皢浼氬湪24灏忔椂鍚庡け鏁堣灏藉揩涓嬭浇!</p> <span v-show="titleDownload=='鏌ョ湅鎻愬彇鐮�'">{{testtxt}}</span> - <div > - - </div> <el-input style="margin: 10px 0" ref="inputRef" :style="inputSty" v-show="titleDownload=='杈撳叆鎻愬彇鐮�'" v-model="pasTxt" v-if="isContains(useUserStore().permissions, 'system:oss:download')" placeholder="璇疯緭鍏ユ枃浠舵彁鍙栫爜"></el-input> <el-input style="margin: 10px 0" ref="inputRef" :style="inputSty" v-show="titleDownload=='璇疯緭鍏ユ彁鍙栫爜'" v-model="pasTxt" placeholder="璇疯緭鍏ユ枃浠舵彁鍙栫爜"></el-input> - <el-button link type="primary" v-show="titleDownload=='杈撳叆鎻愬彇鐮�'" icon="Download" @click="handleDownloadFile()" v-if="isContains(useUserStore().permissions, 'system:oss:download')">涓嬭浇</el-button> - <el-button link type="primary" v-show="titleDownload=='璇疯緭鍏ユ彁鍙栫爜'" icon="Delete" @click="delFile()" >鍒犻櫎</el-button> +<!-- <el-button link type="primary" v-show="titleDownload=='杈撳叆鎻愬彇鐮�'" icon="Download" @click="handleDownloadFile()" v-if="isContains(useUserStore().permissions, 'system:oss:download')">涓嬭浇</el-button>--> +<!-- <el-button link type="primary" v-show="titleDownload=='璇疯緭鍏ユ彁鍙栫爜'" icon="Delete" @click="delFile()" >鍒犻櫎</el-button>--> <template #footer> <div class="dialog-footer"> - <el-button type="primary" @click="visibleCode = false">纭� 瀹�</el-button> + <el-button link type="primary" v-show="titleDownload=='杈撳叆鎻愬彇鐮�'" icon="Download" @click="handleDownloadFile()" v-if="isContains(useUserStore().permissions, 'system:oss:download')">涓嬭浇</el-button> + <el-button link type="primary" v-show="titleDownload=='璇疯緭鍏ユ彁鍙栫爜'" icon="Delete" @click="delFile()" >鍒犻櫎</el-button> +<!-- <el-button type="primary" @click="visibleCode = false">纭� 瀹�</el-button>--> <el-button @click="visibleCode = false">鍙� 娑�</el-button> </div> </template> @@ -347,7 +346,7 @@ } // inputRef.value.style.border = '1px solid red' } - + visibleCode.value=false } /** 鐢ㄦ埛鐘舵�佷慨鏀� */ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ diff --git a/vite.config.ts b/vite.config.ts index 09b4663..0d1183e 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -26,8 +26,8 @@ open: true, proxy: { [env.VITE_APP_BASE_API]: { - // target: 'http://162.14.79.111:8080', - target: 'http://192.168.3.228:8080', + target: 'http://162.14.79.111:8080', + // target: 'http://192.168.3.228:8080', changeOrigin: true, rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') } -- Gitblit v1.8.0