瀏覽代碼

'暂存修改'

魏志佳 4 年之前
父節點
當前提交
14bdb94dec

+ 1 - 3
package.json

@@ -12,13 +12,11 @@
   "dependencies": {
     "@antv/data-set": "^0.10.2",
     "@femessage/upload-to-ali": "^1.8.1",
-    "@jeecg/antd-online-beta220": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
     "@tinymce/tinymce-vue": "^2.0.0",
     "ali-oss": "^6.1.1",
     "ant-design-vue": "^1.3.9",
     "apexcharts": "^3.6.5",
-    "area-data": "^5.0.6",
     "axios": "^0.18.0",
     "babel-loader": "^8.0.6",
     "blueimp-md5": "^2.11.0",
@@ -133,4 +131,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
+}

+ 2 - 1
src/views/modules/workBench/materialList.vue

@@ -1426,7 +1426,8 @@ export default {
         beforeUpload(file) {
 
             // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
             const fileName = file.name

+ 42 - 21
src/views/modules/workBench/operator/materialList.vue

@@ -499,7 +499,7 @@
                             </div>
                                                        
                             <div class="scriptbottom-btn">
-                                <a-button type='primary' @click="scriptApproved" v-if="currentMaterial.materialStatus==2" style="margin-right:20px" >通过审核</a-button>
+                                <a-button type='primary' @click="scriptApproved" v-if="currentMaterial.materialStatus==2" :loading='acceptLoading' style="margin-right:20px" >通过审核</a-button>
                                
                                 <a-button type='default' v-if="currentMaterial.materialStatus==2" @click="()=>{scriptRejectVisiable=true}"  style="margin-right:20px">驳回</a-button>
                                 
@@ -809,21 +809,34 @@ export default {
 
         // 脚本通过审核
         scriptApproved(){
-            postAction(this.url.scriptAccept,{
-                id:this.currentMaterial.materialId,
-                orderCode:this.currentMaterial.orderCode,
-                materialCode:this.currentMaterial.materialCode
+            this.acceptLoading=true;
+            getAction('/platform/material/verifyScript',{
+                materialCode:this.currentMaterial.materialCode,
+                scriptId:this.currentMaterial.scriptId,
             }).then(res=>{
-                console.log(res);
-
-                this.scriptVisible=false;
                 if(res.success){
-                    this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    postAction(this.url.scriptAccept,{
+                        id:this.currentMaterial.materialId,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false;
+                        this.scriptVisible=false;
+                        if(res.success){
+                            
+                            this.$message.success(res.message);
+                            this.tableHttp(this.$parent.materialStatus)
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
+                    this.acceptLoading=false;
                     this.$message.error(res.message)
                 }
             })
+            
         },
         // 脚本驳回
         scriptReject(){
@@ -855,22 +868,30 @@ export default {
         // 视频通过审核
         approved(){
             this.acceptLoading=true;
-            postAction(this.url.videoAccept,{
-                id:this.currentMaterial.materialId,
-                orderCode:this.currentMaterial.orderCode,
-                materialCode:this.currentMaterial.materialCode,
-                videoId:this.currentVideo.videoId
-            }).then(res=>{
-                console.log(res);
-                this.acceptLoading=false;
-                this.visible=false;
+            getAction('',{}).then(res=>{
                 if(res.success){
-                    this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    postAction(this.url.videoAccept,{
+                        id:this.currentMaterial.materialId,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode,
+                        videoId:this.currentVideo.videoId
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false;
+                        this.visible=false;
+                        if(res.success){
+                            this.$message.success(res.message);
+                            this.tableHttp(this.$parent.materialStatus)
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
                     this.$message.error(res.message)
+                    this.acceptLoading=false
                 }
             })
+            
         },
         // 视频驳回
         reject(){

+ 2 - 1
src/views/modules/workBench/orderDetail.vue

@@ -1805,7 +1805,8 @@ export default {
 
         beforeUpload(file) {
             // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
 
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)

+ 8 - 5
vue.config.js

@@ -63,7 +63,7 @@ module.exports = {
 
   devServer: {
     hot:true,
-    // inline: true,
+    // inline: true,
     port: 3000,
     open : true,
     proxy: {
@@ -73,15 +73,18 @@ module.exports = {
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.43:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+        target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8087', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
-        // target: 'http://192.168.1.193:8088', //请求本地 需要jeecg-boot后台项目  李煜一
-
+        // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
+        //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+        // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
-        target:'http://139.186.151.174:8804', //测试
+        // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
+        // target:'http://118.24.244.213:8804',
+        // target:'http://139.186.151.174:8804', //测试
 
 
         ws: false,