heyujie
2021-02-25 58417c8de3cce002d75402ac805363de1d9b17a9
视频链接修改
6个文件已修改
35 ■■■■■ 已修改文件
src/pages/shuohuangMonitorAnalyze/components/memberManage.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/shuohuangMonitorAnalyze/components/taskManage.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
@@ -255,7 +255,8 @@
      tableTotal: 0,
      PageSize: 8,
      organizeData: [],
      checkedOrg: '',
      checkedOrgID: '',
      checkedOrgName:"",
      organizeKeyword: '',
      memberEditDialogVisible: false,
      toggleOrganizeDialogVisible: false,
@@ -286,13 +287,22 @@
      this.renderMemberTable();
    },
    isPhone (rule, value, callback) {
      if (value.trim()) {
      if (!value) {
        return callback()
      } else if (value.trim()) {
        var pattern = /^1[345789]\d{9}$/
        if (pattern.test(value)) {
          return callback()
        }
        return callback(new Error('输入的手机号错误'))
      }
      // if (value.trim()) {
      //   var pattern = /^1[345789]\d{9}$/
      //   if (pattern.test(value)) {
      //     return callback()
      //   }
      //   return callback(new Error('输入的手机号错误'))
      // }
    },
    nodeContextMenu (e, data, node, comp) {
      this.showMenu = true;
@@ -300,14 +310,16 @@
      this.menuLeft = e.pageX;
    },
    checkOrgNode (a, b, c) {
      this.checkedOrg = a.id
      this.checkedOrgID = a.id
      this.checkedOrgName = a.label
    },
    updateOrg () {
      let ids = this.multipleTableSelection.map(row => {
        return row.ID
      });
      let params = {
        DeptID: this.checkedOrg,
        DeptID: this.checkedOrgID,
        DeptName:this.checkedOrgName,
        Users: ids.join(',')
      }
      updateUnit(params).then(res => {
@@ -318,6 +330,7 @@
          });
          this.toggleOrganizeDialogVisible = false;
          this.renderMemberTable();
          this.searchLeftTreeData()
        }
      })
@@ -420,7 +433,6 @@
      //formData.append('files', this.$refs['directoryInput'].files)
      uploadDirectory(formData).then(res => {
        debugger
        _this.batchImportTableData = res.data;
        _this.renderMemberTable();
      })
src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
@@ -249,7 +249,7 @@
  },
  watch: {
    taskType (n, o) {
      debugger
      // debugger
      this.renderTaskTable();
    }
  },
@@ -313,6 +313,7 @@
          obj.checked = false;
          arr.push(obj);
        }
        debugger
        _this.trainNoList = arr;
        _this.trainNoTotal = res.total;
      });
src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue
@@ -139,7 +139,7 @@
    findDeviceIfo () {
      let _this = this;
      getDeviceInfoById({ DeviceID: this.actTab }).then(res => {
        debugger
        // debugger
        _this.tableData = res.data;
        //统计当前插槽状态
        let dx = _this.generalIndicators.find(indicator => indicator.id == 'dx');
src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
@@ -46,7 +46,7 @@
        <el-table-column prop="tranferDevice" label="转储设备名称">
          <template slot-scope="scope">
            <div>
              设备{{scope.$index}}
              设备{{scope.row.DeviceID}}
            </div>
          </template>
        </el-table-column>
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -57,7 +57,7 @@
                <!-- {{curVideo.ID}} -->
                <!-- <img :src="curVideo.VideoCover" style="width:100px" /> -->
                <ali-player
                  :source="'http://' + curVideo.VideoPath"
                  :source="curVideo.VideoPath"
                  :markers="curVideo.marks"
                  :ref="`player_${curVideo.ID}`"
                />
@@ -82,7 +82,7 @@
                    style="width:100px"
                  />-->
                  <ali-player
                    :source="'http://' + videoArrs[index].VideoPath"
                    :source="videoArrs[index].VideoPath"
                    :markers="videoArrs[index].marks"
                    :ref="`player_${videoArrs[index].ID}`"
                  />
vue.config.js
@@ -87,7 +87,7 @@
      //   }
      // },
      "/api-c": {
        target: 'http://192.168.20.10:8004',
        target: 'http://192.168.20.113:8004',
        changeOrigin: true
      },
      "/api-v": {