7

5 years ago · 979823a4c6
11 changed files with 45 additions and 65 deletions
--- a/src/common/platform.styl
+++ b/src/common/platform.styl
@ -67,7 +67,7 @@
  // height: 830px;
  overflow: hidden;
  position: relative;
-  padding: 0 9%;
+  // padding: 0 9%;
 }
 .bottom-title {
  position: absolute;
@ -78,8 +78,8 @@
 .bottom-content {
  position: relative;
  float: right;
-  margin: 40px 0;
-  width: 79%;
+  margin: 1rem 0;
+  width: 100%;
 }

 .partner-box {
--- a/src/components/Introduce/RichText.vue
+++ b/src/components/Introduce/RichText.vue
@ -8,7 +8,7 @@
  <div>
    <div class="words-content">
      <span
-        class="font-16 textColor line-height-36"
+        class="font-16 textColor line-height-26"
        v-dompurify-html="content"
        v-if="titleCode === title"
      ></span>
--- a/src/views/About/Children/Introduce.vue
+++ b/src/views/About/Children/Introduce.vue
@ -62,9 +62,7 @@ export default {
 </script>

 <style lang="stylus" scoped>
-.inner {
-  margin: 40px auto;
-}
+
 .inner-x{
  margin auto 1rem
 }
--- a/src/views/About/Children/Organ.vue
+++ b/src/views/About/Children/Organ.vue
@ -8,7 +8,7 @@
    <div class="">
      <div class="white">
        <!-- <rich-text :title="title" /> -->
-        <div :style="{ height: '550px' }" style="width:100%" id="treeChart"></div>
+        <div :style="{ height: '750px' }" style="width:100%" id="treeChart"></div>
      </div>
    </div>
  </div>
@ -91,18 +91,20 @@ export default {
          {
            type: 'tree',
            data: this.treedata,
-            top: '-5%',
+            top: '15%',
            left: '5%',
-            bottom: '0%',
-            right: '30%',
+            bottom: '30%',
+            right: '10%',
            symbolSize: 7,
+            orient: 'vertical',
            lineStyle: { width: 1 },
            itemStyle: { borderWidth: 3, borderColor: '#AACD06' },
-            label: { position: 'top', verticalAlign: 'middle', align: 'center', fontSize: 16 },
+            label: { position: 'top', verticalAlign: 'middle', align: 'center', rotate: -90,fontSize: 16 },
            leaves: {
              label: {
                position: 'right',
                verticalAlign: 'middle',
+                rotate: -90,
                align: 'left',
              },
            },
--- a/src/views/Activity/Activity.vue
+++ b/src/views/Activity/Activity.vue
@ -13,7 +13,7 @@
        class="search"
        enter-button
        placeholder="请输入..."
-        style="width: 22rem"
+        style="width: 90%"
        v-model="iptCon"
      />

--- a/src/views/Community/Community.vue
+++ b/src/views/Community/Community.vue
@ -19,7 +19,7 @@
          class="search"
          enter-button
          placeholder="请输入..."
-          style="width: 16rem"
+          style="width: 60%"
          v-model="iptCon"
        />
      </div> 
--- a/src/views/Community/Posting.vue
+++ b/src/views/Community/Posting.vue
@ -121,7 +121,7 @@ export default {

 <style lang="stylus" >
 .wrap {
-  width: 1260px;
+  width: 90%;
  min-height: 1037px;
  margin: 80px auto 28px auto;
  overflow: hidden;
@ -129,7 +129,7 @@ export default {
 }

 .ql-editor {
-  min-height: 600px;
-  max-height: 800px;
+  min-height: 400px;
+  max-height: 600px;
 }
 </style>
--- a/src/views/IncubationPlatform/Children/Services.vue
+++ b/src/views/IncubationPlatform/Children/Services.vue
@ -65,7 +65,7 @@
      @cancel="handleCancel"
      @ok="handleOk"
      title="技术需求"
-      width="80%"
+      width="85%"
    >
      <a-form :form="form">
        <a-form-item
--- a/src/views/Industry/Children/Serve.vue
+++ b/src/views/Industry/Children/Serve.vue
@ -56,7 +56,7 @@
      @cancel="handleCancel"
      @ok="handleOk"
      title="技术需求"
-      width="70%"
+      width="85%"
    >
      <a-form :form="form">
        <a-form-item
--- a/src/views/NewPlatform/Children/Core.vue
+++ b/src/views/NewPlatform/Children/Core.vue
@ -16,53 +16,24 @@
        <!-- </div> -->
      </div>
    </div>
-    <!-- <div class="center-box">
-      <div class="center-title">
-        <div class="circular"></div>
-        <div style="margin-left: 40px">组织机构</div>
-      </div>
-      <div class="center-content">
-        <rich-text :title="title1" />
-      </div>
-    </div>-->
+
    <div class="bottom-box white">
      <div class="bottom-title">
        <div class="circular"></div>
        <div style="margin-left: 40px">中心架构</div>
      </div>
      <div class="bottom-content">
-        <div :style="{ height: '500px' }" id="treeChart"></div>
-        <div class="absolute-box" style="top: 2.5%" v-if="showDiv">
+        <div :style="{ height: '800px' }" id="treeChart"></div>
+        <div v-if="showDiv">
          <div class="case"></div>
-          <div class="d-flex flex-column">
-            <div class="mb-8">科技资源共享服务平台</div>
-            <div class="mb-8">知识产权与技术转移转化服务平台</div>
-            <div>知识培训与科技人才服务平台</div>
-          </div>
+          <div class="d-flex flex-row-reverse">
+            <div class="mr-2 mt-3">科技资源共享服务平台</div>
+            <div class="mr-2 mt-3">知识产权与技术转移转化服务平台</div>
+            <div class="mt-3">知识培训与科技人才服务平台</div>
          </div>
        </div>
      </div>
-    <!-- <div class="partner-box">
-      <div class="partner-title">
-        <div class="circular"></div>
-        <div style="margin-left: 40px">合作伙伴</div>
-      </div>
-      <div class="partner-content">
-        <de-ent />
    </div>
-    </div>-->
-    <!-- <div class="join-box">
-      <div class="join-title">
-        <div class="circular"></div>
-        <div style="margin-left: 40px">申请加入</div>
-      </div>
-      <div class="join-content">
-        申请加入
-        <div>
-          <new-model />
-        </div>
-      </div>
-    </div>-->
  </div>
 </template>

@ -157,15 +128,17 @@ export default {
          {
            type: 'tree',
            data: this.treedata,
-            top: '2%',
+            top: '12%',
            left: '6%',
-            bottom: '1%',
-            right: '40%',
+            bottom: '20%',
+            right: '6%',
+            orient: 'vertical',
            symbolSize: 7,
            lineStyle: { width: 1 },
            itemStyle: { borderWidth: 3, borderColor: '#AACD06' },
            label: {
              position: 'top',
+              rotate: -90,
              verticalAlign: 'middle',
              align: 'center',
              fontSize: 16,
@ -174,6 +147,7 @@ export default {
              label: {
                position: 'right',
                verticalAlign: 'middle',
+                rotate: -90,
                align: 'left',
              },
            },
--- a/src/views/Policy/components/PolicyList.vue
+++ b/src/views/Policy/components/PolicyList.vue
@ -11,7 +11,7 @@
      <a-input-group class="search" compact style="margin: auto 1rem">
        <a-select
          @change="changeCode"
-          style="width: 5rem; height: 40px"
+          style="width:20%"
          v-model="pStatus.policyText[pStatus.value - 1]"
        >
          <a-select-option value="1">标题</a-select-option>
@ -22,15 +22,21 @@
          @search="getPolicy"
          enter-button
          placeholder="请输入..."
-          style="width: 60%"
+          style="width: 45%"
          v-model="pStatus.iptCon"
        />
      </a-input-group>
      <span>
+        <div class="mt-5">
            <a-checkbox :checked="pStatus.bw - 0 === 1" @click="changeStatus('bw')">国家</a-checkbox>
            <a-checkbox :checked="pStatus.sx - 0 === 1" @click="changeStatus('sx')">山西省</a-checkbox>
+        </div>
+        <div>
          <a-checkbox :checked="pStatus.zg - 0 === 1" @click="changeStatus('zg')">山西省综改区</a-checkbox>
          <a-checkbox :checked="pStatus.ty - 0 === 1" @click="changeStatus('ty')">太原市</a-checkbox>
+        </div>
+      
+      
      </span>
      
    </div>
@ -187,7 +193,7 @@ export default {

 .search-list {
  height: 6.5em;
-  line-height: 72px;
+  line-height: 1rem;
  background: #fff;
  padding: 0 24px;
  position: relative;