Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!141

src/pages/details/otherStandardDetails/index.vue

@@ -593,24 +593,29 @@
           </el-table-column>
           <el-table-column
               prop="dutyEngineer"
-              label="责任工程师">
+              label="责任工程师"
+              width="100">
           </el-table-column>
           <el-table-column
+              show-overflow-tooltip
               prop="comparedWithPrevious"
               label="基于上一版本差异"
               width="150">
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              label="符合性状态">
+              label="符合性状态"
+              width="100">
             <template slot-scope="scope">
               {{scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-'}}
 
             </template>
           </el-table-column>
           <el-table-column
+              show-overflow-tooltip
               prop="complianceState"
-              label="合规性分析">
+              label="合规性分析"
+              width="100">
           </el-table-column>
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">

src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue

@@ -161,12 +161,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
           prop="technicalRequir"
           width="150"
           label="核心技术要求"
           align="center">
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
           v-if="sarType === 'INLAND'"
           prop="changePoint"
           width="150"
@@ -174,6 +176,7 @@
           align="center">
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
           v-if="sarType === 'FOREIGN'"
           prop="changePoint"
           width="150"
@@ -191,6 +194,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
           prop="complianceState"
           width="150"
           label="合规性分析"

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -171,7 +171,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求">
+                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求" maxlength="500">
                         </div>
                     </template>
                 </el-table-column>
@@ -182,7 +182,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异">
+                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">
                         </div>
                     </template>
                 </el-table-column>
@@ -194,7 +194,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" >
+                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >
                         </div>
                     </template>
                 </el-table-column>
@@ -214,7 +214,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析">
+                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">
                         </div>
                     </template>
                 </el-table-column>
@@ -359,18 +359,21 @@
                         <el-input
                                 v-model="plForm.technicalRequir"
                                 placeholder="请输入核心技术要求"
+                                maxlength="500"
                         ></el-input>
                     </el-formItem>
                     <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND'">
                         <el-input
                                 v-model="plForm.changePoint"
                                 placeholder="请输入国内标准的差异点"
+                                maxlength="500"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND'">
                         <el-input
                                 v-model="plForm.changePoint"
                                 placeholder="请输入上一版本差异点"
+                                maxlength="500"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
@@ -385,6 +388,7 @@
                         <el-input
                                 v-model="plForm.complianceState"
                                 placeholder="请输入合规性分析"
+                                maxlength="500"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >

src/pages/processCenter/pages/creatProcess/bzjd/step4.vue

@@ -160,12 +160,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="technicalRequir"
                         width="150"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'INLAND'"
                         prop="changePoint"
                         width="150"
@@ -173,6 +175,7 @@
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'FOREIGN'"
                         prop="changePoint"
                         width="150"
@@ -190,6 +193,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="complianceState"
                         width="150"
                         label="合规性分析"

src/pages/processCenter/pages/creatProcess/bzjd/step5.vue

@@ -160,12 +160,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="technicalRequir"
                         width="150"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'INLAND'"
                         prop="changePoint"
                         width="150"
@@ -173,6 +175,7 @@
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'FOREIGN'"
                         prop="changePoint"
                         width="150"
@@ -190,6 +193,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="complianceState"
                         width="150"
                         label="合规性分析"

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -161,12 +161,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="technicalRequir"
                         width="150"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'INLAND'"
                         prop="changePoint"
                         width="150"
@@ -174,6 +176,7 @@
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'FOREIGN'"
                         prop="changePoint"
                         width="150"
@@ -191,6 +194,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="complianceState"
                         width="150"
                         label="合规性分析"

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -26,7 +26,7 @@
                         @mouseleave="mouseleave(data)">
                         <span
                           :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
-                        <span> {{ node.label}} </span>
+                        <span> {{ node.label }} </span>
                         <span>
                           <el-button
                             type="text"
@@ -182,30 +182,23 @@
             </el-table-column>
             <el-table-column
               label="标准号"
-                width="130"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                <a v-if="scope.row.standYear" class="table-jump"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
-                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
-                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                    scope.row.standNumber
-                  }}-{{ scope.row.standYear }}</a>
-                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
-                  {{ scope.row.standSortShow }}
                   {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
               prop="standName"
               label="标准名称"
-                width="210"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -214,19 +207,17 @@
               width="110px"
               label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                {{ formatIssueDate(scope.row.issueTime) }}
-                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="SSRQ"
               sortable="custom"
-                width="110px"
+              width="150px"
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
-                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -237,8 +228,7 @@
               width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
-                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -247,8 +237,7 @@
               width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
-                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -262,8 +251,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -1855,11 +1843,10 @@ export default {
         applyArctic: '',//适用车型
         standState: '',
         standNature: '',//标准性质
-        textStatus:'',//文本状态
+        textStatus: '',//文本状态
         synopsis: '', // 内容摘要
 
 
-
       }, // 分页查询过程中用到的对象
 
       //高级搜索映射
@@ -2394,7 +2381,6 @@ export default {
     },
     popoverHideQuery(ids, attrField) {
       console.log(ids)
-      console.log("-----------------------------")
       console.log(attrField)
     },
     popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2699,8 +2685,6 @@ export default {
       this.$nextTick(() => {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
-          console.log(this.formFieldList, 'assssssssssss')
-          console.log(item, 'itemitemitemitem')
           const formFieldList = this.formFieldList
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           if (this.sarStandardsInfoEO.standSystem) {
@@ -2752,7 +2736,6 @@ export default {
             })
           })
           this.dynamicFormField = displayLocation
-          console.log(this.dynamicFormField)
           this.loading = false
         })
       })
