Merge remote-tracking branch 'origin/build' into build

project/biaopin/AppWorkOrder/AppWorkOrder.vue

@@ -9,6 +9,8 @@ import List from './components/List'
 import Detail from './components/Detail'
 import Setting from './components/Setting'
 import settingDetail from "./components/settingDetail";
+import SetKeywordManagement from './components/SetKeywordManagement'
+import SetReportType from './components/SetReportType'
 
 export default {
   name: 'AppWorkOrder',
@@ -29,24 +31,42 @@ export default {
   },
   computed: {
     currentPage() {
-      if(this.$route.query.id) { //列表
+      console.log(this.$route)
+      if(this.$route.query.id || this.$route.hash == "#Setting" || this.$route.hash == "#SetKeywordManagement" || this.$route.hash == "#SetReportType") { //列表
         this.listIndex = this.$route.query.listIndex
       }
       let {hash, query: {id}} = this.$route
-      return hash == "#Setting" ? Setting :
-          hash == "#sd" ? settingDetail :
-              !!id ? Detail : List
+      // return hash == "#Setting" ? Setting :
+      //     hash == "#sd" ? settingDetail :
+      //         !!id ? Detail : List
+
+      if(hash == "#sd") {
+        return settingDetail
+      }else if(hash == "#Detail") {
+        return Detail
+      }else if(hash == "#Setting") {
+        return Setting
+      }else if(hash == "#SetKeywordManagement") {
+        return SetKeywordManagement
+      }else if(hash == "#SetReportType") {
+        return SetReportType
+      }else {
+        return List
+      }
     }
   },
   components: {
     List,
     Detail,
-    Setting
+    Setting,
+    SetKeywordManagement,
+    SetReportType
   },
 
   methods: {
     onChange(data) {
-      this.$router.push({query: data.params, hash: data.type == "Setting" ? "#Setting" : ""})
+      // this.$router.push({query: data.params, hash: data.type == "Setting" ? "#Setting" : ""})
+      this.$router.push({query: data.params, hash: data.type == data.type ? data.type : ""})
     }
   }
 }

project/biaopin/AppWorkOrder/components/List.vue

@@ -2,7 +2,7 @@
   <ai-list>
     <template #title>
       <ai-title :title="menuName" isShowBottomBorder>
-        <el-button type="primary" slot="rightBtn" @click="toSetting" v-if="currIndex==0">工单特征库设置</el-button>
+        <el-button type="primary" slot="rightBtn" @click="toSetting">{{rightBtnTextList[currIndex]}}设置</el-button>
       </ai-title>
     </template>
     <!-- <template slot="tabs">
@@ -23,18 +23,18 @@
             :selectList="dict.getDict('clapEventStatus')"
             @change="search.current = 1, getList()">
           </ai-select>
-          <ai-select v-if="currIndex == 0"
+          <ai-select
             v-model="search.type"
             clearable
-            placeholder="事件类型"
+            :placeholder="currIndex == 1 ? '触发敏感词' : '事件类型'"
             :selectList="typeList"
             @change="search.current = 1, getList()">
           </ai-select>
-          <ai-select v-if="currIndex == 1"
-            v-model="search.eventSource"
+          <!-- <ai-select v-if="currIndex == 1"
+            v-model="search.type"
             clearable
             placeholder="触发敏感词"
-            :selectList="dict.getDict('residentEventSource')"
+            :selectList="typeList"
             @change="search.current = 1, getList()">
           </ai-select>
           <ai-select v-if="currIndex == 2"
@@ -43,7 +43,7 @@
             placeholder="事件来源"
             :selectList="dict.getDict('residentEventSource')"
             @change="search.current = 1, getList()">
-          </ai-select>
+          </ai-select> -->
           
           <el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至" @change="timeChange"
             start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
@@ -70,7 +70,7 @@
             class="search-input"
             size="small"
             v-throttle="() => {search.current = 1, getList()}"
-            :placeholder="placeholderTextList[currIndex]"
+            :placeholder="currIndex == 1 ? '敏感词、涉及对象、姓名、手机号' : '请输入内容描述/上报人员/联系方式'"
             clearable
             @change="getList"
             @clear="search.current = 1, search.content = '', getList()"
@@ -138,7 +138,7 @@ export default {
         {label: '居民上报', value: 0}
       ],
       currIndex: 0,
-      placeholderTextList: ['请输入内容描述/上报人员/联系方式', '敏感词、涉及对象、姓名、手机号', '请输入内容描述/上报人员/联系方式'],
+      rightBtnTextList: ['工单特征库', '敏感关键词', '事件类型', '事件类型'],
       colConfigs: []
     }
   },
