Merge branch 'master' of http://gitlab.91isoft.com:90/car-database/car-database-web

src/components/CheckCoiumns/checkInput.vue

@@ -101,6 +101,7 @@ export default {
         }
       })
       this.model.value = old
+      this.input()
     },
     removeItem(array, item) {
       let arr = []

src/components/CheckCoiumns/checkInputUpload.vue

@@ -23,54 +23,37 @@
           @input="input"
         >
         </el-input>
-
         <div
           style="width: 20rem; display: inline-block; vertical-align: middle"
         >
           {{ i.object }}
         </div>
-        <el-upload
-          class="upload-demo"
-          ref="fileUpload"
-          :action="uploadImgUrl"
-          :on-preview="handlePreview"
-          v-model="i.file"
-          :on-remove="handleRemove"
-          accept=".pdf ,.doc ,.docx ,.xls, .xlsx"
-          :before-remove="beforeRemove"
-          :show-file-list="false"
-          :limit="1"
-          :on-success="
-            res => {
-              handleSuccess(res, i)
-            }
-          "
-          :on-exceed="handleExceed"
-          :headers="headers"
-          >、
-          <!-- <el-button
-            size="small"
-            v-if="i.path"
-            v-loading="loading"
-            :disabled="status"
-            type="primary"
-            >{{ i.file_name }}</el-button
-          > -->
-          <el-button
-            size="small"
-            v-loading="loading"
-            :disabled="status"
-            type="primary"
-            >上传文件</el-button
-          >
-          <div slot="tip" class="el-upload__tip">
-            <div v-if="i.path">
-              <el-link :href="i.path">{{ i.file_name }}</el-link>
-            </div>
-          </div>
-        </el-upload>
       </div>
     </div>
+    <el-upload
+      class="upload-demo"
+      ref="fileUpload"
+      :action="uploadImgUrl"
+      :on-preview="handlePreview"
+      v-model="model.file"
+      :on-remove="handleRemove"
+      accept=".pdf ,.doc ,.docx ,.xls, .xlsx"
+      :before-remove="beforeRemove"
+      :show-file-list="false"
+      :limit="1"
+      :on-success="handleSuccess"
+      :on-exceed="handleExceed"
+      :headers="headers"
+    >
+      <el-button size="small" :disabled="status" type="primary"
+        >上传文件</el-button
+      >
+      <div slot="tip" class="el-upload__tip">
+        <div v-if="model.path">
+          <el-link :href="model.path">{{ model.name }}</el-link>
+        </div>
+      </div>
+    </el-upload>
   </div>
 </template>
 <script>
@@ -100,9 +83,11 @@ export default {
     return {
       model: {
         value: '',
-        list: []
+        list: [],
+        file: '',
+        path: '',
+        name: ''
       },
-      loading: false,
       headers: {
         Authorization: 'Bearer ' + this.$store.getters.token
       },
@@ -152,6 +137,7 @@ export default {
         }
       })
       this.model.value = old
+      this.input()
     },
     removeItem(array, item) {
       let arr = []
@@ -187,9 +173,6 @@ export default {
           value: '',
           check: false,
           useCaseNo: i.useCaseNo,
-          path: '',
-          file: '',
-          file_name: '',
           key: i.value,
           id: i.id,
           flag: i.flag
@@ -201,18 +184,13 @@ export default {
     },
     handlePreview(file) {
       console.log(file)
-      this.loading = true
     },
-    handleSuccess(res, item) {
-      console.log(res, item)
-
+    handleSuccess(res, file) {
       if (res.code === 200) {
-        this.loading = false
-        // const item = this.model.list[k]
-        item.path = process.env.VUE_APP_IMAGE_API + res.url
-        item.file_name = res.originalFilename
+        this.model.path = process.env.VUE_APP_IMAGE_API + res.url
+        this.model.name = res.originalFilename
+        this.$refs.fileUpload.clearFiles()
         this.$message.success('上传成功')
-        this.$forceUpdate()
       } else {
         this.$message.error('error')
       }

src/components/CheckCoiumns/checkbox.vue

 <template>
   <div>
-    <div v-if="prop =='chcek9'" style="display: inline flex;">
-   <span>关键配置参数：</span>
-  <el-checkbox-group v-model="value" :disabled="status" @change="input">
-    <el-checkbox
-      v-for="(i, k) in items.options"
-      v-if="k<4"
-      :label="i.id"
-      @change="
-        e => {
-          checkOne(i, e)
-        }
-      "
-      :key="k"
-    >
-      {{ i.object }}
-    </el-checkbox>
-  </el-checkbox-group>
-  <span></span>
-  </div>
-    
-  
-    <div v-if="prop =='chcek9'" style="display: inline flex;">
+    <div v-if="prop == 'chcek9'" style="display: inline flex">
+      <span>关键配置参数：</span>
+      <el-checkbox-group v-model="value" :disabled="status" @change="input">
+        <el-checkbox
+          v-for="(i, k) in items.options"
+          v-if="k < 4"
+          :label="i.id"
+          @change="
+            e => {
+              checkOne(i, e)
+            }
+          "
+          :key="k"
+        >
+          {{ i.object }}
+        </el-checkbox>
+      </el-checkbox-group>
+      <span></span>
+    </div>
+
+    <div v-if="prop == 'chcek9'" style="display: inline flex">
       <span>标定参数：</span>
-  <el-checkbox-group v-model="value" :disabled="status" @change="input">
-    <el-checkbox
-      v-for="(i, k) in items.options"
-      v-if="k>=4"
-      :label="i.id"
-      @change="
-        e => {
-          checkOne(i, e)
-        }
-      "
-      :key="k"
+      <el-checkbox-group v-model="value" :disabled="status" @change="input">
+        <el-checkbox
+          v-for="(i, k) in items.options"
+          v-if="k >= 4"
+          :label="i.id"
+          @change="
+            e => {
+              checkOne(i, e)
+            }
+          "
+          :key="k"
+        >
+          {{ i.object }}
+        </el-checkbox>
+      </el-checkbox-group>
+    </div>
+    <el-checkbox-group
+      v-if="prop != 'chcek9'"
+      v-model="value"
+      :disabled="status"
+      @change="input"
     >
-      {{ i.object }}
-    </el-checkbox>
-  </el-checkbox-group>
-</div>
-  <el-checkbox-group v-if="prop!='chcek9'" v-model="value" :disabled="status" @change="input">
-    <el-checkbox
-      v-for="(i, k) in items.options"
-      :label="i.id"
-      @change="
-        e => {
-          checkOne(i, e)
-        }
-      "
-      :key="k"
-    >
-      {{ i.object }}
-    </el-checkbox>
-  </el-checkbox-group>
-</div>
+      <el-checkbox
+        v-for="(i, k) in items.options"
+        :label="i.id"
+        @change="
+          e => {
+            checkOne(i, e)
+          }
+        "
+        :key="k"
+      >
+        {{ i.object }}
+      </el-checkbox>
+    </el-checkbox-group>
+  </div>
 </template>
 <script>
 export default {
@@ -125,6 +129,7 @@ export default {
       })
 
       this.value = old
+      this.input()
     },
 
     removeItem(array, item) {
@@ -145,9 +150,8 @@ export default {
         })
       }
     },
-    input(val) {
+    input() {
       let arr = []
-      let datas = []
       this.items.options.map(i => {
         if (this.value.includes(i.id)) {
           arr.push(i.useCaseNo)

src/components/CheckCoiumns/checkboxUpload.vue

@@ -25,7 +25,7 @@
       :limit="1"
       ref="fileUpload"
       :on-success="handleSuccess"
-      accept=".pdf"
+      accept=".pdf ,.doc ,.docx ,.xls, .xlsx"
       :on-exceed="handleExceed"
       :headers="headers"
     >
@@ -114,6 +114,7 @@ export default {
         }
       })
       this.model.value = old
+      this.input()
     },
 
     removeItem(array, item) {

src/components/CheckCoiumns/inputUpload.vue

@@ -19,7 +19,7 @@
       :before-remove="beforeRemove"
       :show-file-list="false"
       :limit="1"
-      accept=".pdf"
+      accept=".pdf ,.doc ,.docx ,.xls, .xlsx"
       :on-success="handleSuccess"
       :on-exceed="handleExceed"
       :headers="headers"

src/components/CheckCoiumns/radioUpload.vue

@@ -15,7 +15,7 @@
       :before-remove="beforeRemove"
       :show-file-list="false"
       :limit="1"
-      accept=".pdf"
+      accept=".pdf ,.doc ,.docx ,.xls, .xlsx"
       :on-success="handleSuccess"
       :on-exceed="handleExceed"
       :headers="headers"

src/components/checkBuilder.vue

 <template>
   <el-form ref="queryForm" :model="form" class="formClass">
     <div class="btn-group">
+      <el-button
+        type="primary"
+        @click="handleDownload"
+        style="margin-right: 20px"
+        >下载所有模板</el-button
+      >
       <el-radio-group v-model="merge">
         <el-radio-button :label="true">强关联选择对象 </el-radio-button>
         <el-radio-button :label="false">自主选择对象</el-radio-button>
@@ -20,18 +26,18 @@
               >
                 不适用
               </el-checkbox>
-              <span v-if="index == 0"> 
+              <span v-if="item.notApplicable">
                 <el-tooltip
-                    class="box-item circle" 
-                    effect="dark"
-                    content=''
-                    placement="top"
-                    style="border-radius: 100px;margin-left: 20px;"
-                      >
-                      <i class="el-icon-question smartTip"></i>
-                      <div style="width: 250px;" slot="content" class="tip">
-                        远控系统所在ECU若包含功能选项需做备注，若远控系统为TBOX则根据车辆情况勾选蜂窝网络与固件选项，若远控系统为车机与TBOX二合一系统，则根据车辆情况勾选蜂窝网络、固件、WIFI AP 、WIFI client选项
-                      </div>
+                  class="box-item circle"
+                  effect="dark"
+                  content=""
+                  placement="top"
+                  style="border-radius: 100px; margin-left: 20px"
+                >
+                  <i class="el-icon-question smartTip"></i>
+                  <div style="width: 250px" slot="content" class="tip">
+                    {{ item.notApplicable }}
+                  </div>
                 </el-tooltip>
               </span>
             </div>
@@ -64,9 +70,12 @@
                 @makeRecord="makeRecord"
                 ref="formItem"
               >
-            </component>
-   
+              </component>
             </el-form-item>
+            <div class="desc" v-if="item.remark">
+              {{ item.remark }}
+            </div>
+            <!-- <div class="desc">12334</div> -->
           </div>
         </div>
       </el-col>
@@ -129,6 +138,10 @@ export default {
     })
   },
   methods: {
+    handleDownload() {
+      
+      location.href = 'https://10.12.48.78/vehicle-quality-review-oss/2024/10/17/SchemeTemplate.zip'
+    },
     handleCilck(key) {
       this.$refs.queryForm.clearValidate(key)
     },
@@ -202,8 +215,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 .circle {
-  fill: #456BD9;
-  stroke: #0F1C3F;
+  fill: #456bd9;
+  stroke: #0f1c3f;
   stroke-width: 0.1875em;
   padding: 6px 10px;
   color: gray;
@@ -253,8 +266,14 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
-.tip{
+.tip {
   letter-spacing: 2px;
   text-align: justify;
 }
+.desc {
+  color: red;
+  margin-top: 10px;
+  font-size: 14px;
+  font-weight: 800;
+}
 </style>