Merge branch 'hezhihong修复bug'

# Conflicts:
#	src/views/GARDENBASEDATA/index.vue

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -67,8 +67,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="企业贸易绩效数据" align="center" prop="id">
       </el-table-column>
-      <el-table-column label="部门id" align="center" prop="deptId">
-      </el-table-column>
+      <!-- <el-table-column label="部门id" align="center" prop="deptId">
+      </el-table-column> -->
       <el-table-column label="部门名称" align="center" prop="deptName">
       </el-table-column>
       <el-table-column label="规模以上工业产值" align="center" prop="gmysgycz">

src/views/FRIENDLYLINKS/index.vue

@@ -81,6 +81,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      linkNames: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -165,6 +166,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id);
+      this.linkNames = selection.map(item => item.linkName);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -217,9 +219,10 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
+      const linkNames = row.linkName || this.linkNames;
       this.$modal
         // .confirm('是否确认删除友情链接编号为"' + ids + '"的数据项？')
-        .confirm(`是否确认删除友情链接编号为【${ids}】;链接名称为【${row.linkName}】的数据项？`)
+        .confirm(`是否确认删除友情链接编号为【${ids}】;链接名称为【${linkNames}】的数据项？`)
         .then(function () {
           return delFRIENDLYLINKS(ids);
         })

src/views/IMPORTANTPROJECT/index.vue

@@ -80,11 +80,11 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="重点项目数据	主键" align="center" prop="id">
+      <!-- <el-table-column label="重点项目数据	主键" align="center" prop="id"> -->
         <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.id"/>
         </template> -->
-      </el-table-column>
+      <!-- </el-table-column> -->
       <el-table-column label="项目名称 " align="center" prop="xmmc">
         <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.xmmc"/>
@@ -149,16 +149,17 @@
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateBy"/>
         </template> -->
       </el-table-column>
-      <el-table-column label="部门主键" align="center" prop="deptId">
+      <!-- <el-table-column label="部门主键" align="center" prop="deptId"> -->
         <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.deptId"/>
         </template> -->
-      </el-table-column>
+      <!-- </el-table-column> -->
       <el-table-column
         fixed="right"
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="130"
       >
         <template slot-scope="scope">
           <el-button