Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/assets/css/main.scss

@@ -59,9 +59,11 @@
     height: 100%;
     width: 100%;
     padding-bottom:10px;
+    overflow-x: auto !important;
     .el-table__body-wrapper{
-      max-height: calc(100% - 50px);
-      overflow-y: auto;
+      max-height: calc(100% - 75px);
+      overflow: auto;
+      padding-bottom: 10px;
     }
   }
   .el-table th{

src/views/event/components/index.vue

@@ -7,14 +7,14 @@
           </mySearch>
         </div>
         <div style="display: flex">
-          <div v-if="['可视化'].indexOf(isOperate) == -1">
+          <div v-if="[2].indexOf(isOperate) == -1">
             <span>分组查询：</span>
             <el-select v-model="groupingValue" size="small" @change="changeGrouping" clearable style="width: 120px">
               <el-option v-for="item in groupingOption" :key="item.value" :label="item.name" :value="item.value">
               </el-option>
             </el-select>
           </div>
-          <el-button-group style=" display: flex; justify-content: flex-start; margin-left: 10px;" v-if="['可视化'].indexOf(isOperate) == -1">
+          <el-button-group style=" display: flex; justify-content: flex-start; margin-left: 10px;" v-if="[2].indexOf(isOperate) == -1">
             <el-button size="small" :type="viewSelected === 'visual' ? 'primary' : ''" @click="onChange2('visual')">可视化</el-button>
             <el-button :type="viewSelected === 'Table' ? 'primary' : ''" @click="onChange2('Table')" size="small">列表</el-button>
             <el-button :type="viewSelected === 'Card' ? 'primary' : ''" @click="onChange2('Card')" size="small">卡片</el-button>

src/views/event/components/view/table.vue

@@ -21,30 +21,27 @@
         </template>
       </el-table-column>
 
-      <el-table-column v-if="['首页'].indexOf(isOperate) == -1" label="操作" align="center" width="150px">
-        <template slot-scope="scope">
-          <el-dropdown split-button type="primary" size="small" @click="handleClick(scope.row)"
-            @command="handleCommand($event, scope.row)">
-            <span>编 辑</span>
-            <el-dropdown-menu slot="dropdown" style="text-align:center">
-              <el-dropdown-item command="0">新增专题库</el-dropdown-item>
-              <el-dropdown-item>
-                <el-dropdown trigger="hover" placement="right-start">
-                  <span class="el-dropdown-link"> 新增报告 </span>
-                  <el-dropdown-menu class="children_item" v-if="dictMessage.REPORT_TYPE">
-                    <el-dropdown-item
-                      v-for="item in dictMessage.REPORT_TYPE.filter(item => !['6'].includes(item.dictChildValue))"
-                      :key="item.dictChildLabel" @click.native="handleAnalyse(item.dictChildValue, scope.row)"
-                      v-if="$permission('/pcs/report/add/' + item.permission)">{{ item.dictChildLabel }}</el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </el-dropdown-item>
-              <el-dropdown-item command="10" divided style="color:red">删 除</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column v-if="['1'].indexOf(isOperate) == -1" label="操作" align="center" width="150px" >
+          <template slot-scope="scope">
+            <el-dropdown split-button type="primary" size="small" @click="handleClick(scope.row)"
+              @command="handleCommand($event,scope.row)">
+              <span>编 辑</span>
+              <el-dropdown-menu slot="dropdown" style="text-align:center">
+                <el-dropdown-item command="0">新增专题库</el-dropdown-item>
+                <el-dropdown-item>
+                  <el-dropdown trigger="hover" placement="right-start">
+                    <span class="el-dropdown-link"> 新增报告 </span>
+                    <el-dropdown-menu  class="children_item" v-if="dictMessage.REPORT_TYPE">
+                        <el-dropdown-item v-for="item in dictMessage.REPORT_TYPE.filter(item=>!['6'].includes(item.dictChildValue))" :key="item.dictChildLabel"  @click.native="handleAnalyse(item.dictChildValue,scope.row)" v-if="$permission('/pcs/report/add/' + item.permission)">{{item.dictChildLabel}}</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown> 
+                </el-dropdown-item>
+                <el-dropdown-item command="10" divided style="color:red">删 除</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
 
     <el-alert v-if="isFlag" title="正在努力加载中..." type="success" center :closable="false" show-icon></el-alert>
     <el-alert v-if="isMore" title="没有更多啦！" type="warning" center show-icon></el-alert>

src/views/home/components/tabs.vue

@@ -3,13 +3,13 @@
     <div id="step3">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="事件" name="event">
-          <eventTable :isOperate="'首页'" :tableData="tableData"></eventTable>
+          <eventTable :isOperate="1" :tableData="tableData"></eventTable>
         </el-tab-pane>
         <el-tab-pane label="专题库" name="project">
-          <projectTable :isOperate="'首页'" :tableData="tableData"></projectTable>
+          <projectTable :isOperate="1" :tableData="tableData"></projectTable>
         </el-tab-pane>
         <el-tab-pane label="报告" name="report">
-          <reportTable :isOperate="'首页'" :tableData="tableData"></reportTable>
+          <reportTable :isOperate="1" :tableData="tableData"></reportTable>
         </el-tab-pane>
         <el-tab-pane label="我的任务" name="task">
           <taskTable :tableData="tableData"></taskTable>

src/views/patentMining/index.vue

@@ -6,7 +6,7 @@
                 <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption" :disabled="!$permission('/workspace/project/check')"></mySearch>  
               </div>
               <div style="display:flex;margin-right:10px">
-                  <el-button-group class="margin-left_10" v-if="['可视化'].indexOf(isOperate) == -1">
+                  <el-button-group class="margin-left_10" v-if="[2].indexOf(isOperate) == -1">
                     <el-button :type="viewType === 'commonTable' ? 'primary' : ''" @click="onChange2('commonTable')" size="small">列表</el-button>
                     <el-button :type="viewType === 'commonCard' ? 'primary' : ''" @click="onChange2('commonCard')" size="small">卡片</el-button>
                   </el-button-group>

src/views/project/components/view/table.vue

@@ -17,7 +17,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-if="['首页'].indexOf(isOperate) == -1" label="操作" align="center" width="150px">
+        <el-table-column v-if="[1].indexOf(isOperate) == -1" label="操作" align="center" width="150px">
           <template slot-scope="scope">
             <el-dropdown split-button type="primary" size="small" @click="handleCommand('e',scope.row)"
               @command="handleCommand($event,scope.row)">

src/views/project/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="workspace height_100">
     <div shadow="never" class="workspace-card nopadding height_100">
-      <div class="query-top" v-if="['可视化'].indexOf(isOperate) == -1">
+      <div class="query-top" v-if="[2].indexOf(isOperate) == -1">
         <el-collapse>
           <el-collapse-item title="图表预览" name="1">
             <div class="chart-box">
@@ -16,7 +16,7 @@
             <div>
               <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption" :disabled="!$permission('/workspace/project/check')"></mySearch>  
             </div>
-            <div style="display:flex;margin-right:10px" v-if="['可视化'].indexOf(isOperate) == -1">
+            <div style="display:flex;margin-right:10px" v-if="[2].indexOf(isOperate) == -1">
                 <div >
                     <span>分组查询：</span>
                     <el-select v-model="group" :disabled="!$permission('/workspace/project/check')" clearable size="small" @change="onChange" style="width:200px">
@@ -45,7 +45,7 @@
             <div v-loading="loading">
                 <component :is="viewType" v-bind="$attrs" v-on="$listeners" :isOperate="isOperate" :tableData="dataList" :common-data="commonData" :group="group" :params="queryParams" :field="fieldList" @option="handleOption" @sort="handleSort"></component>
             </div>
-          <div class="pagination"  v-if="['可视化'].indexOf(isOperate) == -1">
+          <div class="pagination"  v-if="[2].indexOf(isOperate) == -1">
             <el-pagination
                 backgroundx
                 layout="total, prev, pager, next, jumper"
@@ -56,7 +56,7 @@
             </el-pagination>
           </div>
         </el-main>
-        <el-footer class="pagination" v-if="['可视化'].indexOf(isOperate) != -1 ">
+        <el-footer class="pagination" v-if="[2].indexOf(isOperate) != -1 ">
           <el-pagination
                 backgroundx
                 layout="total, prev, pager, next, jumper"
@@ -163,7 +163,7 @@ export default {
       this.commonData = response.data
     })
     //获取应用场景统计
