Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -21,9 +21,11 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
   BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
   // BASE_URL: '"http:///192.168.0.55:8080/"',//蔡雅茹
-  CONSOLE_BASE_URL: '"http://localhost:8080/"' //控制台测试服务器
+  CONSOLE_BASE_URL: '"http://localhost:8080/"', //控制台测试服务器
   // CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台正式服务器
 
+  APP_BASE_URL: 'https://pre.baoxianzhanggui.com/web-api',    // app打包上传地址
+
 })
 
 

config/pre.env.js

@@ -7,7 +7,8 @@ module.exports = merge(prodEnv, {
   ENV_CONFIG: '"test"',
   BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL: '"http:///192.168.0.103:8080/web-api"',//测试服务器
-  CONSOLE_BASE_URL: '"https://pre.baoxianzhanggui.com/console-api"' //控制台测试服务器
+  CONSOLE_BASE_URL: '"https://pre.baoxianzhanggui.com/console-api"', //控制台测试服务器
+  APP_BASE_URL: 'https://pre.baoxianzhanggui.com/web-api',    // app打包上传地址
 
 
 })

config/prod.env.js

@@ -3,5 +3,7 @@ module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"prod"',
   BASE_URL: '"https://sxzgkj.baoxianzhanggui.com/web-api"',
-  CONSOLE_BASE_URL: '"https://sxzgkj.baoxianzhanggui.com/console-api"' //控制台测试服务器
+  CONSOLE_BASE_URL: '"https://sxzgkj.baoxianzhanggui.com/console-api"', //控制台测试服务器
+  APP_BASE_URL: 'https://pre.baoxianzhanggui.com/web-api',    // app打包上传地址
+
 }

config/test.env.js

@@ -5,7 +5,8 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"testing"',
   ENV_CONFIG: '"test"',
-  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  BASE_URL: '"http://192.168.0.115:8080"',
+  APP_BASE_URL: 'https://pre.baoxianzhanggui.com/web-api',    // app打包上传地址
   CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台测试服务器
-
-})
+})

src/views/Core/components/detailsDialog.vue

@@ -37,6 +37,29 @@
           </ul>
         </div>
         <div style="margin:20px;height: 60vh;overflow-y: auto;width: 100%;">
+          <ul class="fixedTop">
+            <li>
+              <div class="title">
+                <div class="img"><img src="@/assets/image/detailsDialog_cph.png" alt=""></div>
+                <p>车牌号：</p>
+              </div>
+              <p>{{ orderInfo.licenseno }}</p>
+            </li>
+            <li>
+              <div class="title">
+                <div class="img"><img src="@/assets/image/detailsDialog_gs.png" alt=""></div>
+                <p>保险公司：</p>
+              </div>
+              <p>{{ orderInfo.inscompany }}</p>
+            </li>
+            <li>
+              <div class="title">
+                <div class="img"><img src="@/assets/image/detailsDialog_ly.png" alt=""></div>
+                <p>业务来源：</p>
+              </div>
+              <p>{{ orderInfo.source }}</p>
+            </li>
+          </ul>
           <OpenCloseBox id="gsxx">
             <span slot="title">归属信息</span>
             <div slot="boby">
@@ -1111,6 +1134,57 @@ export default {
     color: var(--themeColor);
     background-color: rgba(212, 36, 38, 0.06);
   }
