Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

zhanghua

2022-11-29 24712d1fa40f157892f3d0546572953ca696ebc2

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

# Conflicts:
#	src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue

 src/views/intelligentPatrol/studyJudge/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="study-judge">
    <div class="study-judge-header">
      <span>您有1111条待审核报警信息,今日立案0条,再学习{{ currentEvent.review }}条</span>
      <span>您有{{ eventList.length }}条待审核报警信息,今日立案0条,再学习{{ countData.review }}条</span>
    </div>
    <div class="study-judge-main">
      <div class="sjm-header">
@@ -16,20 +16,10 @@
      </div>
      <div class="sjm-content">
        <div class="sjm-content-left">
          <div class="img-item">
          <div class="img-item" v-for="(item, index) in imageList" :key="item.id">
            <span>报警图片</span>
            <img :src="currentEvent.picData">
            <span>报警时间：2022-09-08 14:23:34</span>
          </div>
          <div class="img-item">
            <img
              src="https://axure-file.lanhuapp.com/90466432-c999-4bf0-80b8-ee3f96a2099e__67d4d15bfc501319f8377f2ce37bf441.svg"
              alt="">
          </div>
          <div class="img-item">
            <img
              src="https://axure-file.lanhuapp.com/90466432-c999-4bf0-80b8-ee3f96a2099e__67d4d15bfc501319f8377f2ce37bf441.svg"
              alt="">
            <img :src="item">
            <span v-if="index === 0">报警时间：{{ currentEvent.alarmTime }}</span>
          </div>
        </div>
        <div class="sjm-content-center">
@@ -62,25 +52,22 @@
                  <el-radio :label="item.id" v-for="item in adviceList" :key="item.id">{{ item.label }}</el-radio>
                </el-radio-group>
              </el-form-item>
              <el-form-item label="问题类型:" prop="type">
                <el-input v-model="currentEvent.type" placeholder="请选择问题类型"></el-input>
              <el-form-item label="大类名称:" prop="categoryId">
                <el-input v-model="currentEvent.categoryId" placeholder="请选择大类名称"></el-input>
              </el-form-item>
              <el-form-item label="大类名称:" prop="bigKind">
                <el-input v-model="currentEvent.bigKind" placeholder="请选择大类名称"></el-input>
              </el-form-item>
              <el-form-item label="小类名称:" prop="smallKind">
                <el-input v-model="currentEvent.smallKind" placeholder="请选择小类名称"></el-input>
              <el-form-item label="小类名称:" prop="typeId">
                <el-input v-model="currentEvent.typeId" placeholder="请选择小类名称"></el-input>
              </el-form-item>
              <el-form-item label="车牌号:" prop="carNumber">
                <el-input v-model="currentEvent.carNumber" placeholder="请填写车牌号码"></el-input>
              </el-form-item>
              <el-form-item label="备注:">
                <el-input type="textarea" :rows="5" v-model="currentEvent.tip"></el-input>
              <el-form-item label="备注:" prop="description">
                <el-input type="textarea" :rows="5" v-model="currentEvent.description"></el-input>
              </el-form-item>
              <el-form-item>
                <el-button>上一条</el-button>
                <el-button @click="pageChange('prev')">上一条</el-button>
                <el-button @click.native.prevent="handleConfirm">确认</el-button>
                <el-button>下一条</el-button>
                <el-button @click="pageChange('next')">下一条</el-button>
              </el-form-item>
            </el-form>
          </div>
@@ -96,72 +83,20 @@

