Переглянути джерело

无效应对的无效理由权要显示权要内容

zhuliu 2 роки тому
батько
коміт
90839e44d1

+ 2 - 2
RMS-FrontEnd/src/views/components/articles/components/PatentRight.vue

@@ -24,7 +24,7 @@
         <div class="box" ref="box" v-dragControllerDiv :style="setStyle()" style="height:calc(100%)">
           <div
             class="left tree"
-            style="width: 70%"
+            style="width: 70%;padding-top: 10px;"
             :style="{ height: height + 'px', overflowY: 'auto' }"
           >
             <myTree :list="patent.patentRightTree" style="height: 100%" :props="{
@@ -37,7 +37,7 @@
             <!--右侧div内容-->
             <div
             id="charts"
-              style="max-width: 100%; min-width: 300px;position:relative"
+              style="max-width: 100%; min-width: 300px;position:relative;padding-top: 10px;"
               v-if="show">
               <div v-for="(item,index) in this.patent.patentRightTree" :key="index" :id="'chart'+index" style="width:500px;margin:0 auto;"></div>
             </div>

+ 1 - 1
RMS-FrontEnd/src/views/layout/index.vue

@@ -44,7 +44,7 @@
             <div v-if="header" style="margin-left:20px;width:100%">
               <div v-if="!report.taskName" style="display:flex;justify-content: space-between;">
                 <p>报告名称:{{ report.reportName?report.reportName:report.name}}</p>
-                <p class="menus" v-if=" report.showMenu && $reportPermission(report.id,[0,1])"><span v-if="[1,2].includes(report.status)&&[0,1,2,3].includes(report.type)"><el-link @click="handleFields">自定义字段</el-link></span><span v-if="[2,3].includes(report.status)"><el-link @click="exportReport">导出报告</el-link></span></p> 
+                <p class="menus" v-if=" report.showMenu && $reportPermission(report.id,[0,1])"><span v-if="[1,2].includes(report.status)&&[0,1,2,3].includes(report.type)"><el-link @click="handleFields">自定义字段</el-link></span><span v-if="[2,3].includes(report.status) && report.type !='7'"><el-link @click="exportReport">导出报告</el-link></span></p> 
               </div>
               <p v-else>
                 <span > 报告名称:<el-link @click.native="checkReport(report)" style="font-size:16px;vertical-align: inherit;margin-right: 20px;">{{ report.reportName?report.reportName:report.name}}</el-link></span>

+ 1 - 1
RMS-FrontEnd/src/views/product/components/product.vue

@@ -93,7 +93,7 @@
               <el-dropdown-item command="2">产品的营销数据</el-dropdown-item>
               <el-dropdown-item command="3">营销数据的趋势图</el-dropdown-item>
               <el-dropdown-item command="4">专利布局可视化</el-dropdown-item>
-              <el-dropdown-item command="5">相关专利</el-dropdown-item>
+              <el-dropdown-item command="5">商品化专利</el-dropdown-item>
               <el-dropdown-item :divided="true" command="6"> <span style="color: red;">删除</span> </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>

+ 1 - 1
RMS-FrontEnd/src/views/product/components/productCollapse.vue

@@ -66,7 +66,7 @@
                     <el-dropdown-item command="2">产品的营销数据</el-dropdown-item>
                     <el-dropdown-item command="3">营销数据的趋势图</el-dropdown-item>
                     <el-dropdown-item command="4">专利布局可视化</el-dropdown-item>
-                    <el-dropdown-item command="5">相关专利</el-dropdown-item>
+                    <el-dropdown-item command="5">商品化专利</el-dropdown-item>
                     <el-dropdown-item :divided="true" command="6"> <span style="color: red;">删除</span> </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>

+ 1 - 1
RMS-FrontEnd/src/views/product/components/products.vue

@@ -51,7 +51,7 @@
               <el-dropdown-item command="2">产品的营销数据</el-dropdown-item>
               <el-dropdown-item command="3">营销数据的趋势图</el-dropdown-item>
               <el-dropdown-item command="4">专利布局可视化</el-dropdown-item>
-              <el-dropdown-item command="5">相关专利</el-dropdown-item>
+              <el-dropdown-item command="5">商品化专利</el-dropdown-item>
               <el-dropdown-item :divided="true" command="6"> <span style="color: red;">删除</span> </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>

+ 4 - 0
RMS-FrontEnd/src/views/report/InvalidResponse/components/InvalidIndex.vue

@@ -78,6 +78,10 @@
             <div v-else-if="item.key=='argument_str'" class="div_MAX_Height">
               <span  v-if="scope.row.proofGroups && scope.row.proofGroups.length!=0" v-html="scope.row.proofGroups[0].argument_str"></span>
             </div>
+            <el-tooltip class="item" effect="dark" :content="scope.row.rightContent" placement="top" v-else-if="item.key == 'court' && (scope.row.content == 0 || scope.row.content)">
+              <div v-html="getData(scope.row,item.key)"></div>
+            </el-tooltip>
+            
             <div v-else v-html="getData(scope.row,item.key)" class="div_MAX_Height"></div>
         </template>
       </el-table-column>

+ 1 - 1
RMS-FrontEnd/src/views/report/reportDetails/components/ContrastPlan.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="plan">
       <div style="display:flex; justify-content:flex-end;align-items: center;height: 50px;">
-        <el-button @click="exportReport" v-if="$reportPermission(reportId,[0,1])">导出报告</el-button>
+        <!-- <el-button @click="exportReport" v-if="$reportPermission(reportId,[0,1])">导出报告</el-button> -->
         <el-button type="danger" @click="delPlan(0)" v-if="checkList.length>0 && $reportPermission(reportId,[0,1])">删除</el-button>
       </div>
         <!-- <el-table