Merge branch 'dev' into yhkp

# Conflicts:
#	src/components/OutSourced/index.vue

src/components/OutSourced/index.vue

@@ -41,23 +41,17 @@
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="CORP_NAME" label="公司名称" show-overflow-tooltip />
       <el-table-column prop="STARTTIME" label="属地" show-overflow-tooltip>
+        <template slot-scope="{row}"/>
         <template slot-scope="{row}">
-          <span v-if="row.CORPINFO_ID != '1'">
+          <span v-if="row.CORPINFO_ID !='1'">
             {{ row.prvinceName }} -- {{ row.cityName }} -- {{ row.countryName }}
           </span>
           <span v-else>
-            河北省-秦皇岛市-海港区
+            河北省 -- 秦皇岛市 -- 海港区
           </span>
         </template>
       </el-table-column>
-      <el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip >
+      <el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip />
-        <template slot-scope="{row}">
-          <span v-if="row.CORPINFO_ID != '1'">
-            {{ row.INDUSTRY_NAME }}
-          </span>
-          <span v-else>交通运输、仓储和邮政业</span>
-        </template>
-      </el-table-column>
       <el-table-column prop="OUTSOURCED_COUNT" label="包含重点工程数" />
       <el-table-column label="操作" align="center" width="100">
         <template slot-scope="{row}">
@@ -85,6 +79,7 @@ export default {
       type: String,
       default: ''
     }
+
   },
   data() {
     return {

src/views/BI/index.vue

@@ -1056,8 +1056,8 @@ export default {
             labelLine: {
               normal: {
                 show: true,
-                length: 15,
+                length: 10,
-                length2: 15
+                length2: 10
               }
             },
             label: {