+  
+  .fixedTop {
+    width: 100%;
+    height: auto;
+    // position: absolute;
+    // top: 10px;
+    background: linear-gradient(#fbe8e8, #fff 50%);
+    border-radius: 5px;
+    margin-bottom: 20px;
+    list-style-type: none;
+    padding: 20px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+
+    li {
+      width: auto;
+      height: auto;
+
+      .title {
+        width: 100%;
+        height: auto;
+        display: flex;
+        justify-content: flex-start;
+
+        p {
+          font-size: 16px;
+          color: #666;
+          margin: 0 0 0 10px;
+        }
+
+        .img {
+          width: 24px;
+          height: 24px;
+
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        margin-bottom: 5px;
+      }
+
+      p {
+        margin: 10px 0 0 0;
+        font-size: 20px;
+        color: #333;
+      }
+    }
+  }
 }
 
 .icon-img {

src/views/Core/components/detailsDialogPro.vue

@@ -36,6 +36,29 @@
         </ul>
       </div>
       <div style="margin:20px;height: 60vh;overflow-y: auto;width: 100%;">
+        <ul class="fixedTop">
+            <li>
+              <div class="title">
+                <div class="img"><img src="@/assets/image/detailsDialog_cph.png" alt=""></div>
+                <p>车牌号：</p>
+              </div>
+              <p>{{ orderInfo.licenseno }}</p>
+            </li>
+            <li>
+              <div class="title">
+                <div class="img"><img src="@/assets/image/detailsDialog_gs.png" alt=""></div>
+                <p>保险公司：</p>
+              </div>
+              <p>{{ orderInfo.inscompany }}</p>
+            </li>
+            <li>
+              <div class="title">
+                <div class="img"><img src="@/assets/image/detailsDialog_ly.png" alt=""></div>
+                <p>业务来源：</p>
+              </div>
+              <p>{{ orderInfo.source }}</p>
+            </li>
+        </ul>
         <OpenCloseBox id="gsxx">
           <span slot="title">归属信息</span>
           <div slot="boby">
@@ -747,6 +770,57 @@ export default {
     color: var(--themeColor);
     background-color: rgba(212, 36, 38, 0.06);
   }
+  
+  .fixedTop {
+    width: 100%;
+    height: auto;
+    // position: absolute;
+    // top: 10px;
+    background: linear-gradient(#fbe8e8, #fff 50%);
+    border-radius: 5px;
+    margin-bottom: 20px;
+    list-style-type: none;
+    padding: 20px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+
+    li {
+      width: auto;
+      height: auto;
+
+      .title {
+        width: 100%;
+        height: auto;
+        display: flex;
+        justify-content: flex-start;
+
+        p {
+          font-size: 16px;
+          color: #666;
+          margin: 0 0 0 10px;
+        }
+
+        .img {
+          width: 24px;
+          height: 24px;
+
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        margin-bottom: 5px;
+      }
+
+      p {
+        margin: 10px 0 0 0;
+        font-size: 20px;
+        color: #333;
+      }
+    }
+  }
 }
 
 .icon-img {

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -892,6 +892,7 @@ export default {
           res.data.carinfo.cimodelclass = this.vehicleTypeCap(res.data.carinfo.cimodelclass)
           res.data.carinfo.energyType = this.energyTypeCap(res.data.carinfo.energyType)
           res.data.carinfo.vehicleUse = this.outOfBusinessVehicleUseCap(res.data.carinfo.carnature, res.data.carinfo.vehicleUse)
+          res.data.source = dy.managementSource;
           this.orderInfo = res.data;
           this.oldfileList = [];
           let businessList = []

src/views/Sys/Appversion.vue

@@ -326,7 +326,7 @@ export default {
       params.append("type", 'app')
       this.$api.letter.uploadFile(params).then(res => {
         if (res.code == "200") {
-          this.appformLabelAlign.path = process.env.BASE_URL  + res.data.url;
+          this.appformLabelAlign.path = process.env.APP_BASE_URL  + res.data.url;
         }
       })
     },

src/views/Task/mixin.js

@@ -405,6 +405,7 @@ export const mixin = { // 导出混入对象
           data.carinfo.cartype=data.carinfo.cartype?this.capTypedictTag(data.carinfo.cartype,this.trafficManagementVehicleTypeoptions):''
           data.carinfo.cimodelclass=data.carinfo.cimodelclass?this.capTypedictTag(data.carinfo.cimodelclass,this.vehicleTypeoptions):''
           data.carinfo.energyType=data.carinfo.energyType?this.capTypedictTag(data.carinfo.energyType,this.energyTypeoptions):''
+          data.source = row.managementSource
           this.queryOrders = data;
         }
         else{