luobisheng
2022-11-25 dfad5868528f14df5d341611922624962cd1fb2d
上传处置结果
8个文件已修改
1个文件已添加
349 ■■■■■ 已修改文件
src/api/system/videoPoint.js 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/fivepack/threepack/components/aside/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/fivepack/threepack/components/content.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/fivepack/threepack/components/updateUser/index.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/sms/smsIndex/createSms/index.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/device/bayonet/create/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/device/bayonet/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/device/point/index.vue 96 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/video/index.vue 165 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/system/videoPoint.js
New file
@@ -0,0 +1,17 @@
import http from "@/http";
export default {
    getVideoPointList: (params) => {
        return http.get('/sccg/video_point/query', params);
    },
    addVideoPoint: (params) => {
        return http.post('/sccg/video_point/addition', params);
    },
    updateVideoPoint: (params) => {
        return http.put('/sccg/video_point/modification', params);
    },
    deleteVideoPoint: (params) => {
        return http.delete('/sccg/video_point/deletion', params);
    }
}
src/views/operate/fivepack/threepack/components/aside/index.vue
@@ -5,7 +5,7 @@
            <el-input placeholder="输入组织机构名称, 按下enter键搜索" v-model="searchArea" @change="filterTreeNode"></el-input>
        </div>
        <div class="menu">
            <el-tree ref="department" :filter-node-method="filterNode" :data="areaData" :props="defaultProps"></el-tree>
            <el-tree ref="department" :filter-node-method="filterNode" :data="areaData" :props="defaultProps" @node-click="nodeClick"></el-tree>
        </div>
    </div>
