zhuxinbo 5 rokov pred
rodič
commit
5192554428

+ 5 - 1
src/mixins/JeecgListMixin.js

@@ -52,7 +52,11 @@ export const JeecgListMixin = {
     }
     }
   },
   },
   mounted() {
   mounted() {
-    this.loadData();
+    if(this.startList){
+
+    }else{
+       this.loadData();
+    }
     //初始化字典配置 在自己页面定义
     //初始化字典配置 在自己页面定义
     this.initDictConfig();
     this.initDictConfig();
   },
   },

+ 7 - 6
src/views/modules/advertiser/ProjectMemberList.vue

@@ -116,10 +116,10 @@
         >
         >
           <a-radio-group buttonStyle="solid" v-model="mode" @change="onChageLogin">
           <a-radio-group buttonStyle="solid" v-model="mode" @change="onChageLogin">
             <a-radio-button value="authorization">授权</a-radio-button>
             <a-radio-button value="authorization">授权</a-radio-button>
-            <a-radio-button value="login">登录</a-radio-button>
+            <!-- <a-radio-button value="login">登录</a-radio-button> -->
           </a-radio-group>
           </a-radio-group>
         </a-form-item>
         </a-form-item>
-
+        <!-- 
         <a-form-item
         <a-form-item
           label="账号:"
           label="账号:"
           :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
           :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
@@ -135,7 +135,7 @@
           v-show="mode == 'login'"
           v-show="mode == 'login'"
         >
         >
           <a-input type="password" v-model="password" placeholder="请输入密码" />
           <a-input type="password" v-model="password" placeholder="请输入密码" />
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item
         <a-form-item
           label="媒体:"
           label="媒体:"
           :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
           :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
@@ -153,8 +153,8 @@
         >
         >
           <a-radio-group buttonStyle="outline" v-model="systemType">
           <a-radio-group buttonStyle="outline" v-model="systemType">
             <a-radio-button value="不限">不限</a-radio-button>
             <a-radio-button value="不限">不限</a-radio-button>
-            <a-radio-button value="IOS">IOS</a-radio-button>
-            <a-radio-button value="安卓">安卓</a-radio-button>
+            <a-radio-button value="ios">ios</a-radio-button>
+            <a-radio-button value="android">android</a-radio-button>
             <a-radio-button value="4">其他</a-radio-button>
             <a-radio-button value="4">其他</a-radio-button>
           </a-radio-group>
           </a-radio-group>
           <a-input v-model="systemTypeName" v-if="systemType == '4'" placeholder="请输入系统类型" />
           <a-input v-model="systemTypeName" v-if="systemType == '4'" placeholder="请输入系统类型" />
