Merge remote-tracking branch 'origin/master'

src/views/poster/PosterList.vue

@@ -107,6 +107,7 @@
                 },
                 },
                 columns: [
                 columns: [
                     {dataIndex: 'picture', title: '图片 ', scopedSlots: {customRender: 'picture'}},
                     {dataIndex: 'picture', title: '图片 ', scopedSlots: {customRender: 'picture'}},
+                    {dataIndex: 'createName', width: 100, title: '创建人'},
                     {dataIndex: 'createTime', width: 100, title: '创建时间 ', scopedSlots: {customRender: 'createTime'}},
                     {dataIndex: 'createTime', width: 100, title: '创建时间 ', scopedSlots: {customRender: 'createTime'}},
                     {dataIndex: 'enable', width: 50, title: '启用状态', scopedSlots: {customRender: 'enable'}},
                     {dataIndex: 'enable', width: 50, title: '启用状态', scopedSlots: {customRender: 'enable'}},
                     {
                     {

src/views/poster/newPoster.vue

@@ -5,13 +5,13 @@
     :closable="true"
     :closable="true"
     :visible="visible"
     :visible="visible"
     @close="onClose"
     @close="onClose"
-    width="100%"
+    width="50%"
     :bodyStyle="{'padding':0}"
     :bodyStyle="{'padding':0}"
     destroyOnClose
     destroyOnClose
   >
   >
     <div class="meun-box">
     <div class="meun-box">
       <a-row>
       <a-row>
-        <a-col :span="6">
+        <a-col :span="3">
          <!-- <div class="select-btn">
          <!-- <div class="select-btn">
             <span>选择图片</span>
             <span>选择图片</span>
             <input ref="selectImgae" class="seletImg" type="file" @change="selectImage" />
             <input ref="selectImgae" class="seletImg" type="file" @change="selectImage" />
@@ -25,7 +25,7 @@
             <a-input v-model="codeText"></a-input>
             <a-input v-model="codeText"></a-input>
           </a-form-item>
           </a-form-item>
         </a-col>
         </a-col>
-        <a-col :span="6" v-if="images!=''">
+        <a-col :span="9" v-if="images!=''">
           <a-form-item label="二维码大小：" :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
           <a-form-item label="二维码大小：" :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
             <a-slider id="code" v-model="codeWidth" :max="300" />
             <a-slider id="code" v-model="codeWidth" :max="300" />
           </a-form-item>
           </a-form-item>

src/views/school-center/hhr-report/hhrReport.vue

@@ -88,18 +88,18 @@ export default {
             {
             {
               title: "新增",
               title: "新增",
               children: [
               children: [
-                { dataIndex: "newUserNumWeek", width: 80, title: "新用户" },
-                { dataIndex: "newAloneNumWeek", width: 80, title: "单宽带" },
-                { dataIndex: "newMixNumWeek", width: 80, title: "融合宽带" }
+                { dataIndex: "newUserNumWeek", width: 80,title: "新用户" },
+                { dataIndex: "newAloneNumWeek",width: 80, title: "单宽带" },
+                { dataIndex: "newMixNumWeek", width: 80,title: "融合宽带" }
               ]
               ]
             },
             },
             {
             {
               title: "存量",
               title: "存量",
               children: [
               children: [
-                { dataIndex: "oldUserNumWeek", width: 80, title: "老用户办理" },
+                { dataIndex: "oldUserNumWeek",width: 100, title: "老用户办理" },
                 {
                 {
                   dataIndex: "oldContinueNumWeek",
                   dataIndex: "oldContinueNumWeek",
-                  width: 80,
+                  width: 100,
                   title: "老用户续约"
                   title: "老用户续约"
                 }
                 }
               ]
               ]
@@ -107,11 +107,11 @@ export default {
             {
             {
               title: "已竣工",
               title: "已竣工",
               children: [
               children: [
-                { dataIndex: "finishNewNumWeek", width: 80, title: "新增" },
-                { dataIndex: "finishOldNumWeek", width: 80, title: "存量" }
+                { dataIndex: "finishNewNumWeek",width: 80, title: "新增" },
+                { dataIndex: "finishOldNumWeek", width: 80,title: "存量" }
               ]
               ]
             },
             },
-            { dataIndex: "sumWeek", width: 80, title: "总计" }
+            { dataIndex: "sumWeek", width: 80,title: "总计" }
           ]
           ]
         },
         },
         {
         {
@@ -120,9 +120,9 @@ export default {
             {
             {
               title: "新增",
               title: "新增",
               children: [
               children: [
-                { dataIndex: "newUserNumMonth", width: 80, title: "新用户" },
-                { dataIndex: "newAloneNumMonth", width: 80, title: "单宽带" },
-                { dataIndex: "newMixNumMonth", width: 80, title: "融合宽带" }
+                { dataIndex: "newUserNumMonth",width: 80, title: "新用户" },
+                { dataIndex: "newAloneNumMonth", width: 80,title: "单宽带" },
+                { dataIndex: "newMixNumMonth",width: 80, title: "融合宽带" }
               ]
               ]
             },
             },
             {
             {
@@ -130,12 +130,12 @@ export default {
               children: [
               children: [
                 {
                 {
                   dataIndex: "oldUserNumMonth",
                   dataIndex: "oldUserNumMonth",
-                  width: 80,
+                  width: 100,
                   title: "老用户办理"
                   title: "老用户办理"
                 },
                 },
                 {
                 {
                   dataIndex: "oldContinueNumMonth",
                   dataIndex: "oldContinueNumMonth",
-                  width: 80,
+                  width: 100,
                   title: "老用户续约"
                   title: "老用户续约"
                 }
                 }
               ]
               ]
@@ -143,11 +143,11 @@ export default {
             {
             {
               title: "已竣工",
               title: "已竣工",
               children: [
               children: [
-                { dataIndex: "finishNewNumMonth", width: 80, title: "新增" },
-                { dataIndex: "finishOldNumMonth", width: 80, title: "存量" }
+                { dataIndex: "finishNewNumMonth",width: 80, title: "新增" },
+                { dataIndex: "finishOldNumMonth",width: 80, title: "存量" }
               ]
               ]
             },
             },
-            { dataIndex: "sumMonth", width: 80, title: "总计" }
+            { dataIndex: "sumMonth", width: 80,title: "总计" }
           ]
           ]
         },
         },
         {
         {
@@ -156,18 +156,18 @@ export default {
             {
             {
               title: "新增",
               title: "新增",
               children: [
               children: [
-                { dataIndex: "newUserNumAll", width: 80, title: "新用户" },
-                { dataIndex: "newAloneNumAll", width: 80, title: "单宽带" },
-                { dataIndex: "newMixNumAll", width: 80, title: "融合宽带" }
+                { dataIndex: "newUserNumAll",width: 80, title: "新用户" },
+                { dataIndex: "newAloneNumAll",width: 80, title: "单宽带" },
+                { dataIndex: "newMixNumAll",width: 80, title: "融合宽带" }
               ]
               ]
             },
             },
             {
             {
               title: "存量",
               title: "存量",
               children: [
               children: [
-                { dataIndex: "oldUserNumAll", width: 80, title: "老用户办理" },
+                { dataIndex: "oldUserNumAll",width: 100, title: "老用户办理" },
                 {
                 {
                   dataIndex: "oldContinueNumAll",
                   dataIndex: "oldContinueNumAll",
-                  width: 80,
+                  width: 100,
                   title: "老用户续约"
                   title: "老用户续约"
                 }
                 }
               ]
               ]
@@ -175,11 +175,11 @@ export default {
             {
             {
               title: "已竣工",
               title: "已竣工",
               children: [
               children: [
-                { dataIndex: "finishNewNumAll", width: 80, title: "新增" },
-                { dataIndex: "finishOldNumAll", width: 80, title: "存量" }
+                { dataIndex: "finishNewNumAll", width: 80,title: "新增" },
+                { dataIndex: "finishOldNumAll",width: 80, title: "存量" }
               ]
               ]
             },
             },
-            { dataIndex: "sumAll", width: 80, title: "总计" }
+            { dataIndex: "sumAll",width: 80, title: "总计" }
           ]
           ]
         }
         }
       ],
       ],