Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into joke

@@ -47,15 +47,15 @@
                             <i class="iconfont icon-icon--download"></i>
                             <i class="iconfont icon-icon--download"></i>
                             下载
                             下载
                         </el-button>
                         </el-button>
-<!--                        <el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="canAddFolder && !isRecycle">-->
-<!--                            <i class="iconfont icon-weidaqiadewenjianjia"></i>-->
-<!--                            新增文件夹-->
-<!--                        </el-button>-->
+                        <el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="!isView & canAddFolder && !isRecycle">
+                            <i class="iconfont icon-weidaqiadewenjianjia"></i>
+                            新增文件夹
+                        </el-button>
                         <el-button type="primary" :size="$global.elementSize" @click="showUploadFile(true)" v-if=" !isRecycle">
                         <el-button type="primary" :size="$global.elementSize" @click="showUploadFile(true)" v-if=" !isRecycle">
                             <i class="iconfont icon-icon--shangchuan"></i>
                             <i class="iconfont icon-icon--shangchuan"></i>
                             上传
                             上传
                         </el-button>
                         </el-button>
-                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')"  v-if="isRecycle">
+                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')" v-if="!isView">
                             <i class="iconfont icon-shanchuwenjianjia"></i>
                             <i class="iconfont icon-shanchuwenjianjia"></i>
                             删除
                             删除
                         </el-button>
                         </el-button>