@@ -518,11 +518,12 @@ export default {
     handleAdd() {},
     handleAdd() {},
     handleEdit(item) {
     handleEdit(item) {
       if (this.noTitleKey == 'myProject') {
       if (this.noTitleKey == 'myProject') {
+        console.log(item)
         this.title = item.projectName
         this.title = item.projectName
         this.projectId = item.id
         this.projectId = item.id
         this.getMemberList(item.id)
         this.getMemberList(item.id)
       } else {
       } else {
-        console.log(item)
+        this.loginType = item.mediaId == '1' ? 'bytedance' : 'kuaishou'
         this.record = item
         this.record = item
         this.visibleBind = true
         this.visibleBind = true
       }
       }

+ 3 - 3
src/views/modules/material/videoMaterial.vue

@@ -370,7 +370,6 @@ a {
                   {{ items.createTime | getDate }}
                   {{ items.createTime | getDate }}
                   <a
                   <a
                     href="javascript:;"
                     href="javascript:;"
-                    
                     style="margin-left:20px"
                     style="margin-left:20px"
                     @click="edit(items, '2')"
                     @click="edit(items, '2')"
                     v-show="active == '2'"
                     v-show="active == '2'"
@@ -964,7 +963,7 @@ export default {
       key: '0',
       key: '0',
       mediaId: null,
       mediaId: null,
       sizeType: [],
       sizeType: [],
-      size: 4,
+      size: null,
       repeat: false,
       repeat: false,
       excellent: 0,
       excellent: 0,
       code: '',
       code: '',
@@ -1234,7 +1233,6 @@ export default {
     showDetail(item) {
     showDetail(item) {
       this.visibleDetail = true
       this.visibleDetail = true
       this.showUrl = item.url
       this.showUrl = item.url
-
       this.id = item.id
       this.id = item.id
       this.code = item.code
       this.code = item.code
       this.excellent = item.excellent
       this.excellent = item.excellent
@@ -1253,6 +1251,8 @@ export default {
         materialId: item.id
         materialId: item.id
       }).then(res => {
       }).then(res => {
         this.detail = res
         this.detail = res
+        this.size =
+          res.parameter.width == '1080' ? 3 : res.parameter.width == '1920' ? 1 : res.parameter.width == '1280' ? 2 : 4
       })
       })
       getAction('/ctop/materialInfo/queryById', {
       getAction('/ctop/materialInfo/queryById', {
         id: item.id
         id: item.id

+ 130 - 0
src/views/modules/onlineTraining/onlineTrainingList.vue

@@ -0,0 +1,130 @@
+<style lang="scss" scoped>
+.search-box p {
+  display: inline-block;
+  border: 1px solid #f2f2f2;
+  border-radius: 5px;
+  margin-right: 10px;
+  padding: 5px 10px;
+  cursor: pointer;
+}
+</style>
+<template>
+  <a-row :gutter="10">
+    <a-col :sm="24" style="margin-bottom: 20px;z-index: 10">
+      <a-card class="search-box">
+        <p
+          :style="active == item.value ? 'color:cornflowerblue;background:#f2f2f2' : ''"
+          v-for="(item, index) of timeList"
+          :key="index"
+          @click="getAdd(item.value)"
+        >
+          {{ item.label }}
+        </p>
+      </a-card>
+    </a-col>
+    <a-col :sm="24" style="margin-bottom: 20px;z-index: 10">
+      <a-card class="search-box">
+        <div v-if="data.length > 0">
+          <a-list :grid="{ gutter: 16, column: 4 }" :dataSource="data">
+            <a-list-item slot="renderItem" slot-scope="item">
+              <a-card :title="item.title" @click="lookDetail(item)">时间</a-card>
+            </a-list-item>
+          </a-list>
+          <a-pagination
+            size="small"
+            :showTotal="ipagination.showTotal"
+            style="float:right"
+            v-if="dataSource.length > 0"
+            showQuickJumper
+            :pageSize.sync="ipagination.pageSize"
+            :total="ipagination.total"
+            v-model="ipagination.current"
+            @change="getDataSource"
+          />
+        </div>
+        <a-empty v-else />
+      </a-card>
+    </a-col>
+    <a-modal title="课程详情" v-model="visibleDetail" width="70%"> </a-modal>
+  </a-row>
+</template>
+
+<script>
+import { getAction } from '@/api/manage'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import moment from 'moment'
+import $ from 'jquery'
+
+export default {
+  name: 'online-training-list',
+  mixins: [JeecgListMixin],
+  data() {
+    return {
+      visibleDetail: false,
+      timeList: [
+        { label: '分类1', value: 1, show: true },
+        { label: '分类2', value: 2, show: true },
+        { label: '分类3', value: 3, show: true },
+        { label: '分类4', value: 4, show: true },
+        { label: '分类5', value: 5, show: true },
+        { label: '分类6', value: 6, show: true },
+        { label: '分类7', value: 7, show: true },
+        { label: '分类8', value: 8, show: true }
+      ],
+      active: 1,
+      data: [
+        {
+          title: '素材库-脚本库视频'
+        },
+        {
+          title: '素材库-脚本库文档'
+        },
+        {
+          title: '素材库-视频库操作视频'
+        },
+        {
+          title: '素材库-视频库操作文档'
+        }
+      ],
+      url: {
+        list: '/ctop/materialInfo/list'
+      },
+      startList: true
+    }
+  },
+  components: {},
+  methods: {
+    getDataSource(page, pageSize) {
+      this.ipagination.current = page
+      this.loadData()
+    },
+    getAdd(checked) {
+      this.active = checked
+      if (checked == 5) {
+        this.data = []
+      } else {
+        this.data = [
+          {
+            title: 'Title 1'
+          },
+          {
+            title: 'Title 2'
+          },
+          {
+            title: 'Title 3'
+          },
+          {
+            title: 'Title 4'
+          }
+        ]
+      }
+    },
+    lookDetail(item) {
+      this.visibleDetail = true
+    }
+  },
+  created() {
+    //   /modules/onlineTraining/onlineTrainingList
+  }
+}
+</script>

+ 2 - 2
vue.config.js

@@ -65,8 +65,8 @@ module.exports = {
        },*/
        },*/
       '/jeecg-boot': {
       '/jeecg-boot': {
         // target: 'http://39.97.120.42:8080', //请求本地 需要jeecg-boot后台项目  生产环境
         // target: 'http://39.97.120.42:8080', //请求本地 需要jeecg-boot后台项目  生产环境
-        // target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
-        target: 'http://192.168.2.118:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
+        // target: 'http://192.168.2.118:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.2.110:8080', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.110:8080', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.132:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.2.132:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云