</template>
@@ -41,6 +41,9 @@
    filterNode(value, data) {
      if (!value) return true;
      return data.regionName.indexOf(value) !== -1;
    },
    nodeClick(data, node, props) {
      this.$emit('selectedDepartment', data);
    }
  }
};
src/views/operate/fivepack/threepack/components/content.vue
@@ -105,7 +105,8 @@
  methods: {
    search() {
      getStoreInfoList({ keyword: this.storeCode })
      const status = this.storeStatus === 0 ? null : this.storeStatus;
      getStoreInfoList({ keyword: this.storeCode, status })
          .then(({ list, pageSize, totalPage }) => {
            this.tableData = list;
            this.pageSize = pageSize;
src/views/operate/fivepack/threepack/components/updateUser/index.vue
@@ -98,23 +98,25 @@
        }
    },
    async created() {
      this.$set(this, 'store', this.storeInfo);
      const result = await getVideoPoint({ current: 1, size: 1 });
      this.relationVideoList = result.records;
      if (this.storeInfo && this.isStorePage) {
        this.store.relationVideo = this.store.videoPoint.name;
      }
      if (!this.isView()) {
      if (this.storeInfo) {
        this.$set(this, 'store', this.storeInfo);
        const result = await getVideoPoint({ current: 1, size: 1 });
        this.relationVideoList = result.records;
        if (this.storeInfo && this.isStorePage) {
          this.store.relationVideo = this.store.videoPoint.name;
        }
        if (!this.isView()) {
          await this.getShopTypeList();
        }
      }
    },
    methods: {
      onSubmit() {
        this.$refs.store.validate(valid => {
          if (valid) {
            this.store.type = this.store.type[1];
            if (this.isCreated()) {
              this.store.type = this.store.type[1];
              addStoreInfo(this.store)
                  .then(() => {
                    this.$message({ type: 'success', message: '操作成功' });
src/views/operate/sms/smsIndex/createSms/index.vue
@@ -9,7 +9,7 @@
                        <div class="message-item">
                            <div class="message-item__left">
                                <el-select v-model="role.messageType" placeholder="请选择短信模板">
                                    <el-option v-for="item in colList" :key="item.id" :label="item.columnName"
                                    <el-option v-for="item in colList" :key="item.id" :label="item.title"
                                        :value="item.id">
                                    </el-option>
                                </el-select>
@@ -53,6 +53,7 @@
<script>
import MyEditor from '@/components/edit'
import { sendMessage } from "@/api/operate/messageManagement";
import SMS from "@/api/operate/SMS";
export default {
    components: { MyEditor },
@@ -103,7 +104,7 @@
        }
    },
    created() {
        this.setColumnList();
        this.getSMSTemplateList();
        this.setDepartList();
        this.getLoginUserInfo();
    },
@@ -115,29 +116,18 @@
                    done();
                })
        },
        // 设置栏目
        async setColumnList() {
            this.colList = await this.getColumnList();
        getSMSTemplateList() {
          SMS.getSMSTemplateList({ current: 1, pageSize: 100 })
              .then(({ records }) => {
                this.colList = records;
              })
              .catch(err => this.$message.error(err))
        },
        // 获取栏目
        async getColumnList() {
            let arr;
            await this.$axios({
                method: 'get',
                url: 'sccg/message_column/getAllColumn'
            })
                .then(res => {
                    arr = res.data;
                })
            return arr;
        },
        // 关闭弹窗
        closeDialog({ flag, index }) {
        closeDialog({ flag }) {
            this.dialogCreate = flag;
            if (index === 1) {
                // 重新设置栏目
                this.setColumnList();
            }
        },
        // 获取部门树
        async getDepartList() {
src/views/systemSetting/device/bayonet/create/index.vue
@@ -135,11 +135,12 @@
      onSubmit() {
        this.$refs.device.validate(valid => {
          if (valid) {
            this.bayonet.longitude = Number(this.bayonet.longitude);
            this.bayonet.latitude = Number(this.bayonet.latitude);
            this.bayonet.inOutCityType = Number(this.bayonet.inOutCityType);
            this.bayonet.belongArea = Number(this.bayonet.belongArea);
            const copyBayonet = deepClone(this.bayonet);
            delete copyBayonet.id;
            copyBayonet.longitude = Number(copyBayonet.longitude);
            copyBayonet.latitude = Number(copyBayonet.latitude);
            copyBayonet.inOutCityType = Number(copyBayonet.inOutCityType);
            if (!this.isEdit) {
              bayonet.addBayonet(this.bayonet)
                  .then(() => {
src/views/systemSetting/device/bayonet/index.vue
@@ -49,7 +49,7 @@
    data() {
        return {
            isShowDialog: false,
            context: 0,
            context: null,
            options: [
                {
                    value: 0,
@@ -117,7 +117,7 @@
    },
    methods: {
      getBayonetListData() {
        bayonet.getBayonetList({ bayonetName: '', current: this.current, size: this.size })
        bayonet.getBayonetList({ bayonetName: this.context, current: this.current, size: this.size })
            .then(({ records }) => {
              this.list = records;
            })
src/views/systemSetting/device/point/index.vue
@@ -1,7 +1,7 @@
<template>
  <el-container style="height: 100%;">
    <el-aside heigth="100%" width="200px ">
      <department-aside />
      <department-aside @selectedDepartment="selectedDepartment" />
    </el-aside>
    <el-container>
@@ -14,13 +14,11 @@
      </el-header>
      <el-main style="display:flex;flex-wrap: wrap;overflow-y: scroll;">
        <div v-for="item in videoData " style="height: 240px ;width: 210px; position: relative;margin-left:20px ;">
        <div v-for="item in videoData" style="height: 240px ;width: 210px; position: relative;margin-left:20px ;">
          <div
            style="color:rgb(75, 155, 183); font-size: 11px;line-height: 18px; position: absolute; z-index: 1;left: 50px;">
            {{ item.steert }}{{ item.community }}</div>
          <video id="my-video" class="video-js" controls preload="auto" width="210px" height="150px"
            :poster="item.imageUrl" data-setup="{}">
            <source :src="item.videoUrl" type="video/mp4" />
            {{ item.name }}{{ item.community }}</div>
          <video id="my-video" :src="item.urlAddress" class="video-js" controls preload="auto" width="210px" height="150px">
          </video>
          <div class="bottonOne" @click="">查看视频</div>
          <div class="bottonTwo">视频上报</div>
@@ -138,80 +136,40 @@
</style>
<script>
import departmentAside from "@/views/operate/fivepack/threepack/components/aside";
import videoPoint from "@/api/system/videoPoint";
  export default {
    components: { departmentAside },
    created() {
      this.getVideoPointList();
    },
    data() {
      return {
        currentPage: 1,
        totalNum: 7,
        totalNum: 10,
        pageSize: 10,
        videoData:[
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          },
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          },
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          }
          ,
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          },
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          }
          ,
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          },
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          },
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          }
        ],
        videoData: [],
        value:''
      };
    },
    methods: {
      handleNodeClick(data) {
        console.log(data);
      getVideoPointList(data) {
        let communityId, streetId;
        if (data) {
          communityId = data.parentId;
          streetId = data.id;
        }
        videoPoint.getVideoPointList({ current: this.currentPage, size: this.pageSize, communityId, streetId })
            .then(({ records, total }) => {
              this.videoData = records;
              this.totalNum = total;
            })
            .catch(err => this.$message.error(err))
      },
      selectedDepartment(data) {
        if (!data.children) {
          this.getVideoPointList(data);
        }
      }
    }
  };
src/views/video/index.vue
@@ -25,13 +25,11 @@
      </el-header>
      <el-main style="display:flex;flex-wrap: wrap;overflow-y: scroll;">
        <div v-for="item in videoDate " style="height: 240px ;width: 210px; position: relative;margin-left:20px ;">
          <div
            style="color:rgb(75, 155, 183); font-size: 11px;line-height: 18px; position: absolute; z-index: 1;left: 50px;">
            {{ item.steert }}{{ item.community }}</div>
          <video id="my-video" class="video-js" controls preload="auto" width="210px" height="150px"
            :poster="item.imageUrl" data-setup="{}">
            <source :src="item.videoUrl" type="video/mp4" />
        <div v-for="item in videoData " style="height: 240px ;width: 210px; position: relative;margin-left:20px ;">
          <div style="color:rgb(75, 155, 183); font-size: 11px;line-height: 18px; position: absolute; z-index: 1;left: 50px;">
            {{ item.name }}{{ item.community }}
          </div>
          <video id="my-video" class="video-js" controls preload="auto" width="210px" height="150px" :src="item.urlAddress" type="video/mp4">
          </video>
          <div class="bottonOne" @click="">查看视频</div>
          <div class="bottonTwo">视频上报</div>
@@ -40,14 +38,56 @@
      </el-main>
      <el-footer>
        <div style="margin-bottom:0;">
          <el-pagination layout="prev, pager, next" :total="totalNum"
            :page-size="pageSize">
          </el-pagination>
          <el-pagination layout="prev, pager, next" @current-change="currentPageChange" :total="totalNum" :page-size="pageSize"></el-pagination>
        </div>
      </el-footer>
    </el-container>
  </el-container>
</template>
<script>
import departmentAside from "@/views/operate/fivepack/threepack/components/aside";
import videoPoint from "@/api/system/videoPoint";
export default {
  components: { departmentAside },
  created() {
    this.getVideoPointList();
  },
  data() {
    return {
      currentPage: 1,
      totalNum: 7,
      pageSize: 10,
      videoData: [],
      value: null
    };
  },
  methods: {
    getVideoPointList(data) {
      let communityId, streetId;
      if (data) {
        communityId = data.parentId;
        streetId = data.id;
      }
      videoPoint.getVideoPointList({ current: this.currentPage, size: this.pageSize, communityId, streetId })
          .then(({ records, total }) => {
            this.videoData = records;
            this.totalNum = total;
          })
          .catch(err => this.$message.error(err))
    },
    selectedDepartment(data) {
      if (!data.children) {
        this.getVideoPointList(data);
      }
    },
    currentPageChange(page) {
      this.currentPage = page;
      this.getVideoPointList();
    }
  }
};
</script>
<style lang="scss" scoped>
.button-one {
  height: 40px;
@@ -146,107 +186,4 @@
  font-size: 14px;
  color: rgb(75, 155, 183);
}
</style>
<script>
import departmentAside from "@/views/operate/fivepack/threepack/components/aside";
  export default {
    components: { departmentAside },
    data() {
      return {
        totalNum:7,
        pageSize:10,
        videoDate:[
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic1.zhimg.com%2Fv2-f596f7046869736314107eed4003ce88_r.jpg&refer=http%3A%2F%2Fpic1.zhimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1669953324&t=319eaeb3617f2bd98a0d5b845b35a537",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          },
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic1.zhimg.com%2Fv2-f596f7046869736314107eed4003ce88_r.jpg&refer=http%3A%2F%2Fpic1.zhimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1669953324&t=319eaeb3617f2bd98a0d5b845b35a537",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          },
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic1.zhimg.com%2Fv2-f596f7046869736314107eed4003ce88_r.jpg&refer=http%3A%2F%2Fpic1.zhimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1669953324&t=319eaeb3617f2bd98a0d5b845b35a537",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          }
          ,
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic1.zhimg.com%2Fv2-f596f7046869736314107eed4003ce88_r.jpg&refer=http%3A%2F%2Fpic1.zhimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1669953324&t=319eaeb3617f2bd98a0d5b845b35a537",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          },
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic1.zhimg.com%2Fv2-f596f7046869736314107eed4003ce88_r.jpg&refer=http%3A%2F%2Fpic1.zhimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1669953324&t=319eaeb3617f2bd98a0d5b845b35a537",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          }
          ,
          {
            id:12,
            steert:"xx街道",
            community:"xxx社区",
            imageUrl:"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic1.zhimg.com%2Fv2-f596f7046869736314107eed4003ce88_r.jpg&refer=http%3A%2F%2Fpic1.zhimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1669953324&t=319eaeb3617f2bd98a0d5b845b35a537",
            videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
          }
        ],
        treedata: [{
          label: '妙高街道',
          children: [{
            label: '东街',
            children: [{
              label: '螺蛳垵'
            }]
          }]
        }, {
          label: '云峰街道',
          children: [{
            label: '东亭',
            children: [{
              label: '隔溪'
            }]
          }, {
            label: '马头',
            children: [{
              label: '龙口'
            }]
          }]
        }, {
          label: '新路湾镇',
          children: [{
            label: '新路湾镇',
            children: [{
              label: '新路湾镇'
            }]
          }, {
            label: '新路湾镇',
            children: [{
              label: '新路湾镇'
            }]
          }]
        }],
        defaultProps: {
          children: 'children',
          label: 'label'
        },
        value:''
      };
    },
    methods: {
      handleNodeClick(data) {
      }
    }
  };
</script>
</style>