@@ -217,7 +217,8 @@ export default {
       this.instance.post(`/app/apppatrolreportinfov2/list`, null, {
         params: {
           ...this.search,
-          eventSource: this.tabs[this.currIndex].value
+          eventSource: this.tabs[this.currIndex].value,
+          groupName: this.search.type
         }
       }).then(res => {
         if (res.code == 0) {
@@ -227,10 +228,11 @@ export default {
       })
     },
     getTypeList() {
-      this.instance.post(`/app/appsessionarchivefeaturelibrary/eventTypeList`).then(res => {
+      this.typeList = []
+      this.instance.post(`/app/apppatrolreportinfov2/eventTypeList?eventSource=${this.tabs[this.currIndex].value}`).then(res => {
         if (res.code == 0) {
           res.data.map((item) => {
-            var i = {distName: item, dictValue: item}
+            var i = {dictName: item, dictValue: item}
             this.typeList.push(i)
           })
         }
@@ -246,10 +248,12 @@ export default {
       })
     },
     toSetting() {
+      var setNameList = ['Setting', 'SetKeywordManagement', 'SetReportType', 'SetReportType']
       this.$emit('change', {
-        type: 'Setting',
+        type: setNameList[this.currIndex],
         params: {
-          id: ''
+          id: '',
+          listIndex: this.currIndex
         }
       })
     },
@@ -274,6 +278,12 @@ export default {
         this.colConfigs = this.colConfigs3
       }
       this.search.current = 1
+      this.search.type = ''
+      this.search.eventStatus = ''
+      this.search.startTime = ''
+      this.search.endTime = ''
+      this.search.content = ''
+      this.getTypeList()
       this.getList()
     }
   },

project/biaopin/AppWorkOrder/components/SetKeywordManagement.vue

@@ -0,0 +1,235 @@
+<template>
+  <section class="SetKeywordManagement">
+    <ai-list>
+      <template slot="title">
+        <ai-title title="关键词管理" isShowBack isShowBottomBorder @onBackClick="cancel"></ai-title>
+      </template>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button size="small" type="primary" icon="iconfont iconAdd" @click="add('')">添加</el-button>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="关键词搜索" v-model="search.name" clearable
+              @clear="current = 1, search.name = '', getTableData()" suffix-icon="iconfont iconSearch"
+              v-throttle="() => {(current = 1), getTableData();}"/>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="total" :current.sync="current" :size.sync="size"
+                  @getList="getTableData()" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="options" label="操作"  align="center">
+            <template slot-scope="{ row }">
+              <el-button type="text" @click="changeStatus(row, '停用', 0)" v-if="row.status == 1">停用</el-button>
+              <el-button type="text" @click="changeStatus(row, '启用', 1)" v-else>启用</el-button>
+              <el-button type="text" @click="edit(row)">编辑</el-button>
+              <el-button type="text" @click="del(row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog
+        :title="form.id ? '编辑敏感词' : '添加敏感词'"
+        :visible.sync="dialog"
+        :destroyOnClose="true"
+        width="720px"
+        @onConfirm="onConfirm"
+        @closed="form={}">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="敏感词" prop="wordName">
+          <el-input v-model.trim="form.wordName" placeholder="请输入敏感词" size="small"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="生效地区" prop="areaList">
+          <ai-area-get :instance="instance" :fullname.sync="form.areaName" v-model="form.areaList" :root="user.info.areaId" multiple></ai-area-get>
+        </el-form-item> -->
+        <el-form-item label="生效部门" prop="deptList">
+          <ai-picker :instance="instance" v-model="form.deptList" @pick="e => onUserChange(e)" :multiple="true" dialogTitle="选择部门" action="/app/wxcp/wxdepartment/departList">
+            <div class="time-select">
+              <span class="dept-name" v-if="form.deptList && form.deptList.length">已选择{{form.deptList.length}}个部门</span>
+              <span class="dept-name" style="color:#999;" v-else>请选择</span>
+              <i class="el-icon-arrow-down"></i>
+            </div>
+          </ai-picker>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "SetKeywordManagement",
+  label: '关键词管理',
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    menuName:String
+  },
+  data() {
+    return {
+      search: {
+        wordName: '',
+        current: 1,
+        size: 10,
+      },
+      tableData: [],
+      size: 10,
+      total: 0,
+      current: 1,
+      form: {
+        wordName: '',
+        // areaList: [],
+        deptList: [],
+        departmentFullIds: []
+      },
+      dialog: false,
+      flag: false,
+    }
+  },
+  created() {
+    this.getTableData()
+  },
+  computed: {
+    ...mapState(['user']),
+    colConfigs() {
+      return [
+        { prop: "wordName", label: '关键词', align: "left"},
+        { prop: "createTime", label: '创建时间'},
+        { prop: "createUserName", label: '创建人'},
+        // { prop: "areaNames", label: '生效地区'},
+        { prop: "departmentNames", label: '生效部门'},
+        { slot: "options" },
+      ]
+    },
+    rules() {
+      return {
+        wordName: [{required: true, message: '请输入敏感词', trigger: 'blur' }],
+        // areaList: [{required: true, message: '请选择生效地区', trigger: 'blur' }],
+        deptList: [{required: true, message: '请选择生效部门', trigger: 'blur' }],
+      }
+    },
+  },
+  methods: {
+    getTableData() {
+      this.instance.post(`/app/appsessionarchivekeywordinfo/list`,null,{
+        params: {
+          ...this.search,
+          current: this.current,
+          size: this.size,
+          total: this.total,
+          wordName: this.search.name
+        }
+      }).then(res => {
+        if(res?.data) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
+    del(row) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appsessionarchivekeywordinfo/delete?ids=${row.id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('删除成功！')
+            this.getTableData()
+          }
+        })
+      })
+    },
+    changeStatus(row, text, status) {
+      this.$confirm(`确定${text}该关键词？`).then(() => {
+        this.instance.post(`/app/appsessionarchivekeywordinfo/updateStatusById?id=${row.id}&status=${status}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('操作成功！')
+            this.getTableData()
+          }
+        })
+      })
+    },
+    edit(row) {
+      this.form = {...row}
+      this.form.deptList = []
+      this.form.departmentFullIds = []
+      this.form.deptList = row.departmentIds.split(',')
+      if(row.departmentFullIds) {
+        this.form.departmentFullIds = row.departmentFullIds.split(',')
+      }
+      this.dialog = true
+    },
+    add() {
+      this.dialog = true
+    },
+    onUserChange (e) {
+      this.form.deptList = []
+      this.form.departmentFullIds = []
+      e.map((item) => {
+        console.log(item)
+        this.form.deptList.push(item.id)
+        this.form.departmentFullIds.push(item.fullId)
+      })
+      this.$forceUpdate()
+      // this.form.deptList = e
+      // this.$forceUpdate()
+    },
+    onConfirm() {
+      if(this.flag) return
+
+      this.$refs.form.validate((valid)=> {
+        if(valid) {
+          this.flag = true
+          this.instance.post(`/app/appsessionarchivekeywordinfo/addOrUpdate`,{
+            ...this.form,
+            // areaIds: this.form.areaList.join(','),
+            departmentIds: this.form.deptList.join(','),
+            departmentFullIds: this.form.departmentFullIds.join(',')
+          }).then(res => {
+            if(res?.code == 0) {
+              this.$message.success(this.form.id ? '关键词编辑成功' : '关键词添加成功')
+              setTimeout(() =>{
+                this.form.deptList = []
+                this.dialog = false
+                this.getTableData()
+                this.flag = false
+              }, 600)
+            } else {
+              this.flag = false
+            }
+          })
+        }
+      })
+    },
+    cancel() {
+      this.$router.push({})
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.SetKeywordManagement {
+  height: 100%;
+
+  .time-select {
+    padding: 0 16px;
+    height: 32px;
+    line-height: 32px;
+    border: 1px solid #d0d4dc;
+    border-radius: 4px;
+    display: flex;
+    justify-content: space-between;
+    cursor: pointer;
+    .el-icon-arrow-down {
+      line-height: 32px;
+    }
+  }
+
+  :deep .is-error {
+    .time-select {
+      border: 1px solid #f46!important;
+    }
+  }
+}
+</style>

project/biaopin/AppWorkOrder/components/SetReportType.vue

@@ -0,0 +1,188 @@
+<template>
+  <ai-list class="SetReportType">
+    <template slot="title">
+      <ai-title  isShowBack isShowBottomBorder title="事件类型" @onBackClick="cancel()"></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="isShowAdd = true">添加事件类型</el-button>
+        </template>
+        <template slot="right">
+          <el-input
+            v-model="search.groupName"
+            class="search-input"
+            size="small"
+            v-throttle="() => {search.current = 1, getList()}"
+            placeholder="请输入事件类型名称"
+            clearable
+            @change="getList"
+            @clear="search.current = 1, search.groupName = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 6px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="tags" label="标签">
+          <template slot-scope="{ row }">
+            <div class="table-tags">
+              <el-tag type="info" v-for="(item, index) in row.tags" size="small" :key="index">{{ item }}</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+          <div class="table-options" slot-scope="{ row }">
+            <!-- <el-button type="text" @click="changeStatus(row, '停用', 0)" v-if="row.status == 1">停用</el-button>
+            <el-button type="text" @click="changeStatus(row, '启用', 1)" v-else>启用</el-button> -->
+            <el-button type="text" @click="edit(row)">编辑</el-button>
+            <el-button type="text" @click="remove(row.id)">删除</el-button>
+          </div>
+        </el-table-column>
+      </ai-table>
+      <ai-dialog
+        :visible.sync="isShowAdd"
+        width="780px"
+        height="580px"
+        :title="id ? '编辑事件类型' : '添加事件类型'"
+        @close="onClose"
+        @onConfirm="onConfirm">
+        <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
+          <el-form-item label="事件类型" prop="groupName" style="width: 100%;" :rules="[{ required: true, message: '请输入事件类型名称', trigger: 'blur' }]">
+            <el-input size="small" :maxlength="10" show-word-limit placeholder="请输入事件类型名称" v-model="form.groupName"></el-input>
+          </el-form-item>
+          <el-form-item label="排序" prop="showIndex" style="width: 100%;" :rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]">
+            <el-input-number size="small" v-model="form.showIndex" :min="1" :max="100" label="请输入排序"></el-input-number>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          groupName: ''
+        },
+        form: {
+          groupName: '',
+          showIndex: ''
+        },
+        id: '',
+        isShowAdd: false,
+        total: 0,
+        colConfigs: [
+          {prop: 'groupName', label: '事件类型', align: 'left'},
+          {prop: 'showIndex', label: '排序', align: 'center'},
+          {slot: 'options', label: '操作'}
+        ],
+        tableData: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    mounted() {
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/apppatrolreportgroupv2/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      edit (e) {
+        this.id = e.id
+        this.form.groupName = e.groupName
+        this.form.showIndex = ''
+
+        this.$nextTick(() => {
+          this.isShowAdd = true
+        })
+      },
+
+      onClose () {
+        this.id = ''
+        this.form.showIndex = ''
+        this.form.groupName = ''
+      },
+
+      onConfirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/apppatrolreportgroupv2/addOrUpdate`, {
+              ...this.form,
+              id: this.id || null
+            }).then(res => {
+              if (res.code === 0) {
+                this.$message.success('添加成功')
+                this.isShowAdd = false
+
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+
+      cancel() {
+        this.$router.push({})
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/apppatrolreportgroupv2/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      }
+    },
+
+    changeStatus(row, text, status) {
+      this.$confirm(`确定${text}该关键词？`).then(() => {
+        this.instance.post(`/app/apppatrolreportgroupv2/addOrUpdate?id=${row.id}&status=${status}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('操作成功！')
+            this.getTableData()
+          }
+        })
+      })
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>