export default {
  created() {
    basecase.getInspectionData({ current: 1 })
        .then(({ records }) => {
          this.eventList = records;
          this.currentEvent = this.eventList[0];
          if (this.currentEvent.picData) {
            this.currentEvent.picData = `${FILE_ORIGINAL_URL}${this.currentEvent.picData}`;
          }
        })
        .catch(err => this.$message.error(err))

    this.getInspectionData();
    basecase.getInspectionCountData()
        .then(res => {
          this.currentEvent.review = res.review;
          this.countData = res;
        })
        .catch(err => this.$message.error(err))
  },
  data() {
    const validateAdvice = (rule,value,callback)=>{
      if(value){
        callback()
      }else{
        callback(new Error('处理意见不能为空'))
      }
    }
    const validateType = (rule,value,callback)=>{
      if(value){
        callback()
      }else{
        callback(new Error('问题类型不能为空'))
      }
    }
    const validateBigKind = (rule,value,callback)=>{
      console.log(value)
      if(value){
        callback()
      }else{
        callback(new Error('大类名称不能为空'))
      }
    }
    const validateSmallKind = (rule,value,callback)=>{
      if(value){
        callback()
      }else{
        callback(new Error('小类名称不能为空'))
      }
    }
    const validateCarNumber = (rule,value,callback)=>{
      if(value){
        callback()
      }else{
        callback(new Error('车牌号不能为空'))
      }
    }
    return {
      eventList: [],
      currentEvent: {
        code: null,
        grade: null,
        picData: null,
        street: null,
        urlAddress: null,
        name: null,
        latitude: null,
        longitude: null,
      countData: {
        review: 0
      },
      currentEvent: {},
      adviceList: [
        {
          id: 1,
@@ -183,42 +118,70 @@
      rules:{
        advice:[
          {
            trigger:'blur',validator:validateAdvice
            required: true, trigger:['blur', 'change'], message: '处理意见不能为空'
          },
        ],
        type:[
        categoryId:[
          {
            trigger:'blur',validator:validateType
            required: true, trigger:['blur', 'change'], message: '大类名称不能为空'
          }
        ],
        bigKind:[
        typeId:[
          {
            trigger:'blur',validator:validateBigKind
          }
        ],
        smallKind:[
          {
            trigger:'blur',validator:validateSmallKind
            required: true, trigger:['blur', 'change'], message: '小类名称不能为空'
          }
        ],
        carNumber:[
          {
            trigger:'blur',validator:validateCarNumber
            required: true, trigger:['blur', 'change'], message: '车牌号不能为空'
          }
        ]
      }
      },
      imageList: [],
      currentPage: 1
    }
  },
  methods:{
    pageChange(type) {
      if (this.eventList.length === this.currentPage) {
        this.$message.warning('当前已是最后一页');
        return;
      }
      if (type === 'next') {
        this.currentPage += 1;
      } else {
        this.currentPage -= 1;
      }
      this.currentEvent = this.eventList[this.currentPage - 1];
    },

    getInspectionData() {
      basecase.getInspectionData({ current: this.currentPage })
          .then(({ records }) => {
            this.eventList = records;
            this.eventList.forEach(item => {
              if (item.picData) {
                const imageUrls = item.picData.split(',');
                this.imageList = imageUrls.map(url => `${FILE_ORIGINAL_URL}${url}`);
              }
            })
            this.currentEvent = this.eventList[this.currentPage - 1];
          })
          .catch(err => this.$message.error(err))
    },

    // 确认点击事件
    handleConfirm(){
      console.log(this.$refs.currentEvent)
      this.$refs.currentEvent.validate((flag)=>{
        console.log(flag)
        if(flag){

          basecase.confirmInspection(this.currentEvent)
              .then(() => {
                this.$message.success('操作成功');
                this.getInspectionData();
              })
              .catch(err => this.$message.error(err))
        }else{
          return false
          this.$message.warning('请检查必填项')
        }
      })
    }
@@ -297,7 +260,6 @@

  .el-form {
    ::v-deep .el-form-item {
      // margin-bottom: 10px;
    }

    ::v-deep .el-form-item__label {

 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue

@@ -3,12 +3,7 @@
    <!-- 到达现场情况 -->
    <MyArrive ref="arrive" :arriveData="arriveData"></MyArrive>
    <!-- 调查取证 -->
    <MyEvidence
      ref="evidence"
      :evidenceData="evidenceData"
      :mytype="1"
      :mycode="mycode"
    ></MyEvidence>
        <MyEvidence ref="evidence" :evidenceData="evidenceData" :mytype="1" :mycode="mycode"></MyEvidence>
    <!-- 底部按钮 -->
    <div class="footer">
      <el-button @click="handleSubmit" type="primary">确定</el-button>
@@ -17,22 +12,21 @@
  </div>
</template>
<script>
import MyArrive from "../components/arrive";
import MyEvidence from "../components/evidence";
import MyArrive from '../components/arrive'
import MyEvidence from "../components/evidence"
import casequery from "@/api/operate/basecase";

export default {
  components: {
    MyArrive,
    MyEvidence,
        MyArrive, MyEvidence
  },
  data() {
    return {
      arriveData: null,
      evidenceData: null,
    };
          evidenceData: null
        }
  },
  props: ["caseId", "closeDialog", "mycode", "vioData", "imageResourceId"],
    props: ['caseId', 'closeDialog','mycode', 'vioData', 'imageResourceId'],
  created() {
    this.arriveData = this.vioData.arrivalSituation;
    this.evidenceData = this.vioData.investigation;
@@ -51,16 +45,16 @@
              const { partyInfo } = evidenceData;
              const arrivalSituationId = arriveData.id;
              const investigationId = evidenceData.id;
              const partyInfoId = partyInfo ? partyInfo.id : 0;
              const evidencePic = evidenceData.pic.join(",");
              const situationPic = arriveData.situationPic.join(",");
                          const partyInfoId = this.evidenceData ? partyInfo.id : null;
                          const evidencePic = evidenceData.pic.join(',');
                          const situationPic = arriveData.situationPic.join(',');
              delete evidenceData.id;
              delete evidenceData.partyInfo;
                          delete evidenceData.userInfo;
              delete evidenceData.pic;
              delete arriveData.situationPic;
              delete arriveData.id;
              casequery
                .updateDisposeResult({
                          casequery.updateDisposeResult({
                  caseId: this.caseId,
                  imageResourceId: this.imageResourceId,
                  pic: evidencePic,
@@ -70,34 +64,34 @@
                  investigationId,
                  ...arriveData,
                  ...evidenceData,
                  ...partyInfo,
                            ...partyInfo
                })
                .then(() => {
                  this.$message.success("操作成功");
                  this.$emit("closeDialog");
                                this.$message.success('操作成功');
                                this.$emit('closeDialog');
                })
                .catch((err) => {
                              .catch(err => {
                  this.$message.error(err);
                });
                              })
            } else {
              return false;
            }
          });
                    })
        } else {
          evidenceForm.validate((flag) => {
            if (!flag) {
              return false;
            }
          });
                    })
          return false;
        }
      });
            })
    },
    handleBack() {
      this.$emit("closeDialog", { flag: false });
    },
  },
};
            this.$emit('closeDialog',{flag:false});
        }
    }
}
</script>
<style lang="scss" scoped>
.vio {

 src/views/operate/management/message/checkSms/index.vue

@@ -56,11 +56,7 @@
        }
    },
    created() {
        const {sms} = this;
        console.log(this.messageData); 
        console.log(this.messageData.info); 
        this.sms = this.messageData.info.row;
        
      this.sms = this.messageData;
    },
    methods: {
        changeComponent(index) {
@@ -68,17 +64,16 @@
        },
        // 提交审核意见
        handleSubmit(index) {
            const { sms } = this;
            this.$refs.viewForm.validate((valid) => {
                if (valid) {
                    this.$axios({
                        method: 'post',
                        url: 'sccg/message_audit/checkSms',
                        data: {
                            id:sms.id,
                            messageId: sms.messageId,
                            id: this.sms.id,
                            messageId: this.sms.messageId,
                            status:index,
                            auditOpinion:sms.auditOpinion,
                            auditOpinion: this.sms.auditOpinion,
                            result:index === 0 ? '不同意':'同意'
                        }
                    })
@@ -89,13 +84,13 @@
                                    message: '审核成功' 
                                })
                                this.$emit('closeDialog', { flag: false, index: 1 });
                                
                            }

                        })
                        .catch(err => { console.log(err) });
                }else{
                    return false;
                             this.$message.error(res.message);
                            }
                        })
                        .catch(err => { this.$message.error(err) });
                } else {
                  this.$message.warning('请检查必填项');
                }
            })
        },

 src/views/operate/management/message/index.vue

