Merge branch 'master-v32-lushangqing' into 'master'

对比分析增加新增按钮及样式修改



See merge request !129

@@ -114,8 +114,8 @@ body{
     display: inline-block;
     background-size: 100%;
     background-position: center;
-    width: 14px;
-    height: 14px;
+    width: 12px;
+    height: 12px;
 }
 .button-flex-div-center span{
     display: flex;
@@ -145,9 +145,15 @@ body{
 .icon-list-net{
     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{
     cursor: pointer;
 }
+.list-search .search-text{
+    margin-left:10px;
+}
 .alert-div{
     position:absolute;
     top:0;
@@ -167,3 +173,7 @@ body{
     padding: 5px 10px;
     z-index: 1;
 }
+.list-handle{
+    display: flex;
+    justify-content: center;
+}
\ No newline at end of file

@@ -16,28 +16,33 @@
             <el-col :span="6">
                 <div class="search-input flex-div-start">
                     <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>
 
             </el-col>
         </el-row>
-       <!-- <el-row class="list-title">
+        <el-row class="list-title">
             <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-row>-->
+        </el-row>
         <el-row class="analysis-table-div">
             <el-col :span="24">
                 <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 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">
                             <div class="list-handle">
                                 <span class="icon-bg">