Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -9,9 +9,9 @@
         <div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-project></list-project>
         </div>
-        <div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+<!--        <div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-tracking></list-tracking>
-        </div>
+        </div>-->
         <div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-other></list-other>
         </div>
@@ -68,13 +68,13 @@ export default {
               name: "listProject"
             });
             continue;
-          } else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
+          }/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
             list.push({
               label: "重点标准跟踪清单",
               name: "listTracking"
             });
             continue;
-          } else if (entity.id === "5a75523729b04102a565167004d640e9") {
+          }*/ else if (entity.id === "5a75523729b04102a565167004d640e9") {
             list.push({
               label: "其他清单",
               name: "listOther"

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -646,7 +646,6 @@ export default {
     },
     // 点击查看
     handlePreview(data) {
-      debugger
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -12,8 +12,14 @@
           <el-row style="margin-top: 10px">
             <el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
             <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
-            <el-col :span="5" :push="2">项目名称: <span class="valueColor">{{ localProEO.projectName }}</span></el-col>
-            <!--          <el-col :span="5" :push="2">车型系列:<span class="valueColor">{{ localProEO.productSet }}</span></el-col>-->
+            <el-col :span="5" :push="2">
+              <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
+                <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div>
+                <div v-else></div>
+                <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div>
+                <div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div>
+              </el-tooltip>
+            </el-col>
             <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
             </el-col>
           </el-row>
@@ -449,7 +455,7 @@ export default {
           let deleteTagList = []
           this.selectList1.forEach(item => {
             //项目id-标准id,项目id-标准id
-            deleteTagList.push( this.proId + '-' + item )
+            deleteTagList.push(this.proId + '-' + item)
           })
           this.id = deleteTagList.join(',')
           this.$http.post('sarStandProjectLibrary/deleteByIds', {
@@ -726,6 +732,7 @@ export default {
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap, res.data.WBZTCLASS)
+        console.log(this.getLocalPro)
         this.showLocalProductData(this.getLocalPro)
       }, e => {
       })

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -60,13 +60,18 @@
             width="180"
         >
           <template slot-scope="scope">
-            <div><span>{{ scope.row.standSort }} {{ scope.row.standNumber }}</span> <span v-if="scope.row.standYear">-{{ scope.row.standYear }}</span></div>
+            <a class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
             prop="standName"
             label="标准/政策名称"
         >
+          <template slot-scope="scope">
+            <a class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
                 prop="interpretationTime"
@@ -322,6 +327,17 @@ export default {
           this.$store.getters.userInfo.configContent = pageSize
           this.queryStandAndLaws()
       },
+      //点击查看详情
+      handlePreview(item) {
+        let routeUrl = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.standId,
+            pageType: 'INLAND_STAND'
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      },
       queryStandAndLaws () {
           this.sarProject.current = this.page
           this.sarProject.size = this.pageSize

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

@@ -65,14 +65,19 @@
             label="标准/政策号"
             width="180"
         >
-            <template slot-scope="scope">
-                <div><span>{{ scope.row.standSort }} {{ scope.row.standNumber }}</span> <span v-if="scope.row.standYear">-{{ scope.row.standYear }}</span></div>
-            </template>
+          <template slot-scope="scope">
+            <a class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+          </template>
         </el-table-column>
         <el-table-column
             prop="standName"
             label="标准/政策名称"
         >
+          <template slot-scope="scope">
+            <a class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
                 prop="interpretationTime"
@@ -259,7 +264,19 @@ name: "technologyInvolveProject",
               this.sarProjectListDatas = res.data.records
               this.total = res.data.total
           }, e=> {})
-      }, // 分页查询
+      },
+      //点击查看详情
+      handlePreview(item) {
+        let routeUrl = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      },
+      // 分页查询
       resetSelect () {
           this.sarProject.country = ''
           this.sarProject.standCode=''

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -11,19 +11,19 @@
             <div v-show="heightShow" class="transition-box">
                 <p class="transition-box-p">
                     <label class="transition-box-label">标准号：</label>
-                    <span class="transition-box-span">{{ this.$route.query.item.cid }}</span>
+                    <span class="transition-box-span" @click="handlePreview($route.query.item)">{{ $route.query.item.cid }}</span>
                 </p>
                 <p class="transition-box-p">
                     <label class="transition-box-label">标准名称：</label>
-                    <span class="transition-box-span">{{ this.$route.query.item.cname || '-' }}</span>
+                    <span class="transition-box-span">{{ $route.query.item.cname || '-' }}</span>
                 </p>
                 <p class="transition-box-p">
                     <label class="transition-box-label">上传时间：</label>
-                    <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
+                    <span class="transition-box-span">{{ $route.query.item.endTime || '-' }}</span>
                 </p>
                 <p class="transition-box-p">
                     <label class="transition-box-label">征求意见周期：</label>
-                    <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
+                    <span class="transition-box-span" v-if="$route.query.item.startTime && $route.query.item.endTime">{{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}}</span>
                     <span class="transition-box-span" v-else>-</span>
                 </p>
             </div>
@@ -166,6 +166,21 @@
                     }
                 })
             },
+
+          //点击查看
+          handlePreview(data) {
+            console.log(data);
+            return
+            let routeUrl = this.$router.resolve({
+              name: "OtherStandardDetails",
+              params: {
+                id: data.id,
+                pageType: data.standType
+              }
+            });
+            window.open(routeUrl.href, "_blank");
+          },
+
             // 获取详情信息列表
             getList() {
                 this.spinShow = true