1

quasar.conf.js

@@ -56,7 +56,7 @@ module.exports = function (ctx) {
         API_ZC:'http://192.168.1.13:8087/api'
       } : {
         API: 'http://eduapi.oytour.com/api',
-        API_ZC:''
+        API_ZC:'http://propertyedu.oytour.com'
       },
       // transpile: false,
 

src/api/administration/AssetsShenpi.js

 import request from '../../utils/request_zc'
 
+import {UploadUrl} from "../../utils/url"
+import co from 'co'
 export function getAuditChangeLogPageList(data) {
     return request({
         url: '/property/GetAuditChangeLogPageList',
@@ -22,3 +24,50 @@ export function getPropertyAuditDetail(data) {
         data
     });
 }
+
+//详情页接口
+export function getPropertyLogPageList(data) {
+    return request({
+        url: '/property/GetPropertyLogPageList',
+        method: 'post',
+        data
+    });
+}
+
+export function getPropertyInfo(data) {
+    return request({
+        url: '/property/GetPropertyInfo',
+        method: 'post',
+        data
+    });
+}
+
+export  function UploadSelfFileT(path, files, successCall, ocr) {
+    if (files && files.length > 0) {
+      let nameList = new Array()
+      for (let index = 0; index < files.length; index++) {
+        nameList.push(this.random_string());
+      }
+      let that = this;
+      co(function* () {
+        for (let index = 0; index < files.length; index++) {
+          let fileName = nameList[index]
+          fileName = path + fileName + "." + files[index].name.split('.').pop()
+          var formData = new FormData();
+          var uploadUrl = UploadUrl + "/Upload?filePath=" + path + '&ocr=' + ocr;
+          formData.append("myfile", files[index]);
+          that.$http.post(uploadUrl, formData, {})
+            .then(res => {
+              successCall(res);
+            }).catch(function (reason) {
+              that.$refs['my-upload'].clearFiles();
+              that.$message.error('上传失败！');
+              that.MsgBus.$emit('UploadSelfFileErr')
+            });
+        }
+      }).catch(function (err) {
+        that.$refs['my-upload'].clearFiles();
+        that.$message.error('上传失败！');
+      });
+    }
+  }
\ No newline at end of file

src/boot/axios.js

@@ -2,7 +2,6 @@ import Vue from 'vue'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import  Erpindex from '../utils/erpindex'
-import  request_zc from '../utils/request_zc'
 import axios from 'axios'
 import 'vue-easytable/libs/themes-base/index.css'
 import {VTable,VPagination} from 'vue-easytable'
@@ -10,7 +9,6 @@ import commonUtils from '../pages/financial/utils/commonUtils'
 import 'viewerjs/dist/viewer.css'
 import Viewer from 'v-viewer'
 import AuthCode from '../pages/financial/utils/AuthCode'   //权限编码JS
-
 Vue.http = Vue.prototype.$http = axios
 Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
 Vue.AuthCode=Vue.prototype.$AuthCode=AuthCode
@@ -34,7 +32,6 @@ Date.prototype.Format = function (fmt) {
 };
 Vue.use(ElementUI)
 Vue.use(Erpindex)
-Vue.use(request_zc)
 
 Vue.use(Viewer);
 Vue.component(VTable.name, VTable)

src/components/global/notify.vue

@@ -271,6 +271,7 @@
       },
       undefinedGongneng(item) {
         this.$router.push("/AssetsShenpi")
+        this.$router.push({path:"/AssetsShenpi",query:{Id:115,compType:"shenpi"}})
         // this.$q.dialog({
         //   title: '功能提示',
         //   message: '灰度测试功能，即将在下版本中开启'

src/components/global/user-right-box.vue

@@ -38,7 +38,7 @@
             <q-item class="q-my-sm" clickable v-ripple @click="goUrlZC">
                 <q-item-section avatar>
                     <q-avatar style="background-color: #F3F6F9;" rounded size="40px" text-color="primary">
-                        <!-- <i :class="[item.MenuIcon]"></i> -->
+                        <i class="iconfont icon-zichan"></i>
                     </q-avatar>
                 </q-item-section>
                 <q-item-section>

src/pages/administration/AssetsSystem/AssetsShenpi.vue

@@ -7,9 +7,9 @@
                 <div style="padding-bottom:10px;text-align:right">
                     <span @click="GoZcUrl" style="font-size:12px;text-decoration:underline;cursor: pointer;">跳转到资产管理</span>
                 </div>
-                <el-row class="HeaderDiv" style="border-bottom:1px solid #E2E4EB;padding-bottom:20px">
+                <el-row class="HeaderDiv" style="border-bottom:1px solid #E2E4EB;">
                     <span class="underline"></span>
-                    <el-col :span="12" style="position:relative;padding-left:50px">
+                    <el-col :span="12" style="position:relative;padding-left:50px;margin-bottom:0" >
                         <span class="titleSpan">
                             <span>{{GetDetail.FirstStr}}</span>
                         </span>
@@ -390,8 +390,8 @@
 
 <script>
 import CheckDetails from "./CheckDetails.vue";
-import {getAuditChangeLogPageList,auditOrRefund,getPropertyAuditDetail} from "../../../api/administration/AssetsShenpi"
-import {url_jump_zc} from "../../../utils/url"
+import {getAuditChangeLogPageList,auditOrRefund,getPropertyAuditDetail,UploadSelfFileT} from "../../../api/administration/AssetsShenpi"
+import {url_jump_zc,ViittoFileUrl} from "../../../utils/url"
 export default {
   name: 'approvalDetails',
   components: {
@@ -546,7 +546,7 @@ export default {
             var path = `/assets/sign/`;
             newArr.push(this.dataURLtoFile(imgUrl,fileName))
             this.UploadSelfFileT(path, newArr, x => {
-                this.addMsg.SignImage=that.domainManager().ViittoFileUrl+x.data.FilePath;
+                this.addMsg.SignImage=ViittoFileUrl+x.data.FilePath;
             }, 1);
             
             this.signState=false;
@@ -703,7 +703,6 @@ export default {
                         x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
                     })
                     this.danjuList=data;
-                    console.log(data)
 
                 } else {
                     this.Error(res.data.message);
@@ -720,29 +719,9 @@ export default {
                     this.Error("请签名！");
                     return;
                 }  
-                
             }
             this.addMsg.AuditType=num;
             this.addMsg.ImageList=this.uploadImgList;
-            // this.apiJavaPostZc("/api/property/AuditOrRefund",this.addMsg,
-            //     res => {
-            //     if (res.data.resultCode ==1) {
-            //         this.getDetail();
-            //         this.Success(res.data.message);
-            //         this.addMsg={
-            //             AuditDescription:'',
-            //             ImageList:[],
-            //             UseReceiveId:'',
-            //             AuditType:'',
-            //             SignImage:'',
-            //         }
-            //         // this.reload();
-            //     } else {
-            //         this.Error(res.data.message);
-            //     }
-            //     },
-            //     null
-            // );
             auditOrRefund(this.addMsg).then((res)=>{
                 console.log(res)
                 if (res.data.resultCode ==1) {
@@ -790,8 +769,8 @@ export default {
             newArr.push(file.file)
             let path = "/Upload/Temporary/"
             this.$message.info('上传中...')
-            this.UploadSelfFileT(path, newArr, x => {
-                let obj = this.domainManager().ViittoFileUrl + x.data.FilePath
+            UploadSelfFileT(path, newArr, x => {
+                let obj = ViittoFileUrl + x.data.FilePath
                 this.uploadImgList.push(obj)
                 this.$message.success('上传成功')
             }, 1);
@@ -836,7 +815,6 @@ export default {
             //     null
             // );
             getPropertyAuditDetail({UseReceiveId:this.addMsg.UseReceiveId}).then((res)=>{
-                
                  this.pageLoad=false;
                 if (res.data.resultCode === 1) {
                     let data=res.data.data;
@@ -993,6 +971,7 @@ li{
 }
  .approvalDetails .f14{
     font-size:14px;
+    margin: 0;
 }
  .approvalDetails .basefix:after {
     clear: both;
@@ -1302,6 +1281,13 @@ li{
     display: inline-block;
     width: 85px;
 }
+.HeaderDiv{
+    /* height: 75px; */
+    padding-bottom:20px;
+    display: flex;
+    align-items: center;
+}
+
 .approvalDetails .HeaderDiv .underline{
     display: block;
     width:135px;
@@ -1309,6 +1295,7 @@ li{
     position: absolute;
     bottom: 0;
     background: #00D2D6;
+    
 }
 .approvalDetails .titleSpan{
     position: absolute;

src/pages/administration/AssetsSystem/CheckDetails.vue

@@ -146,6 +146,7 @@
 </template>
 
 <script>
+import {getPropertyLogPageList,getPropertyInfo} from "../../../api/administration/AssetsShenpi"
 export default {
   name: '',
   data(){
@@ -181,10 +182,7 @@ export default {
       this.getOperation();
     },
     getOperation() {
-      this.apiJavaPost(
-        "/api/property/GetPropertyLogPageList",
-        this.msg,
-        res => {
+      getPropertyLogPageList(this.msg).then((res)=>{
           this.OperationLoad = false;
           if (res.data.resultCode === 1) {
             this.OperationList = res.data.data.pageData;
@@ -192,24 +190,18 @@ export default {
           } else {
             this.Error(res.data.message);
           }
-        },
-        null
-      );
+      })
     },
     getDataInfo(){
-        this.apiJavaPost(
-        "/api/property/GetPropertyInfo",
-       {Id:this.PropertyId},
-        res => {
+      getPropertyInfo({Id:this.PropertyId}).then((res)=>{
           this.OperationLoad = false;
           if (res.data.resultCode === 1) {
             this.datainfo = res.data.data;
+            console.log(this.datainfo)
           } else {
             this.Error(res.data.message);
           }
-        },
-        null
-      );
+      })
     },
   },
 }

src/utils/request_zc.js

@@ -11,13 +11,13 @@ import {
 var showLoginMessageBox = false;
 axios.defaults.headers["Content-Type"] = "application/json;charset=UTF-8"; //application/x-www-form-urlencoded;charset=UTF-8
 let token=Lockr.get("Token");
-const service = axios.create({
+const service_zc = axios.create({
   baseURL: process.env.API_ZC,
   timeout: 15000
 });
 
 // request拦截器
-service.interceptors.request.use(
+service_zc.interceptors.request.use(
   config => {
     if (config.headers["responseType"] == "arraybuffer") {
       config.responseType = "arraybuffer";
@@ -49,10 +49,9 @@ service.interceptors.request.use(
 );
 
 // response 拦截器
-service.interceptors.response.use(
+service_zc.interceptors.response.use(
   response => {
     const res = response.data;
-   console.log(res)
     // TODO 确定后台的CODE码
     if (response.status === 200 ) {
       // 文件类型特殊处理
@@ -102,4 +101,4 @@ service.interceptors.response.use(
   }
 );
 
-export default service;
+export default service_zc;

src/utils/url.js

 export let url_jump_zc="http://zcyx.oytour.com"
+
+export let UploadUrl="http://192.168.1.214:8120"//上传文件到本地服务器
+
+export let ViittoFileUrl="http://192.168.1.214:8120"//文件站点
\ No newline at end of file