@@ -3005,8 +2988,12 @@ export default {
         userId: this.$store.getters.userInfo.userId
       }, {}, res => {
         if (res.ok) {
+          for (let i in res.data) {
+            let arr = res.data[i].children
+            arr.push(arr.shift())
             this.treeList = res.data
           }
+        }
       })
     },
     // 查询所有菜单
@@ -3140,8 +3127,6 @@ export default {
     },
     // 表格排序
     sortChange(sortObj) {
-      console.log(sortObj.column.order + "======" + sortObj.column.property)
-      console.log(sortObj, '升降序')
       if (sortObj.column.order !== 'normal') {
         this.nowOrder = ''
         this.orderBy = ''
@@ -3553,7 +3538,6 @@ export default {
                 sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
               })
               nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
-              console.log(nowstandinfo, '提交参数')
               this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
                 _this: this
               }, res => {
@@ -3631,7 +3615,6 @@ export default {
       formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
       formData.nowOrder = this.nowOrder
       // formData.orderBy = this.orderBy
-      console.log(this.selectSarMenu.id)
       // 处理我的收藏和个性化标签传参
       if (this.selectSarMenu.menuName === '我的收藏') {
         formData.menuId = undefined
@@ -3690,7 +3673,6 @@ export default {
             }
             if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
               res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
-              console.log(res.data.list[i].SSRQ);
             }
           }
           this.stahndinfoList = res.data.list
@@ -4878,7 +4860,6 @@ export default {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
-      console.log(this.textStatusMap, '文本状态的值')
     }
   },
   computed: {
@@ -5004,6 +4985,7 @@ export default {
   background: url('~@/assets/images/shangqi/img/tree.png');
   background-size: 100% 100%;
 }
+
 /deep/ .tree-line {
   .el-tree-node {
     position: relative;
@@ -5081,12 +5063,14 @@ export default {
     position: relative;
 
     .tree {
-      /deep/.el-card__body {
+      /deep/ .el-card__body {
         padding: 0 !important;
       }
+
       .el-card {
         min-width: min-content;
       }
+
       height: 95%;
       width: calc(~'100% - 15px');
       position: absolute;
@@ -5135,6 +5119,7 @@ export default {
     .tree {
       left: -200px !important;
     }
+
     .tree-right {
       width: calc(~'100% - 15px') !important;
     }

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -193,20 +193,24 @@
                 align="center"
                 label="解读内容">
               <el-table-column
+                      show-overflow-tooltip
                       prop="coreTechnicalRequirement"
                       label="核心技术要求(简述、请勿抄写标准)">
               </el-table-column>
               <el-table-column
+                  show-overflow-tooltip
                       v-if="sarProject.position === '1'"
                       prop="comparedWithPrevious"
                       label="相对于上一版本变化点">
               </el-table-column>
               <el-table-column
+                  show-overflow-tooltip
                       v-if="sarProject.position === '2'"
                       prop="comparedDomesticStandard"
                       label="相对于国行标差异点">
               </el-table-column>
               <el-table-column
+                  show-overflow-tooltip
                       prop="complianceState"
                       label="合规性分析">
               </el-table-column>