Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-operate-ui/src/views/detail/party-a/business/component/elCardinput.vue

@@ -51,5 +51,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.noborder{
+  margin-bottom: 0;
+}
 </style>

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -98,7 +98,7 @@
       @sort-change="sortChange"
     >
       <template slot="companyName" slot-scope="scope">
-        <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName " v-html="scope.row.companyName"></router-link>
+        <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName " v-html="scope.row.companyName"></router-link>
         <div v-else v-html="scope.row.companyName  || '--'"></div>
       </template>
       <template slot="area" slot-scope="scope">

dsk-operate-ui/src/views/project/projectList/component/lxr.vue

@@ -7,7 +7,7 @@
           :data="tableData"
           stripe border
           style="width: 100%"
-          :default-sort = "{prop: 'date', order: 'descending'}"
+          :default-sort = "{prop: 'role', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">

dsk-operate-ui/src/views/project/projectList/component/xgqy.vue

@@ -17,6 +17,7 @@
         <el-table
           :data="tableData.rows"
           style="width: 100%"
+          :default-sort = "{prop: 'depth', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">

dsk-operate-ui/src/views/project/projectList/component/zlwd.vue

@@ -60,6 +60,7 @@
         <el-table
           :data="fileDatas.rows"
           style="width: 100%"
+          :default-sort = "{prop: 'creatTime', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">