Merge remote-tracking branch 'origin/master'

dsk-operate-ui/src/views/detail/party-a/opport/landtransaction.vue

@@ -53,10 +53,10 @@ export default {
         {label: '行业分类', prop: 'industry', width: '100'},
         {label: '供地方式', prop: 'supplyLandWay', width: '100'},
         {label: '土地坐落', prop: 'landAddr', minWidth: '130'},
-        {label: '成交金额（万元）', prop: 'transactionPrice', sortable: 'custom', descending: '3', ascending: '4', width: '140'},
+        {label: '成交金额（万元）', prop: 'transactionPrice', sortable: 'custom', descending: '1', ascending: '2', width: '140'},
         {label: '总面积（㎡）', prop: 'acreage', sortable: 'custom', descending: '11', ascending: '12', width: '130'},
         {label: '批准单位', prop: 'authority', width: '130'},
-        {label: '签订日期', prop: 'contractSignTime', sortable: 'custom', descending: '1', ascending: '2', width: '130'}
+        {label: '签订日期', prop: 'contractSignTime', sortable: 'custom', descending: '3', ascending: '4', width: '130'}
       ],
       formData: [
         { type: 4, fieldName: 'landUse', value: '', placeholder: '土地用途', options: []},

dsk-operate-ui/src/views/detail/party-b/index.vue

@@ -21,7 +21,8 @@ export default {
   created() {
     if (this.$route.params.id) { // 获取companyId
       this.loading = true
-      this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
+      // this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
+      this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
     }
   },
   mounted() {