事件中心代码修改

event-ui/src/views/event/eventcatalogue/index.vue

@@ -84,7 +84,7 @@
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)"
                      v-hasPermi="['eventcatalogue:eventcatalogue:edit']">详情
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleEventLog(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-document" @click="handleEventLog(scope.row)"
                      v-hasPermi="['eventcatalogue:eventcatalogue:edit']">事件日志
           </el-button>
         </template>
@@ -324,7 +324,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="24" v-if="detailSee">
             <ImageUpload ref="ImageUpload" :limit="1" :fileType="['png', 'jpg', 'jpeg']" :isShowTip="false"
                          :value="form.attachId"
                          @input="getUrl"></ImageUpload>
@@ -413,6 +413,7 @@
         // 是否显示弹出层
         open: false,
         openSee: false,
+        detailSee: true,
         // 是否禁用弹出层表单
         findView: false,
         showLongitude: false,
@@ -774,6 +775,9 @@
         getEventcatalogue(id).then(response => {
           this.form = response.data;
           const list = response.data.attach;
+           if(list.length == 0){
+             this.detailSee = false;
+           }
           for (let i = 0; i < list.length; i++) {
             this.$set(list[i], "url", list[i].attachPath)
           }

event-ui/src/views/event/eventtypemonitor/index.vue

@@ -66,14 +66,27 @@
     </el-table>
     <!-- 事件类型维护 -->
     <el-dialog :title="title" :visible.sync="openEventlx" width="500px" append-to-body>
+
+<!--      <div class="head-container">-->
+<!--        <el-input v-model="eventTypelxName" placeholder="请输入事件小类名称" clearable size="small" prefix-icon="el-icon-search"-->
+<!--                  style="margin-bottom: 20px"/>-->
+<!--      </div>-->
       <div class="head-container">
-        <el-input v-model="eventTypelxName" placeholder="请输入事件小类名称" clearable size="small" prefix-icon="el-icon-search"
-                  style="margin-bottom: 20px"/>
-      </div>
-      <div class="head-container">
-        <el-tree :data="typeOptions" :props="defaultProps" :expand-on-click-node="false"
-                 :filter-node-method="filterNode" :default-checked-keys="eventlxArray" ref="tree"
-                 default-expand-all show-checkbox node-key="value" check-strictly/>
+<!--        <el-tree :data="typeOptions" :props="defaultProps" :expand-on-click-node="false"-->
+<!--                 :filter-node-method="filterNode" :default-checked-keys="eventlxArray" ref="tree"-->
+<!--                 default-expand-all show-checkbox node-key="value" check-strictly/>-->
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-form-item label="事件类型" prop="typeList">
+        <el-select v-model="form.typeList" filterable placeholder="请选择事件类型" multiple @change="$forceUpdate()">
+          <el-option
+            v-for="dict in typeOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+          </el-form-item>
+        </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitEventLx">确 定</el-button>
@@ -146,7 +159,9 @@
           activeName:null
         },
         // 表单参数
-        form: {},
+        form: {
+          typeList: []
+        },
         // 表单校验
         rules: {
         }
@@ -228,6 +243,7 @@
       handleEventlx(row) {
         this.form = row;
        this.eventlxArray = undefined == row.lxids ? [] : row.lxids.split(",");
+       this.form.typeList = this.eventlxArray.map(Number);
         this.eventTypelxName = undefined;
         deptTreeSelect().then(response => {
           this.typeOptions = response.data;
@@ -241,12 +257,15 @@
         return data.label.indexOf(value) !== -1;
       },
       submitEventLx() {
-        let param = [], array = this.$refs["tree"].getCheckedNodes();
+        let param = [], array = this.form.typeList;
          if(array.length > 0){
            for (let i = 0; i < array.length; i++) {
+             let opt= this.typeOptions.find((item)=>{
+               return item.value === array[i];
+             });
              param.push({
-               typeXlId: array[i].value,
-               eventTypeName: array[i].label,
+               typeXlId: array[i],
+               eventTypeName: opt.label,
                serialNumber: i,
                eventType: this.form.eventTypeName,
                templateType: this.templateType,
@@ -259,9 +278,10 @@
          }
 
         addEventtyepLx(param).then(response => {
+          this.getList();
           this.$modal.msgSuccess("操作成功");
           this.openEventlx = false;
-          this.getList();
+
         });
       },
 

src/main/resources/mapper/centereventteventtypemonitor/centereventteventtypemonitorMapper.xml

@@ -149,5 +149,6 @@
         group by event_type_name
         order by id
         ) b on moni.type_xl_id=b.id where moni.template_type = #{templateType}
+        order by serial_number desc
     </select>
 </mapper>