@@ -114,8 +114,8 @@ body{
     display: inline-block;
     display: inline-block;
     background-size: 100%;
     background-size: 100%;
     background-position: center;
     background-position: center;
-    width: 14px;
-    height: 14px;
+    width: 12px;
+    height: 12px;
 }
 }
 .button-flex-div-center span{
 .button-flex-div-center span{
     display: flex;
     display: flex;
@@ -145,9 +145,15 @@ body{
 .icon-list-net{
 .icon-list-net{
     background-image: url("/vue3/src/assets/images/analysis/icon-list-net.png");
     background-image: url("/vue3/src/assets/images/analysis/icon-list-net.png");
 }
 }
+.icon-list-add{
+    background-image: url("/vue3/src/assets/images/analysis/icon-list-add.png");
+}
 .search-text{
 .search-text{
     cursor: pointer;
     cursor: pointer;
 }
 }
+.list-search .search-text{
+    margin-left:10px;
+}
 .alert-div{
 .alert-div{
     position:absolute;
     position:absolute;
     top:0;
     top:0;
@@ -167,3 +173,7 @@ body{
     padding: 5px 10px;
     padding: 5px 10px;
     z-index: 1;
     z-index: 1;
 }
 }
+.list-handle{
+    display: flex;
+    justify-content: center;
+}

@@ -18,8 +18,9 @@
     background-image: url("/vue3/src/assets/images/zjdp/declare-title.png");
     background-image: url("/vue3/src/assets/images/zjdp/declare-title.png");
     background-position: center;
     background-position: center;
     background-repeat: no-repeat;
     background-repeat: no-repeat;
-    margin-top:15px;
     height: 53px;
     height: 53px;
+    background-size: 100%;
+    flex:1;
 }
 }
 .total-title{
 .total-title{
     margin-right: 10px;
     margin-right: 10px;
@@ -109,3 +110,15 @@
 .num-net{
 .num-net{
     color:#e5abd1;
     color:#e5abd1;
 }
 }
+.jump{
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-top: 15px;
+}
+.img-link{
+    /*width: 42px;*/
+    height: 47px;
+    margin-right:2px;
+    cursor: pointer;
+}

@@ -16,28 +16,33 @@
             <el-col :span="6">
             <el-col :span="6">
                 <div class="search-input flex-div-start">
                 <div class="search-input flex-div-start">
                     <el-input v-model="inputSearch" placeholder="请输入创建人名称" />
                     <el-input v-model="inputSearch" placeholder="请输入创建人名称" />
-                    <span class="search-text" @click="searchData">搜索</span>
+<!--                    <span class="search-text" >搜索</span>-->
+                    <el-button type="primary" @click="searchData" class="search-text button-flex-div-center">搜索</el-button>
+
                 </div>
                 </div>
 
 
             </el-col>
             </el-col>
         </el-row>
         </el-row>
-       <!-- <el-row class="list-title">
+        <el-row class="list-title">
             <el-col :span="24" class="text-left">
             <el-col :span="24" class="text-left">
-                <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-add"></i>新增</el-button>
-                <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>
+                <router-link :to="'/analysis/add'" class="analysis link-type">
+                    <el-button type="primary" class="button-flex-div-center"><i class="el-icon-plus"></i>新增</el-button>
+                </router-link>
+
+                <!-- <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>-->
             </el-col>
             </el-col>
-        </el-row>-->
+        </el-row>
         <el-row class="analysis-table-div">
         <el-row class="analysis-table-div">
             <el-col :span="24">
             <el-col :span="24">
                 <el-table border ref="multipleTable"  @selection-change="handleSelectionChange" :data="tableData" stripe style="width: 100%">
                 <el-table border ref="multipleTable"  @selection-change="handleSelectionChange" :data="tableData" stripe style="width: 100%">
 <!--                    <el-table-column align="center"  type="selection" width="55" />-->
 <!--                    <el-table-column align="center"  type="selection" width="55" />-->
-                    <el-table-column prop="configName"  align="center" label="配置项名称" sortable  width="180" />
-                    <el-table-column prop="configDepict" label="配置项描述" sortable  width="180" />
-                    <el-table-column prop="timeScopeName" label="时间范围" sortable width="180"  ></el-table-column>
-                    <el-table-column align="center" prop="nickname" label="创建人名称" sortable  width="180" />
-                    <el-table-column align="center" prop="createTime"  :formatter="dateFormat" label="创建时间" sortable  width="210" />
+                    <el-table-column prop="configName"  align="center" label="配置项名称" sortable  />
+                    <el-table-column prop="configDepict" align="center"  label="配置项描述" sortable  />
+                    <el-table-column prop="timeScopeName" align="center"  label="时间范围" sortable  ></el-table-column>
+                    <el-table-column align="center" prop="nickname" label="创建人名称" sortable  />
+                    <el-table-column align="center" prop="createTime"  :formatter="dateFormat" label="创建时间" sortable />
 
 
-                    <el-table-column prop="address" label="操作" >
+                    <el-table-column prop="address" align="center"  label="操作"width="180" >
                         <template #default="scope">
                         <template #default="scope">
                             <div class="list-handle">
                             <div class="list-handle">
                                 <span class="icon-bg">
                                 <span class="icon-bg">

 <div class="declare-container" id="declare">
 <div class="declare-container" id="declare">
     <!--今日申报-->
     <!--今日申报-->
     <div class="declare-left">
     <div class="declare-left">
+        <div class="jump">
+            <img @click="goJump" src="/vue3/src/assets/images/zjdp/icon-link.png"  class="img-link">
             <div class="declare-total">
             <div class="declare-total">
                 <span class="total-title">本月应申报</span>
                 <span class="total-title">本月应申报</span>
                 <span class="total-num">{{reportable}}</span>
                 <span class="total-num">{{reportable}}</span>
             </div>
             </div>
+        </div>
+       
         <div class="declaration-rate">
         <div class="declaration-rate">
             <span class="rate-title">本月申报率</span>
             <span class="rate-title">本月申报率</span>
             <span class="proportion-bar">
             <span class="proportion-bar">

@@ -180,12 +180,16 @@ export default {
                 return intPartFormat
                 return intPartFormat
             }
             }
         }
         }
+        const goJump=()=>{
+            proxy.$router.push({path:'/zj/dp',query: {access_token:localStorage.getItem('access_token')}})
+        }
 
 
         return{
         return{
             numberFilter,
             numberFilter,
             eleWidthNum,
             eleWidthNum,
             getDeclareData,
             getDeclareData,
-            startInterval
+            startInterval,
+            goJump
         }
         }
     },
     },
     unmounted () {
     unmounted () {