hanbaoshan
2021-01-18 8d386abb15154f7bd601a5d2e0355ffbca3ac083
shuohuang细节调整
5个文件已修改
101 ■■■■■ 已修改文件
src/api/shuohuang.ts 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/shuohuangMonitorAnalyze/components/memberManage.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/shuohuangMonitorAnalyze/components/taskManage.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/shuohuangMonitorAnalyze/components/topNav.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/shuohuang.ts
@@ -121,7 +121,7 @@
  })
export const uploadDirectory = (data:any) =>{
  request({
    url:'/data/api-c/user/uploadFile',
    url:'/data/api-c/user/uploadMulti',
    method:'post',
    data
  })
src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
@@ -36,7 +36,7 @@
            :label="item.name"
          >{{item.name}}</el-option>
        </el-select>
        <el-button type="primary" size="small" @click="dataSearch">查询</el-button>
        <el-button type="primary" size="small" @click="renderMemberTable">查询</el-button>
      </div>
      <div class="table-area">
        <div class="actions">
@@ -402,10 +402,11 @@
      //this.$refs['directoryInput'].files //文件夹map
      let formData = new FormData;
      formData.append('File',this.$refs['directoryInput'].files)
      uploadDirectory(formData).then(res=>{
        debugger
      })
      debugger
      // uploadDirectory(formData).then(res=>{
      //   debugger
      // })
      
    },
@@ -497,9 +498,7 @@
      this.memberEditDialogVisible = true;
      this.memberEditForm = {};
    },
    dataSearch () {
    }
  }
}
</script>
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -208,9 +208,9 @@
          <el-table-column label="修改日期" prop="UpdatedAt" sortable></el-table-column>
          <el-table-column label="创建日期" prop="CreatedAt" sortable></el-table-column>
          <el-table-column label="操作">
            <template>
            <template slot-scope="scope">
              <div class="operation">
                <i class="el-icon-star-off" style="font-size: 18px;"></i>
                <i class="el-icon-star-off"  @click="toggleFollow(scope.row)"></i>
              </div>
            </template>
          </el-table-column>
@@ -272,23 +272,38 @@
                </div>
              </div>
              <div class="players" ref="playerWrap">
                <div
                  class="video-item"
                  :ref="`gridVideoItem_${index}`"
                  v-for="(item,index) in videoWrapArr"
                  :key="index"
                >
                  <template v-if="index<=videoArrs.length-1">
                    <div :class="{'currentPlayer':curVideo.ID==videoArrs[index].ID}">
                      {{videoArrs[index].ID}}
                      <img
                        :src="CLIP+videoArrs[index].VideoCover"
                        style="width:100px"
                      />
                <template v-if="guid==1">
                  <div
                    class="video-item"
                    :ref="`gridVideoItem_${index}`"
                    v-for="(item,index) in videoWrapArr"
                    :key="index"
                  >
                    <div class="currentPlayer">
                      {{curVideo.ID}}
                      <img :src="CLIP+curVideo.VideoCover" style="width:100px" />
                    </div>
                  </template>
                </div>
                  </div>
                </template>
                <template v-else>
                  <div
                    class="video-item"
                    :ref="`gridVideoItem_${index}`"
                    v-for="(item,index) in videoWrapArr"
                    :key="index"
                  >
                    <template v-if="index<=videoArrs.length-1">
                      <div :class="{'currentPlayer':curVideo.ID==videoArrs[index].ID}">
                        {{videoArrs[index].ID}}
                        <img
                          :src="CLIP+videoArrs[index].VideoCover"
                          style="width:100px"
                        />
                      </div>
                    </template>
                  </div>
                </template>
                <!-- <div
                  class="video-item"
                  :class="{'active':item.ID==curVideo.ID}"
@@ -534,7 +549,7 @@
    },
    removeCurLabel (ParentID, Time) {
      delLabel({ ParentID, Time }).then(res => {
      })
    },
    renderLabelOpts () {
@@ -548,11 +563,11 @@
      let label = this.labelOptions.find(label => label.ID == id);
      return label.Name;
    },
    checkVideo (video,index) {
    checkVideo (video, index) {
      this.curVideo = video;
      debugger
      if(index>0&&this.guid==1){
        this.videoWrapArr
      if (index > 0 && this.guid == 1) {
        //this.videoWrapArr =
      }
    },
    handleTabSizeChange (size) {
@@ -927,8 +942,8 @@
              border-color: #7695ec;
            }
            &.checked {
              color: #409EFF;
              border-color: #409EFF;
              color: #409eff;
              border-color: #409eff;
            }
          }
        }
@@ -978,15 +993,15 @@
            padding: 2px 5px;
            cursor: pointer;
            border: 1px solid #eee;
            background-color:#ecf0fc;
            background-color: #ecf0fc;
            border-radius: 3px;
            color: #777;
            &.menu {
              margin-right: 10px;
            }
            &.current {
              border-color: #409EFF;
              background-color:#fff;
              border-color: #409eff;
              background-color: #fff;
            }
          }
        }
@@ -1047,7 +1062,7 @@
          bottom: 10px;
          color: #ccc;
          .follow {
            color: #409EFF;
            color: #409eff;
          }
        }
      }
@@ -1081,7 +1096,7 @@
        background: #fff;
        padding: 10px;
        border-radius: 3px;
        .flex-box >label{
        .flex-box > label {
          color: #777;
        }
      }
@@ -1101,7 +1116,7 @@
              color: #cacaca;
              padding-left: 12px;
              cursor: pointer;
              &.activegongge{
              &.activegongge {
                color: #3d68e1;
              }
            }
@@ -1154,7 +1169,7 @@
                  font-size: 15px;
                  font-weight: bold;
                  color: #409eff;
                  span{
                  span {
                    padding-right: 5px;
                  }
                  i[class^='el-icon'] {
src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
@@ -125,7 +125,7 @@
            type="primary"
            size="small"
            @click="distributeTask"
            v-if="taskVideoChecked.length"
            v-if="taskType==1&&taskVideoChecked.length"
          >分配任务</el-button>
        </div>
        <el-table
@@ -133,8 +133,9 @@
          :data="taskTableData"
          ref="elTable"
          @selection-change="taskTableSelection"
          v-loading
        >
          <el-table-column type="selection" width="55"></el-table-column>
          <el-table-column v-if="taskType==1" type="selection" width="55"></el-table-column>
          <el-table-column prop="LocomotiveNumber" label="机车号"></el-table-column>
          <el-table-column label="视频数量">
            <template slot-scope="scope">
src/pages/shuohuangMonitorAnalyze/components/topNav.vue
@@ -6,8 +6,8 @@
    <div class="notify">
      <i class="el-icon-bell"></i>
    </div>
    <div class="user-area">
      <img src alt />
    <div class="user-area" >
      <el-avatar size="small" src=""></el-avatar>
      username
    </div>
  </div>