-    if(['可视化'].indexOf(this.isOperate) == -1){
+    if([2].indexOf(this.isOperate) == -1){
       this.getScenarioAndTypeTotal();
     }
     

src/views/report/components/index.vue

@@ -6,7 +6,7 @@
               <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption"></mySearch>  
             </div>
             <div style="display:flex;">
-                <el-button-group style="display:flex;justify-content:flex-start" v-if="['可视化'].indexOf(isOperate) == -1">
+                <el-button-group style="display:flex;justify-content:flex-start" v-if="[2].indexOf(isOperate) == -1">
                     <el-button v-for="item in viewTypes" :key="item.component" size="small" :type="viewType == item.component ? 'primary' : ''"  @click="onChange2(item.component)" >{{item.name}}</el-button>
                 </el-button-group>
                 <el-dropdown size="small" style="margin-right:20px" v-if="$permission('/pcs/report/add')">
@@ -60,7 +60,7 @@ export default {
         //视图类型
         viewTypes:[
             {
-                name:'可视化',
+                name:2,
                 component:'visual'
             },
             {

src/views/report/components/view/table.vue

@@ -17,7 +17,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-if="['首页'].indexOf(isOperate) == -1" label="操作" align="center" width="150px">
+        <el-table-column v-if="[1].indexOf(isOperate) == -1" label="操作" align="center" width="150px">
         <template slot-scope="scope">
           <el-dropdown @command="handleCommand($event, scope.row)" split-button type="primary" size="small"  @click="handleCommand('e',scope.row)">
             <span v-if="$reportPermission(scope.row.id,[0,1])">编辑</span>

src/views/visual/components/drawer/eventDrawer.vue

@@ -2,7 +2,7 @@
     <div>
       <el-drawer class="custom-drawer-form" size="900px" :with-header="false" :visible.sync="drawer" direction="rtl" :before-close="close" destroy-on-close append-to-body>
           <div style="padding:10px;height:100%">
-            <questionIndex :applicationScenario="getQuestionId(params.scenarioName)" isOperate='可视化'></questionIndex>
+            <questionIndex :applicationScenario="getQuestionId(params.scenarioName)" :isOperate='2'></questionIndex>
           </div>
       </el-drawer>
     </div>

src/views/visual/components/drawer/titleDrawer.vue

@@ -5,7 +5,7 @@
               <el-tabs v-model="components">
                   <el-tab-pane v-for="item in menu" :key="item.components"  :label="item.name" :name="item.components"></el-tab-pane>
               </el-tabs>
-              <component :is='components' style="height:calc(100% - 50px);" isOperate='可视化'></component>
+              <component :is='components' style="height:calc(100% - 50px);" :isOperate='2'></component>
           </div>
           
       </el-drawer>