Merge branch 'developer/yanjiaxu' into develop

.env.production

@@ -4,10 +4,11 @@ VUE_APP_TITLE = 周期性检测平台
 # 生产环境配置
 ENV = 'production'
 
+
 # 中汽研安全检测平台管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
 
 # 图片服务器地址
-VUE_APP_IMAGE_API ='/'
+VUE_APP_IMAGE_API ='https://10.12.48.78'
 
-VUE_APP_CLIENT_API = 'http://10.12.48.78:8090'
+VUE_APP_CLIENT_API = 'https://10.12.48.78/vvmpapi'

.env.staging

@@ -9,4 +9,4 @@ VUE_APP_BASE_API = 'http://49.232.167.247:22032'
 # 图片服务器地址
 VUE_APP_IMAGE_API = 'http://49.232.167.247:22037'
 
-VUE_APP_CLIENT_API = 'http://10.12.48.78:8090'
+VUE_APP_CLIENT_API = 'https://10.12.48.78/vvmpapi'

src/assets/styles/process.scss

@@ -92,7 +92,7 @@
     width: calc(100% - 100px);
   }
   .standard-title {
-    width: calc(100% - 10px);
+    width: calc(70% - 40px);
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;

src/views/processing/carReview/vehicle-type/index.vue

@@ -233,8 +233,16 @@
             <span class="title-content">确定车型试验范围</span>
           </div>
           <div class="img-item">
-            <div class="img-label" style="margin-top: 20px">选择测试场景</div>
-            <div class="img-label" style="margin-top: 20px">选择测试场景</div>
+            <div class="img-label" style="margin-top: 20px">
+              选择测试场景
+              <footer-button
+                style="width: 80px; height: 25px"
+                type="primary"
+                @click="selectAll"
+              >
+                全部选择
+              </footer-button>
+            </div>
           </div>
           <!--   测试场景   -->
           <div class="test-scenario-container">
@@ -460,6 +468,14 @@ export default {
     },
     closeAll() {
       this.activeNames = []
+    }, // 全选
+    selectAll() {
+      this.model.testScenarioList.forEach(obj => {
+        obj.check = true
+      })
+      this.selectedScenario = this.model.testScenarioList.map(obj => {
+        return obj.value
+      })
     }
   }
 }

src/views/processing/carReview/write-check-form/index.vue

@@ -10,7 +10,7 @@
           预览表单
         </header-button>
         <header-button
-          v-if="model.systemReviewTask.leaderId == userId"
+          v-if="model.carReviewTask.leaderId == userId"
           type="default"
           icon="check"
           @click="submitFrom()"

src/views/processing/carTest/execution-test-plan/index.vue

@@ -23,7 +23,7 @@ export default {
   },
   mounted() {
     const id = this.$route.query.id
-    this.url = `http://10.12.48.80:1234/car/complianceTestingCenter/projectOverView/${id}`
+    this.url = `https://10.12.48.78:8090/car/complianceTestingCenter/projectOverView/${id}`
   },
   methods: {}
 }

src/views/processing/unprocessed-review/index.vue

@@ -600,7 +600,7 @@ export default {
         // 确认测试结果
         case 'SIGNED':
           this.$router.push({
-            ath: `/processing/carTest/confirmation-test??id=${id}`
+            path: `/processing/carTest/confirmation-test??id=${id}`
           })
           break
         case 'FINISH':

src/views/setting/testMatrix/useCaseDetails/index.vue

@@ -18,12 +18,11 @@ export default {
     return {
       id: this.$route.query,
       url: ''
-      // http://10.12.48.78:8090/car/caseManage/case/casePublishDetail/case_items;375
     }
   },
   mounted() {
     const id = this.$route.query.id
-    this.url = `http://10.12.48.78:8090/car/caseManage/case/casePublishDetail/${id}`
+    this.url = `https://10.12.48.78:8090/car/caseManage/case/casePublishDetail/${id}`
   },
   methods: {}
 }

vue.config.js

@@ -42,7 +42,7 @@ module.exports = {
         }
       },
       [process.env.VUE_APP_CLIENT_API]: {
-        target: `http://10.12.48.78:8090`,
+        target: `https://10.12.48.78/vvmpapi`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_CLIENT_API]: ''
@@ -116,7 +116,7 @@ module.exports = {
       .use('graphql-tag/loader')
       .loader('graphql-tag/loader')
       .end();
-    config.when(process.env.NODE_ENV !== 'development', config => {
+    config.when(process.env.NODE_ENV === 'production', config => {
       config
         .plugin('ScriptExtHtmlWebpackPlugin')
         .after('html')