@@ -9,13 +9,13 @@
        </div>
        <div class="status">
          <span>短信状态:</span>
          <el-radio-group v-model="status">
          <el-radio-group v-model="status" @input="getMessageAuditList">
            <el-radio :label="0">待审核</el-radio>
            <el-radio :label="1">已审核</el-radio>
          </el-radio-group>
        </div>
        <div class="btns">
          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
          <el-button type="primary" icon="el-icon-search" @click="getMessageAuditList"
            >查询</el-button
          >
          <el-button icon="el-icon-delete-solid" @click="handleReset"
@@ -68,10 +68,10 @@
          :visible.sync="dialogCheckSms"
          width="80%"
          title="消息详情"
          v-if="dialogCheckSms"
          :before-close="handleClose"
        >
          <MyCheckSms
              v-if="dialogCheckSms"
            :messageData="messageData"
            @closeDialog="closeDialog"
          ></MyCheckSms>
@@ -156,39 +156,33 @@
    };
  },
  created() {
    const { setTableData } = this;
    this.setTableData();
    this.getMessageAuditList()
  },
  methods: {
    handleSearch() {
      this.setTableData();
    },
    // 重置
    handleReset() {},
    // 设置表格数据
    async setTableData() {
      const arr = await this.getMessageAuditList();
      this.tableData = arr.records;
      this.totalNum = arr.total;
    handleReset() {
      this.context = '';
      this.status = 0;
      this.getMessageAuditList();
    },
    // 获取消息数据
    async getMessageAuditList() {
      let arr = [];
      const { currentPage, pageSize, context, status } = this;
      await this.$axios({
    getMessageAuditList() {
       this.$axios({
        method: "post",
        url: "sccg/message_audit/list",
        data: {
          messageId: context,
          messageId: this.context,
          auditId:this.auditId,
          auditStatus: status,
          current: currentPage,
          pageSize: pageSize,
          auditStatus: this.status,
          current: this.currentPage,
          pageSize: this.pageSize,
        },
      }).then((res) => {
        arr = res.data;
      });
      return arr;
        const { records, total } = res.data;
        this.tableData = records;
        this.totalNum = total;
      }).catch(err => this.$message.error(err))

    },
    // 弹窗关闭
    handleClose(done) {
@@ -199,12 +193,12 @@
    // 当前页改变触发事件
    changeCurrentPage(page) {
      this.currentPage = page;
      this.setTableData();
      this.getMessageAuditList();
    },
    // 去审核
    handleCheckSms(info) {
      this.messageData = info;
      if (this.messageData.info.row.auditStatus === 1) {
      this.messageData = info.info.row;
      if (info.info.row.auditStatus === 1) {
        this.$message({ message: "该消息已被审核！" });
        this.dialogCheckSms = false;
      } else {
@@ -247,7 +241,6 @@

  header {
    background-color: #09152f;
    border: 1pox solid #fff;
    .header-title {
      line-height: 40px;
      padding: 0 20px;
@@ -285,7 +278,6 @@
    background-color: #09152f;
    margin-top: 20px;
    padding-bottom: 50px;
    border: 1pox solid #fff;

    .main-title {
      line-height: 60px;

 src/views/operate/message/myIndex/update/index.vue

@@ -9,6 +9,7 @@
          :model="role"
          :rules="createRoleRules"
          label-position="right"
          :disabled="edit"
        >
          <!-- 提醒方式 -->
          <el-form-item class="optionItem" label="提醒方式:" prop="channelCode">
@@ -84,21 +85,24 @@
                type="primary"
                @click.native.prevent="handleSubmit(0)"
                class="btn save"
                v-if="this.type=='update'||this.type=='create'"
                >保存
              </el-button>
              <el-button
                type="primary"
                @click.native.prevent="handleSubmit(1)"
                class="btn submit"
                v-if="this.type=='update'||this.type=='create'"
                >发布
              </el-button>
              <el-button
                type="primary"
                @click.native.prevent="handleView"
                class="btn submit"
                v-if="this.type=='update'||this.type=='create'"
                >预览
              </el-button>
              <el-button class="btn cancel" @click.native.prevent="handleReset"
              <el-button class="btn cancel" @click.native.prevent="handleReset" v-if="this.type=='update'||this.type=='create'"
                >重置</el-button
              >
            </div>
@@ -174,6 +178,7 @@
          },
        ],
      },
      edit: false,
      colList: [],
      departList: [],
      typeList: [],
@@ -193,6 +198,9 @@
    this.getColumnList();
    this.getDepartList();
    this.getLoginUserInfo();
    if(this.type=="view"){
      this.edit=true;
    }
    if (this.type !== "create" && this.myDataRow) {
      getMessageById(this.myDataRow.id)
          .then(res => {
@@ -209,6 +217,7 @@
    if (this.type !== 'create') {
      this.$refs.edit.editor.txt.append(this.myDataRow.body);
    }
    
  },
  methods: {
    // 关闭弹窗
@@ -235,7 +244,10 @@
        this.getColumnList();
      }
    },

    getType(){
      debugger
      return this.type;
    },
    // 获取部门树
    async getDepartList() {
      await this.$axios({

 src/views/operate/sms/smsTemplate/index.vue

@@ -182,6 +182,9 @@
        },
        // 重置
        handleReset(){
            this.context="";
            this.messageStatus=0;
            this.getMessageList();
        },
        // 查看
        handleView(data){
@@ -211,7 +214,7 @@
        },
        // 获取消息数据
        getMessageList() {
            SMS.getSMSTemplateList({ current: this.currentPage, pageSize: this.pageSize, context: this.context, type: this.messageType })
            SMS.getSMSTemplateList({ current: this.currentPage, pageSize: this.pageSize, title: this.context, type: this.messageStatus })
                .then(({ records, total }) => {
                  this.tableData = records;
                  this.totalNum = total;

 src/views/operate/viewEvent/index.vue

@@ -4,25 +4,25 @@
            <div class="headerTitle">运营管理 >> 案卷查询</div>
            <div class="headerContent">
                <div class="contentItem">
                    <span>按编号: </span>
                    <div style="width: 80px;">按编号: </div>
                    <div>
                        <el-input placeholder=" 请输入编号" v-model="searchData.number"></el-input>
                    </div>
                </div>
                <div class="contentItem">
                    <span>按类型: </span>
                    <div style="width: 80px;">按类型: </div>
                    <div class="search">
                        <el-input placeholder=" 请输入类型" v-model="searchData.categories"></el-input>
                    </div>
                </div>
                <div class="contentItem">
                    <span>按社区: </span>
                    <div style="width: 80px;">按社区: </div>
                    <div class="search">
                        <el-input placeholder=" 请输入社区" v-model="searchData.communityId"></el-input>
                    </div>
                </div>
                <div class="contentItem">
                    <span>按事发地点: </span>
                    <div style="width: 150px;">按事发地点: </div>
                    <div class="search">
                        <el-input placeholder=" 请输入事发地点" v-model="searchData.site"></el-input>
                    </div>
@@ -34,7 +34,7 @@
                </div>
            </div>
            <div class="headerContent">
                <span>时间: </span>
                <div style="width: 60px;">时间: </div>
                <el-date-picker
                    v-model="datepick"
                    type="daterange"

 src/views/systemSetting/platform/cockpitManage/index.vue

@@ -68,6 +68,9 @@
                    <el-table-column prop="reviewOrLawsuitNumber" label="复议或诉讼数" min-width="15" v-if="mystatus === 1">
                    </el-table-column>
                    <el-table-column prop="status" label="状态" min-width="15" v-if="mystatus === 1">
                        <template slot-scope="scope">
                            <span>{{scope.row. status=== 1? '启动' : '禁用'}}</span>
                        </template>
                    </el-table-column>
                    <el-table-column prop="operation" label="操作" min-width="15">
                        <template slot-scope="scope">