Pārlūkot izejas kodu

提交导入表格

zhuxinbo 5 gadi atpakaļ
vecāks
revīzija
0e4945e321

+ 1 - 1
public/index.html

@@ -270,7 +270,7 @@
   <!-- 全局配置 -->
   <script>
     window._CONFIG = {};
-    window._CONFIG['domianURL'] = 'http://localhost:8080/jeecg-boot';
+    window._CONFIG['domianURL'] = 'http://192.168.2.109:8080/jeecg-boot';
     window._CONFIG['imgDomainURL'] = 'http://localhost:8080/jeecg-boot/sys/common/view';
     window._CONFIG['pdfDomainURL'] = 'http://localhost:8080/jeecg-boot/sys/common/pdf/pdfPreviewIframe';
   </script>

+ 137 - 67
src/views/modules/material/scriptMaterial.vue

@@ -33,6 +33,9 @@
 }
 </style>
 <style lang="scss" scoped>
+.script-style span {
+  display: block;
+}
 .home-item {
   overflow: hidden;
 }
@@ -243,7 +246,14 @@ a {
     <div v-else style="width:100%;height:400px;display:flex;justify-content: center;align-items: center;">
       <a-empty />
     </div>
-    <a-modal :title="add ? '添加素材' : '修改'" v-model="visible" :maskClosable="false" :width="800">
+    <a-modal
+      :title="add ? '添加素材' : '修改'"
+      v-model="visible"
+      @cancel="close"
+      @afterClose="close"
+      :maskClosable="false"
+      :width="800"
+    >
       <template slot="footer">
         <a-button key="back" @click="close">取消</a-button>
         <a-button key="submit" type="primary" @click="handleOk">
@@ -377,6 +387,8 @@ a {
         <a-list-item slot="renderItem" slot-scope="item, index" v-if="item.author == '情节描述'" id="only-des">
           <a-comment :author="item.author">
             <p slot="content">
+              <span v-if="item.plainSeq">顺序类型:{{ item.plainSeq | plainSeqName }}</span
+              ><br />
               <span v-if="item.content">描述:{{ item.content }}</span
               ><br />
               <span v-if="item.scene" style="margin-right:15px">镜头:{{ item.scene }}</span
@@ -393,6 +405,8 @@ a {
         <a-list-item slot="renderItem" slot-scope="item" v-else>
           <a-comment :avatar="item.avatar">
             <p slot="author">
+              <span v-if="item.plainSeq">顺序类型:{{ item.plainSeq | plainSeqName }}</span
+              ><br />
               <span v-if="item.scene" style="margin-right:15px">镜头:{{ item.scene }}</span
               ><br />
               <span v-if="item.picContent" style="margin-right:15px">画面内容:{{ item.picContent }}</span
@@ -419,11 +433,23 @@ a {
             label="排序"
             :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
             :wrapper-col="{ xs: { span: 24 }, sm: { span: 17 } }"
-            v-if="editScript"
+            v-if="scriptEdit"
           >
             <a-input v-model="rank"></a-input>
           </a-form-item>
           <a-form-item
+            label="顺序类型"
+            :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
+            :wrapper-col="{ xs: { span: 24 }, sm: { span: 17 } }"
+          >
+            <a-select v-model="plainSeq" style="width:100%">
+              <a-select-option value="1">前3s,创意引入,包袱</a-select-option>
+              <a-select-option value="2">产品卖点罗列、录屏</a-select-option>
+              <a-select-option value="3">反转</a-select-option>
+              <a-select-option value="4">尾帧:引导下载,落版海报</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item
             label="镜头"
             :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
             :wrapper-col="{ xs: { span: 24 }, sm: { span: 17 } }"
@@ -550,20 +576,19 @@ a {
         <P
           v-for="(item, index) of comments"
           :key="index"
-          style="font-size:16px"
+          class="script-style"
+          style="font-size:16px;border-bottom:1px solid black"
           :style="{ fontWeight: item.author == '情节描述' ? '300' : '700' }"
         >
-          <span style="display:inline-block;">{{ item.author == '情节描述' ? '' : item.author + ':' }}</span>
-          <span>
-            {{ item.author == '情节描述' ? '【' + item.content + '】' : item.content }}
-          </span>
-          {{ item.scene || item.picContent || item.clipRemark ? '(' : ''
-          }}<span v-if="item.scene" style="margin-right:15px;color:LightSlateGray">镜头:{{ item.scene }}</span>
-          <span v-if="item.picContent" style="margin-right:15px;color:LightSlateGray"
-            >画面内容:{{ item.picContent }}</span
-          >
-          <span v-if="item.clipRemark" style="color:LightSlateGray">剪辑备注:{{ item.clipRemark }}</span
-          >{{ item.scene || item.picContent || item.clipRemark ? ')' : '' }}
+          <span style="display:inline-block">{{ item.author == '情节描述' ? '情节描述' : '对话' }} </span>
+          <span v-if="item.plainSeq">顺序类型:{{ item.plainSeq | plainSeqName }}</span>
+          <span v-if="item.scene" style="margin-right:15px;">镜头:{{ item.scene }}</span>
+          <span v-if="item.picContent" style="margin-right:15px;">画面内容:{{ item.picContent }}</span>
+          <span v-if="item.clipRemark">剪辑备注:{{ item.clipRemark }} </span>
+          <span style="display:inline-block;margin-top:5px">{{
+            item.author == '情节描述' ? '' : item.author + ':'
+          }}</span>
+          {{ item.author == '情节描述' ? '【' + item.content + '】' : item.content }}
         </P>
       </div>
       <a-button v-print="'#printTest'" type="primary">
@@ -604,11 +629,12 @@ export default {
       submitting: false,
       value: '',
       rank: '',
-      editScript: null,
+      scriptEdit: null,
       scene: '',
       clipRemark: '',
       picContent: '',
       projectId: '',
+      plainSeq: '1',
       inputVisible: false,
       visibleScript: false,
       visibleScriptShow: false,
@@ -683,6 +709,15 @@ export default {
       let d = date.getDate()
       d = d < 10 ? '0' + d : d
       return y + '-' + MM + '-' + d
+    },
+    plainSeqName(value) {
+      var data = {
+        1: '前3s,创意引入,包袱',
+        2: '产品卖点罗列、录屏',
+        3: '反转',
+        4: '尾帧:引导下载,落版海报'
+      }
+      return data[value]
     }
   },
   computed: {},
@@ -714,17 +749,22 @@ export default {
     },
     editAction(item, index) {
       console.log(item, index)
-      this.editScript = item.id
-
+      this.scriptEdit = item.id
+      this.plainSeq = item.plainSeq
+      this.rank = item.rank
+      this.scene = item.scene
+      this.value = item.line
+      this.clipRemark = item.clipRemark
+      this.picContent = item.picContent
+      this.author = item.type == 1 ? ['scence'] : ['taici', item.roleId]
 
+      //   line: this.value,
+      //     scene: this.scene,
+      //     clipRemark: this.clipRemark,
+      //     picContent: this.picContent,
+      //     type: this.author[0] == 'scence' ? 1 : 2,
+      //     roleId: this.author[0] == 'scence' ? null : this.author[1]
 
-    //   line: this.value,
-    //     scene: this.scene,
-    //     clipRemark: this.clipRemark,
-    //     picContent: this.picContent,
-    //     type: this.author[0] == 'scence' ? 1 : 2,
-    //     roleId: this.author[0] == 'scence' ? null : this.author[1]
-        
       //   postAction('/ctop/dramaItemInfo/edit', { id: item.id }).then(res => {
       //     if (res.success) {
       //       this.comments.splice(index, 1)
@@ -793,46 +833,71 @@ export default {
       }
 
       this.submitting = true
+      if (this.scriptEdit) {
+        postAction('/ctop/dramaItemInfo/edit', {
+          id: this.scriptEdit,
+          line: this.value,
+          scene: this.scene,
+          clipRemark: this.clipRemark,
+          picContent: this.picContent,
+          type: this.author[0] == 'scence' ? 1 : 2,
+          rank: this.rank,
+          plainSeq: this.plainSeq,
+          roleId: this.author[0] == 'scence' ? null : this.author[1]
+        }).then(res => {
+          if (res.success) {
+            this.scriptEdit = null
+            this.submitting = false
+            this.value = ''
+            this.scene = ''
+            this.clipRemark = ''
+            this.picContent = ''
 
+            this.getDetailList(this.dramaId)
+          }
+        })
+      } else {
+        postAction('/ctop/dramaItemInfo/add', {
+          dramaId: this.dramaId,
+          line: this.value,
+          scene: this.scene,
+          clipRemark: this.clipRemark,
+          picContent: this.picContent,
+          plainSeq: this.plainSeq,
+          type: this.author[0] == 'scence' ? 1 : 2,
+          roleId: this.author[0] == 'scence' ? null : this.author[1]
+        }).then(res => {
+          console.log(res)
+          this.submitting = false
+          if (res.success) {
+            this.comments = [
+              ...this.comments,
+              {
+                author:
+                  this.author[0] == 'scence'
+                    ? '情节描述'
+                    : this.roleList.filter(v => {
+                        return v.id == this.author[1]
+                      })[0].name,
+                avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
+                content: this.value,
+                scene: this.scene,
+                clipRemark: this.clipRemark,
+                picContent: this.picContent,
+                datetime: moment().fromNow(),
+                edit: false
+              }
+            ]
+            this.value = ''
+            this.scene = ''
+            this.clipRemark = ''
+            this.picContent = ''
+          } else {
+            this.$message.error('添加失败')
+          }
+        })
+      }
       //   setTimeout(() => {
-      postAction('/ctop/dramaItemInfo/add', {
-        dramaId: this.dramaId,
-        line: this.value,
-        scene: this.scene,
-        clipRemark: this.clipRemark,
-        picContent: this.picContent,
-        type: this.author[0] == 'scence' ? 1 : 2,
-        roleId: this.author[0] == 'scence' ? null : this.author[1]
-      }).then(res => {
-        console.log(res)
-        this.submitting = false
-        if (res.success) {
-          this.comments = [
-            ...this.comments,
-            {
-              author:
-                this.author[0] == 'scence'
-                  ? '情节描述'
-                  : this.roleList.filter(v => {
-                      return v.id == this.author[1]
-                    })[0].name,
-              avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-              content: this.value,
-              scene: this.scene,
-              clipRemark: this.clipRemark,
-              picContent: this.picContent,
-              datetime: moment().fromNow(),
-              edit: false
-            }
-          ]
-          this.value = ''
-          this.scene = ''
-          this.clipRemark = ''
-          this.picContent = ''
-        } else {
-          this.$message.error('添加失败')
-        }
-      })
 
       //   }, 1000)
     },
@@ -843,7 +908,10 @@ export default {
       this.visibleScript = true
       this.dramaId = item.id
       //   this.author = 'scence'
-      getAction('/ctop/dramaInfo/detail', { dramaId: item.id }).then(res => {
+      this.getDetailList(item.id)
+    },
+    getDetailList(id) {
+      getAction('/ctop/dramaInfo/detail', { dramaId: id }).then(res => {
         console.log(res)
         if (res.success) {
           this.comments = res.itemInfos.map(v => {
@@ -939,10 +1007,12 @@ export default {
       })
     },
     close() {
-      //   this.form.resetFields()
-      //   this.urlList = { url: '', md5: '', name: '' }
-      //   this.watermarkUrl = { url: '', md5: '', name: '' }
-      //   this.tags = []
+      this.scriptEdit = null
+      this.submitting = false
+      this.value = ''
+      this.scene = ''
+      this.clipRemark = ''
+      this.picContent = ''
     },
     showInput() {
       this.inputVisible = true

+ 2 - 56
src/views/report/KuaishouChannelRegInfoList.vue

@@ -11,36 +11,10 @@
               <a-input placeholder="请输入日期" v-model="queryParam.stateDate"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="渠道号">
-              <a-input placeholder="请输入渠道号" v-model="queryParam.channelCode"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="regNum">
-              <a-input placeholder="请输入regNum" v-model="queryParam.regNum"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="资料完善率">
-              <a-input placeholder="请输入资料完善率" v-model="queryParam.perfectDataRate"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="男高占比">
-              <a-input placeholder="请输入男高占比" v-model="queryParam.maleRatio"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
           <a-col :md="6" :sm="8" >
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
 
@@ -50,25 +24,14 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('快手渠道注册信息表')">导出</a-button>
+
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
 
       <a-table
         ref="table"
@@ -79,7 +42,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
@@ -122,16 +84,6 @@
         description: '快手渠道注册信息表管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-           },
 		   {
             title: '日期',
             align:"center",
@@ -157,19 +109,13 @@
             align:"center",
             dataIndex: 'maleRatio'
            },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
         ],
 		url: {
           list: "/ctop/kuaishouChannelRegInfo/list",
           delete: "/ctop/kuaishouChannelRegInfo/delete",
           deleteBatch: "/ctop/kuaishouChannelRegInfo/deleteBatch",
           exportXlsUrl: "ctop/kuaishouChannelRegInfo/exportXls",
-          importExcelUrl: "ctop/kuaishouChannelRegInfo/importExcel",
+          importExcelUrl: "/ctop/kuaishouChannelRegInfo/importExcel",
        },
     }
   },

+ 2 - 2
vue.config.js

@@ -66,8 +66,8 @@ module.exports = {
       '/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.53:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        // target: 'http://192.168.2.109:8080', //请求本地 需要jeecg-boot后台项目  英豪
+        // target: 'http://192.168.2.53:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        target: 'http://192.168.2.109: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.124:8080', //请求本地 需要jeecg-boot后台项目  孙震