浏览代码

事件格式化

zhuhao 1 年之前
父节点
当前提交
2c4534a475

+ 307 - 312
src/views/event/components/dialog/addEvent.vue

@@ -1,339 +1,334 @@
 <template>
-    <div class="addEvent">
-        <el-dialog
-            :title="title"
-            :visible.sync="dialogVisible"
-            :width="width"
-            :before-close="handleClose">
-             <!-- 单个新增(事件) -->
-            <div v-if="type == 1">
-                <el-form
-                    :model="formData[0]"
-                    :rules="rules"
-                    ref="ruleForm"
-                    label-width="100px"
-                    class="demo-ruleForm"
-                >
-                    <el-form-item label="事件名称" prop="questionName">
-                        <el-autocomplete
-                            class="inline-input"
-                            v-model="formData[0].questionName"
-                            :fetch-suggestions="querySearchQuestion"
-                            :placeholder="formData[0].placeholder?formData[0].placeholder:'请输入或选择事件'"
-                            :trigger-on-focus="false"
-                            @select="handleSelectQuestion"
-                            @change="change1($event,{$index:0})"
-                            @focus="focus($event,{$index:0})"
-                            @input="input1($event,{$index:0,
-                                            row:formData[0]})"
-                            style="width: 100%;" >
-                        </el-autocomplete>
-                    </el-form-item>
-                    <el-form-item label="事件日期" prop="eventDate">
-                        <el-date-picker style="width: 100%" v-model="formData[0].eventDate" :disabled="(formData[0].id && !this.row)?true:false" type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择事件日期时间">
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="事件描述" prop="description">
-                        <el-input type="textarea" :rows="1" v-model="formData[0].description" autocomplete="off"
-                            placeholder="请输入事件描述" :disabled="(formData[0].id && !this.row)?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="事件场景" prop="assistPerson">
-                        <el-select v-model="formData[0].applicationScenarios[0]" :disabled="(formData[0].id && !this.row)?true:false"  style="width: 100%;" placeholder="请选择事件场景">
-                            <el-option
-                                v-for="item in commonData.ENTERPRISE_APPLICATION_SCENARIO ? commonData.ENTERPRISE_APPLICATION_SCENARIO : []"
-                                :key="parseInt(item.value)" :label="item.label" :value="parseInt(item.value)"
-                                >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <!-- 批量新增(事件) -->
-            <div v-else-if="type == 2">
-                <el-table :data="formData" style="width: 100%" class="twj-table">
-                <el-table-column prop="questionName" label="事件名称" align="center">
-                    <template slot="header">
-                    <div>
-                        <el-tooltip class="item" effect="dark" content="事件:商业目标/解决问题/对应项目" placement="top">
-                        <span>事件名称<span style="color:red;"> *</span></span>
-                        </el-tooltip>
-                    </div>
-                    </template>
-                    <template slot-scope="scope">
-                    <div>
-                        <el-autocomplete
-                                class="inline-input"
-                                v-model="scope.row.questionName"
-                                :fetch-suggestions="querySearchQuestion"
-                                placeholder="请输入或选择事件"
-                                :trigger-on-focus="false"
-                                @select="handleSelectQuestion"
-                                @focus="focus($event,scope)"
-                                style="width: 100%;" >
-                        </el-autocomplete>
-                    </div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="eventDate" label="事件时间" align="center">
-                    <template slot-scope="scope">
-                    <div>
-                        <el-date-picker style="width: 100%" v-model="scope.row.eventDate" :disabled="scope.row.id?true:false" type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择事件日期时间">
-                        </el-date-picker>
-                    </div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="description" label="事件描述" align="center" width="250px">
-                    <template slot-scope="scope">
-                    <div>
-                        <el-input type="textarea" :rows="1" v-model="scope.row.description" autocomplete="off"
-                        placeholder="请输入事件描述" :disabled="scope.row.id?true:false"></el-input>
-                    </div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="applicationScenarios" label="事件场景" align="center" >
-                    <template slot-scope="scope">
-                    <div>
-                        <el-select v-model="scope.row.applicationScenarios[0]" :disabled="scope.row.id?true:false"  style="width: 100%;" placeholder="请选择事件场景">
-                        <el-option
-                            v-for="item in commonData.ENTERPRISE_APPLICATION_SCENARIO ? commonData.ENTERPRISE_APPLICATION_SCENARIO : []"
-                            :key="parseInt(item.value)" :label="item.label" :value="parseInt(item.value)"
-                            >
-                        </el-option>
-                        </el-select>
-                    </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="事件操作" align="" width="100px">
-                    <template slot-scope="scope">
-                    <div>
-                        <el-tooltip class="item" effect="dark" content="增加事件" placement="top">
-                        <i @click="addRow(scope)" class="el-icon-plus btn"></i>
-                        </el-tooltip>
-                        <el-tooltip class="item" effect="dark" content="删除事件" placement="top">
-                        <i @click="deleteRow(scope)" v-if="scope.$index != 0" class="el-icon-close btn"></i>
-                        </el-tooltip>
-                    </div>
-                    </template>
-                </el-table-column>
-                </el-table>
-            </div>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm1()" size="small" style="width:100px">确定</el-button>
-                <el-button size="small" @click="resetForm()" style="width:100px">重置</el-button>
-                <el-button size="small" @click="resetClose()" style="width:100px">取消</el-button>
-            </div>
-        </el-dialog>
-       
-    </div>
+  <div class="addEvent">
+    <el-dialog :title="title" :visible.sync="dialogVisible" :width="width" :before-close="handleClose">
+      <!-- 单个新增(事件) -->
+      <div v-if="type == 1">
+        <el-form :model="formData[0]" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="事件名称" prop="questionName">
+            <!--  -->
+            <el-autocomplete class="inline-input" v-model="formData[0].questionName"
+              :fetch-suggestions="querySearchQuestion"
+              :placeholder="formData[0].placeholder ? formData[0].placeholder : '请输入或选择事件'" :trigger-on-focus="false"
+              @select="handleSelectQuestion" @change="change1($event, { $index: 0 })" @focus="focus($event, { $index: 0 })"
+              @input="input1($event, {
+                $index: 0,
+                row: formData[0]
+              })" style="width: 100%;">
+            </el-autocomplete>
+          </el-form-item>
+          <el-form-item label="事件日期" prop="eventDate">
+            <el-date-picker style="width: 100%" v-model="formData[0].eventDate"
+              :disabled="(formData[0].id && !this.row) ? true : false" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择事件日期时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="事件描述" prop="description">
+            <el-input type="textarea" :rows="1" v-model="formData[0].description" autocomplete="off" placeholder="请输入事件描述"
+              :disabled="(formData[0].id && !this.row) ? true : false"></el-input>
+          </el-form-item>
+          <el-form-item label="事件场景" prop="assistPerson">
+            <el-select v-model="formData[0].applicationScenarios[0]" :disabled="(formData[0].id && !this.row) ? true : false"
+              style="width: 100%;" placeholder="请选择事件场景">
+              <el-option
+                v-for="item in commonData.ENTERPRISE_APPLICATION_SCENARIO ? commonData.ENTERPRISE_APPLICATION_SCENARIO : []"
+                :key="parseInt(item.value)" :label="item.label" :value="parseInt(item.value)">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <!-- 批量新增(事件) -->
+      <div v-else-if="type == 2">
+        <el-table :data="formData" style="width: 100%" class="twj-table">
+          <el-table-column prop="questionName" label="事件名称" align="center">
+            <template slot="header">
+              <div>
+                <el-tooltip class="item" effect="dark" content="事件:商业目标/解决问题/对应项目" placement="top">
+                  <span>事件名称<span style="color:red;"> *</span></span>
+                </el-tooltip>
+              </div>
+            </template>
+            <template slot-scope="scope">
+              <div>
+                <el-autocomplete class="inline-input" v-model="scope.row.questionName"
+                  :fetch-suggestions="querySearchQuestion" placeholder="请输入或选择事件" :trigger-on-focus="false"
+                  @select="handleSelectQuestion" @focus="focus($event, scope)" style="width: 100%;">
+                </el-autocomplete>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="eventDate" label="事件时间" align="center">
+            <template slot-scope="scope">
+              <div>
+                <el-date-picker style="width: 100%" v-model="scope.row.eventDate" :disabled="scope.row.id ? true : false"
+                  type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择事件日期时间">
+                </el-date-picker>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="description" label="事件描述" align="center" width="250px">
+            <template slot-scope="scope">
+              <div>
+                <el-input type="textarea" :rows="1" v-model="scope.row.description" autocomplete="off"
+                  placeholder="请输入事件描述" :disabled="scope.row.id ? true : false"></el-input>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="applicationScenarios" label="事件场景" align="center">
+            <template slot-scope="scope">
+              <div>
+                <el-select v-model="scope.row.applicationScenarios[0]" :disabled="scope.row.id ? true : false"
+                  style="width: 100%;" placeholder="请选择事件场景">
+                  <el-option
+                    v-for="item in commonData.ENTERPRISE_APPLICATION_SCENARIO ? commonData.ENTERPRISE_APPLICATION_SCENARIO : []"
+                    :key="parseInt(item.value)" :label="item.label" :value="parseInt(item.value)">
+                  </el-option>
+                </el-select>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="事件操作" align="" width="100px">
+            <template slot-scope="scope">
+              <div>
+                <el-tooltip class="item" effect="dark" content="增加事件" placement="top">
+                  <i @click="addRow(scope)" class="el-icon-plus btn"></i>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除事件" placement="top">
+                  <i @click="deleteRow(scope)" v-if="scope.$index != 0" class="el-icon-close btn"></i>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm1()" size="small" style="width:100px">确定</el-button>
+        <el-button size="small" @click="resetForm()" style="width:100px">重置</el-button>
+        <el-button size="small" @click="handleClose()" style="width:100px">取消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
 </template>
   
 <script>
-  export default {
-    props: [],
-    data() {
-      return {
-        //弹窗标题
-        title:'',
-        //弹窗状态
-        dialogVisible:false,
-        //弹窗宽度
-        width:'800px',
-        //表格数据
-        formData: [
+export default {
+  props: [],
+  data() {
+    return {
+      //弹窗标题
+      title: '',
+      //弹窗状态
+      dialogVisible: false,
+      //弹窗宽度
+      width: '800px',
+      //表格数据
+      formData: [
+        {
+          questionName: '',
+          eventDate: '',
+          description: '',
+          applicationScenarios: [],
+        }
+      ],
+      //检验规则
+      rules: {},
+      //应用场景数据
+      commonData: {},
+      //弹窗类型
+      type: 1,
+      // 所有的事件
+      questionNameArr:[],
+    }
+  },
+  watch: {},
+  async mounted() {
+    // 应用场景(是通过字典还是接口待定)
+    await this.getCommonData()
+  },
+  methods: {
+    //打开弹窗,判断是编辑还是添加,同时判断是批量添加还是添加单个事件(type==1是单个,type==2是批量)
+    open(data, type) {
+      if (data) {//编辑
+        this.formData = JSON.parse(JSON.stringify(data))
+      } else {//添加
+        this.type = type
+        if (this.type == 1) {
+          this.title='新增事件'
+        } else {
+          this.title = '批量新增事件'
+        }
+        this.formData = [
           {
             questionName: '',
             eventDate: '',
             description: '',
             applicationScenarios: [],
           }
-        ],
-        //检验规则
-        rules:{},
-        //应用场景数据
-        commonData: {},
-        //弹窗类型
-        type:1,
+        ]
       }
+      this.dialogVisible = true
     },
-    watch: {},
-    async mounted() {
-      // 应用场景(是通过字典还是接口待定)
-      await this.getCommonData()
+    //关闭弹窗
+    handleClose() { 
+      this.dialogVisible=false
     },
-    methods: {
-        //打开弹窗,判断是编辑还是添加,同时判断是批量添加还是添加单个事件(type==1是单个,type==2是批量)
-        open(data,type){
-            if(data){
-                this.formData = JSON.parse(JSON.stringify(data))
-            }else{
-                this.formData=[
-                    {
-                        questionName: '',
-                        eventDate: '',
-                        description: '',
-                        applicationScenarios: [],
-                    }
-                ]
-            }
-            this.type = type
-            this.dialogVisible = true
-        },
-      //关闭弹窗
-      handleClose(){},
-      // 请求应用场景(是通过字典还是接口待定)
-      async getCommonData() {
-        await this.$api.getCommonData({ keys: 'QUERY_GROUP,ENTERPRISE_APPLICATION_SCENARIO,INVESTIGATION_TYPE' }).then(response => {
-          this.commonData = response.data
-        })
-      },
-      // 检验事件并提交保存请求
-      submitForm1(){
-        var list = []
-        try {
-          this.formData.forEach(item=>{
-            var a = false
-            for (let key in item) {
-              if (key != 'applicationScenarios') {
-                if(item[key]!='' && item[key]!=null){
-                      a = true
-                  }
-              } else {
-                if(item[key].length > 0){
-                      a = true
-                  }
-              }  
+    // 请求应用场景(是通过字典还是接口待定)
+    async getCommonData() {
+      await this.$api.getCommonData({ keys: 'QUERY_GROUP,ENTERPRISE_APPLICATION_SCENARIO,INVESTIGATION_TYPE' }).then(response => {
+        this.commonData = response.data
+      })
+    },
+    // 检验事件并提交保存请求
+    submitForm1() {
+      var list = []
+      try {
+        this.formData.forEach(item => {
+          var a = false
+          for (let key in item) {
+            if (key != 'applicationScenarios') {
+              if (item[key] != '' && item[key] != null) {
+                a = true
+              }
+            } else {
+              if (item[key].length > 0) {
+                a = true
+              }
             }
-            if(a == true){
-                if (item.questionName != '') {
-                      list.push(item)
-                } else {
-                  throw new Error('事件名称不能为空')
-                }
-            } 
-          })
-          var arr = [...new Set(list.map(item=>{return item.questionName}))]
-          if(arr.length<list.length){
-            this.$message.error(`存在重复的事件名称,请重定义事件名称`)
-            return false
           }
-          var edit = false
-          if(this.row){
-            edit = true
+          if (a == true) {
+            if (item.questionName != '') {
+              list.push(item)
+            } else {
+              throw new Error('事件名称不能为空')
+            }
           }
-           this.$emit('formData', {list:list,option:1,edit})
-        } catch (error) {
-          this.$message.error(error)
+        })
+        var arr = [...new Set(list.map(item => { return item.questionName }))]
+        if (arr.length < list.length) {
+          this.$message.error(`存在重复的事件名称,请重定义事件名称`)
+          return false
         }
-      },
-       //取消全部事件
-      resetForm() {
-        this.$confirm('此操作将重置全部事件, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            if(this.type ==1 ){
-                this.$refs.ruleForm.resetFields();
-            }
-            this.formData=[
-                {
-                  questionName: '',
-                  eventDate: '',
-                  description: '',
-                  applicationScenarios: [],
-                }
-            ]
-            // this.$emit('formData', {list:this.formData,option:1})
-            this.$message.success('事件已全部重置')
-          }).catch(() => {   
-            this.$message.info('重置操作已取消')
-          });
-      },
-      // 关闭弹窗并清空数据
-      resetClose() {
-        this.$emit('resetClose',true)
-      },
-      // 增加事件
-      addRow() {
-        this.formData.push(
+        var edit = false
+        if (this.row) {
+          edit = true
+        }
+        console.log(list);
+        this.$emit('formData', { list: list, option: 1, edit })
+      } catch (error) {
+        this.$message.error(error)
+      }
+    },
+    //取消全部事件
+    resetForm() {
+      this.$confirm('此操作将重置全部事件, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (this.type == 1) {
+          this.$refs.ruleForm.resetFields();
+        }
+        this.formData = [
           {
             questionName: '',
             eventDate: '',
             description: '',
             applicationScenarios: [],
           }
-        )
-      },
-      //删除事件
-      deleteRow(row) {
-          this.formData.splice(row.$index,1)
-      },
-      // 查询事件
-      async questionEventList() {
-        await this.$api.eventQuery({}).then(res => {
-          if (res.code==200) {
-            this.questionNameArr = res.data.list
-          }
-        })
-      },
-      //通过接口获取建议数据
-      querySearchQuestion(queryString, cb) {
-        
-      },
-      // input框切换选择
-        handleSelectQuestion(val) {
-            let a=this.formData.findIndex(item => {
-                return item.id == val.id
-            })
-            
-            if (a == -1) {
-                // this.$set(this.formData,this.index,JSON.parse(JSON.stringify(val)))
-            } else {
-                this.$message.error('事件已存在')
-                this.$set(this.formData,this.index,{})
-                return false
-            }
-        },
-        //失去焦点
-        focus(ev,val){
-            
-        },
+        ]
+        // this.$emit('formData', {list:this.formData,option:1})
+        this.$message.success('事件已全部重置')
+      }).catch(() => {
+        this.$message.info('重置操作已取消')
+      });
     },
-  }
-  </script>
-  
-  <style lang="scss">
-.addEvent{
-    .dialog-footer{
-        text-align: center;
-    }
+    // 增加事件
+    addRow() {
+      this.formData.push(
+        {
+          questionName: '',
+          eventDate: '',
+          description: '',
+          applicationScenarios: [],
+        }
+      )
+    },
+    //删除事件
+    deleteRow(row) {
+      this.formData.splice(row.$index, 1)
+    },
+    // 查询所有事件
+    async questionEventList() {
+      await this.$api.eventQuery({}).then(res => {
+        if (res.code == 200) {
+          this.questionNameArr = res.data.list
+        }
+      })
+    },
+    //通过接口获取建议数据
+    querySearchQuestion(queryString, cb) {
+      
+      
+    },
+    // input框切换选择
+    handleSelectQuestion(val) {
+      let a = this.formData.findIndex(item => {
+        return item.id == val.id
+      })
+
+      if (a == -1) {
+        // this.$set(this.formData,this.index,JSON.parse(JSON.stringify(val)))
+      } else {
+        this.$message.error('事件已存在')
+        this.$set(this.formData, this.index, {})
+        return false
+      }
+    },
+    //失去焦点
+    focus(ev, val) {
+
+    },
+  },
 }
-  .twj-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
-      border:none !important;
-  }
-  .twj-table::before {
-      background-color: transparent;
-  }
-  .twj-table tr td:first-child{
-    border-right: none !important;
-    border-left: none !important;
-    }
-.twj-table tr td:last-child{
-        border-right: none !important;
-        border-left:none !important;
-    }
-  </style>
-  <style lang="scss">
-  .btn {
-    color: black;
-    margin-left: 10px;
-    font-size: 18px;
+</script>
+  
+<style lang="scss">
+.addEvent {
+  .dialog-footer {
     text-align: center;
-    cursor: pointer;
   }
-  .btn:hover {
-    color: aqua;
-  }
-  </style>
+}
+
+.twj-table td.el-table__cell,
+.el-table th.el-table__cell.is-leaf {
+  border: none !important;
+}
+
+.twj-table::before {
+  background-color: transparent;
+}
+
+.twj-table tr td:first-child {
+  border-right: none !important;
+  border-left: none !important;
+}
+
+.twj-table tr td:last-child {
+  border-right: none !important;
+  border-left: none !important;
+}
+</style>
+<style lang="scss">
+.btn {
+  color: black;
+  margin-left: 10px;
+  font-size: 18px;
+  text-align: center;
+  cursor: pointer;
+}
+
+.btn:hover {
+  color: aqua;
+}
+</style>

+ 161 - 177
src/views/event/components/index.vue

@@ -3,25 +3,24 @@
     <el-container>
       <el-header>
         <div>
-          <mySearch style="width: 500px" :SearchFields="searchFiled"  @search="search" :searchValue="searchOption"></mySearch>
+          <mySearch style="width: 500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption">
+          </mySearch>
         </div>
         <div style="display: flex">
           <div>
             <span>分组查询:</span>
             <el-select v-model="groupingValue" size="small" @change="changeGrouping" style="width: 120px">
-              <el-option
-                v-for="item in groupingOption"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+              <el-option v-for="item in groupingOption" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </div>
           <el-button-group style=" display: flex; justify-content: flex-start; margin-left: 10px;">
-            <el-button size="small" :type="viewSelected === 'visual' ? 'primary' : ''" @click="onChange2('visual')">可视化</el-button>
-            <el-button :type="viewSelected === 'Table' ? 'primary' : ''" @click="onChange2('Table')" size="small">列表</el-button>
-            <el-button :type="viewSelected === 'Card' ? 'primary' : ''" @click="onChange2('Card')" size="small">卡片</el-button>
+            <el-button size="small" :type="viewSelected === 'visual' ? 'primary' : ''"
+              @click="onChange2('visual')">可视化</el-button>
+            <el-button :type="viewSelected === 'Table' ? 'primary' : ''" @click="onChange2('Table')"
+              size="small">列表</el-button>
+            <el-button :type="viewSelected === 'Card' ? 'primary' : ''" @click="onChange2('Card')"
+              size="small">卡片</el-button>
           </el-button-group>
           <el-dropdown trigger="click" split-button type="primary" size="small" @command="handleCommand($event)">
             <P @click="handleCommand('1')">添加事件</P>
@@ -34,30 +33,15 @@
       </el-header>
       <el-main id="patent-list-container" class="main" v-loading="loading">
         <div class="height_100">
-          <component
-            v-if="showView"
-            ref="questionViewList"
-            :is="viewSelected"
-            :queryParams="queryParams"
-            :tableData="tableData"
-            :column="columnList"
-            :commonData="commonData"
-            v-bind="$attrs"
-            @on-sort="handleSort"
-            @option="handleOption"
-          ></component>
+          <component v-if="showView" ref="questionViewList" :is="viewSelected" :queryParams="queryParams"
+            :tableData="tableData" :column="columnList" :commonData="commonData" v-bind="$attrs" @on-sort="handleSort"
+            @option="handleOption"></component>
         </div>
       </el-main>
       <el-footer class="workspace-content-patent-page">
-        <el-pagination
-          background
-          layout="total, sizes, prev, pager, next, jumper"
-          :current-page.sync="queryParams.current"
-          :page-size.sync="queryParams.size"
-          @current-change="handleCurrentChange"
-          @size-change="getList()"
-          :total="total"
-        >
+        <el-pagination background layout="total, sizes, prev, pager, next, jumper"
+          :current-page.sync="queryParams.current" :page-size.sync="queryParams.size"
+          @current-change="handleCurrentChange" @size-change="getList()" :total="total">
         </el-pagination>
       </el-footer>
     </el-container>
@@ -79,150 +63,150 @@ export default {
     addEvent
   },
   props: {
-    eventName:'',
-    applicationScenario:null
+    eventName: '',
+    applicationScenario: null
   },
   data() {
     return {
-        //检索字段
-        searchFiled:[
-            {
-                label:'事件名称',
-                value:'questionName',
-                type:1,
-                placeholder:'请输入事件名称'
-            }
-        ],
-        //检索条件
-        searchOption:{
-            questionName:this.eventName,
-            applicationScenario:this.applicationScenario
+      //检索字段
+      searchFiled: [
+        {
+          label: '事件名称',
+          value: 'questionName',
+          type: 1,
+          placeholder: '请输入事件名称'
+        }
+      ],
+      //检索条件
+      searchOption: {
+        questionName: this.eventName,
+        applicationScenario: this.applicationScenario
+      },
+      //分组的值
+      groupingValue: 'noGrouping',
+      //分组
+      groupingOption: [
+        {
+          label: '不分组',
+          value: 'noGrouping',
+        },
+        {
+          label: '应用场景',
+          value: 'scenarioName',
+        },
+        {
+          label: '创建人',
+          value: 'createName',
         },
-        //分组的值
-        groupingValue: 'noGrouping',
-        //分组
-        groupingOption: [
-            {
-                label: '不分组',
-                value: 'noGrouping',
-            },
-            {
-                label: '应用场景',
-                value: 'scenarioName',
-            },
-            {
-                label: '创建人',
-                value: 'createName',
-            },
-            {
-                label: '创建时间',
-                value: 'createTime',
-            },
-        ],
-        //选择的视图
-        viewSelected:'Table',
-        //加载中
-        loading:false,
-        //事件的数据集合
-        tableData:[{}],
-        //分页信息
-        queryParams:{
-            current:1,
-            size:10
+        {
+          label: '创建时间',
+          value: 'createTime',
         },
-        //总条数
-        total:0,
-        //排序
-        sort:{},
-        //显示栏位
-        columnList:[],
-        //分组数据
-        commonData:[],
-        //显示视图
-        showView:false
+      ],
+      //选择的视图
+      viewSelected: 'Table',
+      //加载中
+      loading: false,
+      //事件的数据集合
+      tableData: [{}],
+      //分页信息
+      queryParams: {
+        current: 1,
+        size: 10
+      },
+      //总条数
+      total: 0,
+      //排序
+      sort: {},
+      //显示栏位
+      columnList: [],
+      //分组数据
+      commonData: [],
+      //显示视图
+      showView: false
     };
   },
   watch: {},
   computed: {},
-  created() {},
+  created() { },
   mounted() {
     this.getColumn()
   },
   methods: {
     //显示视图
-    showViews(){
-        this.showView = false
-        this.$nextTick(()=>{
-            this.showView = true
-        })
+    showViews() {
+      this.showView = false
+      this.$nextTick(() => {
+        this.showView = true
+      })
     },
     //获取栏位
-    getColumn(){
-        this.columnList = [
-            {
-            "key": "name",
-            "name": "事件名称",
-            "type": "list",
-            "order": 0,
-            "hidden": true
-          },
-          {
-            "key": "eventNumber",
-            "name": "相关报告数量",
-            "type": "list",
-            "order": 0,
-            "hidden": true
-          },
-          {
-            "key": "projectNumber",
-            "name": "相关专题库数量",
-            "type": "list",
-            "order": 0,
-            "hidden": true
-          },
-          {
-            "key": "projectNumber1",
-            "name": "事件场景",
-            "type": "list",
-            "order": 0,
-            "hidden": true
-          },
-          {
-            "key": "projectNumber2",
-            "name": "事件时间",
-            "type": "list",
-            "order": 0,
-            "hidden": true
-          },
-          {
-            "key": "projectNumber3",
-            "name": "描述",
-            "type": "list",
-            "order": 0,
-            "hidden": true
-          },
-          {
-            "key": "projectNumber4",
-            "name": "创建人",
-            "type": "list",
-            "order": 0,
-            "hidden": true
-          },
-          {
-            "key": "time",
-            "name": "创建时间",
-            "type": "list",
-            "order": 0,
-            "hidden": true
-          },
-        ]
-        this.showView = false
-        this.$nextTick(()=>{
-            this.showView = true
-        })
+    getColumn() {
+      this.columnList = [
+        {
+          "key": "name",
+          "name": "事件名称",
+          "type": "list",
+          "order": 0,
+          "hidden": true
+        },
+        {
+          "key": "eventNumber",
+          "name": "相关报告数量",
+          "type": "list",
+          "order": 0,
+          "hidden": true
+        },
+        {
+          "key": "projectNumber",
+          "name": "相关专题库数量",
+          "type": "list",
+          "order": 0,
+          "hidden": true
+        },
+        {
+          "key": "projectNumber1",
+          "name": "事件场景",
+          "type": "list",
+          "order": 0,
+          "hidden": true
+        },
+        {
+          "key": "projectNumber2",
+          "name": "事件时间",
+          "type": "list",
+          "order": 0,
+          "hidden": true
+        },
+        {
+          "key": "projectNumber3",
+          "name": "描述",
+          "type": "list",
+          "order": 0,
+          "hidden": true
+        },
+        {
+          "key": "projectNumber4",
+          "name": "创建人",
+          "type": "list",
+          "order": 0,
+          "hidden": true
+        },
+        {
+          "key": "time",
+          "name": "创建时间",
+          "type": "list",
+          "order": 0,
+          "hidden": true
+        },
+      ]
+      this.showView = false
+      this.$nextTick(() => {
+        this.showView = true
+      })
     },
     //获取检索条件检索
-    search(val){
+    search(val) {
 
     },
 
@@ -233,47 +217,47 @@ export default {
     },
 
     //查询事件数据
-    getList(){
+    getList() {
 
     },
 
     //切换分组值
-    changeGrouping(val){
+    changeGrouping(val) {
 
     },
 
     //切换视图
     onChange2(type) {
       this.viewSelected = type
+      this.getList()
     },
 
     //新增事件的选项(1是添加单个事件,2是批量添加)
-    handleCommand(e){
-       this.$refs.addEvent.open(null,e)
+    handleCommand(e) {
+      this.$refs.addEvent.open(null, e)
     },
 
     //获取排序字段
-    handleSort(val){
+    handleSort(val) {
 
     },
 
     //表格操作列(option为操作类型,row为当前行数据,type为报告类型)
-    handleOption({ option, row ,type}){
-        switch(option){
-            case '1'://新增专题库
-                break;
-            case 'addReport'://新增报告
-                break;
-            case '3'://删除
-                break;
-            case 'cancel'://取消关联
-                break;
-            case 'edit'://编辑事件
-                break;
-        }
+    handleOption({ option, row, type }) {
+      switch (option) {
+        case '1'://新增专题库
+          break;
+        case 'addReport'://新增报告
+          break;
+        case '3'://删除
+          break;
+        case 'cancel'://取消关联
+          break;
+        case 'edit'://编辑事件
+          break;
+      }
     },
   },
 };
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

+ 79 - 75
src/views/event/components/view/card.vue

@@ -1,79 +1,83 @@
 <template>
-    <div>
-      <el-row :gutter="12">
-              <el-col :span="6" v-for="(item,itemIndex) in tableData" :key="itemIndex" style="height:420px">
-                  <el-card shadow="always" style="background:white;box-shadow:2px 2px 10px #909090" class="card">
-                      <div style="display:flex;justify-content:space-between;align-items:center">
-                          <p style="font-size:18px"><span># {{ (itemIndex + 1) + ((queryParams.current - 1) * queryParams.size) }}</span></p>
-                          <div class="fun" style="color:blue;display:flex;justify-content: flex-end;" v-if="!projectId && !show">
-                              <span style="margin-right: 10px;"  @click="handleEdit(item)" v-if="true">编辑</span>
-                              <span style="margin-right: 10px;"  @click="handleEdit(item)" v-else>查看</span>
-                              <el-dropdown @command="handleCommand($event, item)" trigger="click">
-                              <span class="el-dropdown-link">
-                                  <i class="el-icon-more" style="font-size: 16px;"></i>
-                              </span>
-                              <el-dropdown-menu slot="dropdown" class="text-align_center" >
-                                  <el-dropdown-item command="1">新增专题库</el-dropdown-item>
-                                  <el-dropdown-item>
-                                      <el-dropdown trigger="hover" placement="right-start">
-                                          <span class="el-dropdown-link"> 新增报告 </span>
-                                          <el-dropdown-menu  class="children_item" v-if="dictMessage.REPORT_TYPE">
-                                              <el-dropdown-item v-for="item1 in dictMessage.REPORT_TYPE.filter(item1=>!['6'].includes(item1.dictChildValue))" :key="item1.dictChildValue"  @click.native="handleAnalyse(item1.dictChildValue,item)" v-if="$permission('/pcs/report/add/' + item1.permission)">{{item1.dictChildLabel}}</el-dropdown-item>
-                                          </el-dropdown-menu>
-                                      </el-dropdown>
-                                  </el-dropdown-item>
-                                  <el-dropdown-item command="3" divided class="color-red">删除</el-dropdown-item>
-                              </el-dropdown-menu>
-                              </el-dropdown>         
-                          </div>
-                      </div>
-                      
-                      <p >
-                          <span style="font-weight:bolder">事件名称:</span> 
-                          <el-tooltip class="item" effect="light"  placement="top" :content="item.questionName">
-                              <el-link type="primary" @click="checkVisual(item.scenarioNames,item.id,item.questionName)">{{item.questionName}}</el-link>
-                          </el-tooltip>
-                      </p>
-                      <p><span style="font-weight:bolder">相关报告数量:</span>  <span>{{item.reportNum||0}}</span> </p>
-                      <p><span style="font-weight:bolder">相关专题库数量:</span>  <span>{{item.reportNum||0}}</span> </p>
-                      <p>
-                          <span style="font-weight:bolder">应用场景:</span> 
-                          <el-tooltip class="item" effect="light"  placement="top">
-                          <div slot="content"><span v-for="name in item.scenarioNames">{{name }}&nbsp;&nbsp;</span></div>
-                              <span v-if="item.scenarioNames">{{item.scenarioNames[0]}}
-                              <span v-if="item.scenarioNames.length>1">
-                              
-                              <span><img src="@/assets/img/更多.png" style="width:18px;vertical-align:bottom"/></span> 
-                              </span>  
-                              </span> 
-                          </el-tooltip>
-                      </p>
-                      <p><span style="font-weight:bolder">事件时间:</span>  <span>{{item.eventDate}}</span> </p>
-                      <p><span style="font-weight:bolder">描述:</span>  <span>{{item.description}}</span> </p>
-                      <p><span style="font-weight:bolder">创建人:</span>  <span>{{item.createPersonName}}</span> </p>
-                      <p><span style="font-weight:bolder">创建时间:</span>  <span>{{item.createTime}}</span> </p>
-                  </el-card>
-              </el-col> 
-          </el-row>
-    </div>
+  <div>
+    <el-row :gutter="12">
+      <el-col :span="6" v-for="(item, itemIndex) in tableData" :key="itemIndex" style="height:420px">
+        <el-card shadow="always" style="background:white;box-shadow:2px 2px 10px #909090" class="card">
+          <div style="display:flex;justify-content:space-between;align-items:center">
+            <p style="font-size:18px"><span># {{ (itemIndex + 1) + ((queryParams.current - 1) * queryParams.size)
+            }}</span></p>
+            <div class="fun" style="color:blue;display:flex;justify-content: flex-end;" v-if="!projectId && !show">
+              <span style="margin-right: 10px;" @click="handleEdit(item)" v-if="true">编辑</span>
+              <span style="margin-right: 10px;" @click="handleEdit(item)" v-else>查看</span>
+              <el-dropdown @command="handleCommand($event, item)" trigger="click">
+                <span class="el-dropdown-link">
+                  <i class="el-icon-more" style="font-size: 16px;"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="text-align_center">
+                  <el-dropdown-item command="1">新增专题库</el-dropdown-item>
+                  <el-dropdown-item>
+                    <el-dropdown trigger="hover" placement="right-start">
+                      <span class="el-dropdown-link"> 新增报告 </span>
+                      <el-dropdown-menu class="children_item" v-if="dictMessage.REPORT_TYPE">
+                        <el-dropdown-item
+                          v-for="item1 in dictMessage.REPORT_TYPE.filter(item1 => !['6'].includes(item1.dictChildValue))"
+                          :key="item1.dictChildValue" @click.native="handleAnalyse(item1.dictChildValue, item)"
+                          v-if="$permission('/pcs/report/add/' + item1.permission)">{{ item1.dictChildLabel }}</el-dropdown-item>
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                  </el-dropdown-item>
+                  <el-dropdown-item command="3" divided class="color-red">删除</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </div>
+
+          <p>
+            <span style="font-weight:bolder">事件名称:</span>
+            <el-tooltip class="item" effect="light" placement="top" :content="item.questionName">
+              <el-link type="primary"
+                @click="checkVisual(item.scenarioNames, item.id, item.questionName)">{{ item.questionName }}</el-link>
+            </el-tooltip>
+          </p>
+          <p><span style="font-weight:bolder">相关报告数量:</span> <span>{{ item.reportNum || 0 }}</span> </p>
+          <p><span style="font-weight:bolder">相关专题库数量:</span> <span>{{ item.reportNum || 0 }}</span> </p>
+          <p>
+            <span style="font-weight:bolder">应用场景:</span>
+            <el-tooltip class="item" effect="light" placement="top">
+              <div slot="content"><span v-for="name in item.scenarioNames">{{ name }}&nbsp;&nbsp;</span></div>
+              <span v-if="item.scenarioNames">{{ item.scenarioNames[0] }}
+                <span v-if="item.scenarioNames.length > 1">
+
+                  <span><img src="@/assets/img/更多.png" style="width:18px;vertical-align:bottom" /></span>
+                </span>
+              </span>
+            </el-tooltip>
+          </p>
+          <p><span style="font-weight:bolder">事件时间:</span> <span>{{ item.eventDate }}</span> </p>
+          <p><span style="font-weight:bolder">描述:</span> <span>{{ item.description }}</span> </p>
+          <p><span style="font-weight:bolder">创建人:</span> <span>{{ item.createPersonName }}</span> </p>
+          <p><span style="font-weight:bolder">创建时间:</span> <span>{{ item.createTime }}</span> </p>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
 </template>
   
 <script>
-  import mixins from '../mixins';
-  export default {
-    components: {},
-    props: {},
-    mixins:[mixins],
-    data() {
-      return {
-      };
-    },
-    watch: {},
-    computed: {},
-    created() {},
-    mounted() {},
-    methods: {},
-  };
-  </script>
-  <style lang="scss" scoped>
-  </style>
+import mixins from '../mixins';
+export default {
+  components: {},
+  props: {},
+  mixins: [mixins],
+  data() {
+    return {
+    };
+  },
+  watch: {},
+  computed: {},
+  created() { },
+  mounted() { },
+  methods: {},
+};
+</script>
+<style lang="scss" scoped></style>

+ 103 - 102
src/views/event/components/view/mergeTable.vue

@@ -1,111 +1,112 @@
 <template>
-    <div>
-      <el-table :data="commonData" header-row-class-name="custom-table-header" @expand-change="expandChange" >
-        <el-table-column type="expand">
-          <template slot-scope="props">
-            <Table :data="showData[props.row.index]" :column="column" @option="handleOption" />
-          </template>
-        </el-table-column>
-        <el-table-column v-for="column in columnList" :label="column.label" :prop="column.prop" show-overflow-tooltip></el-table-column>
-      </el-table>
-    </div>
+  <div>
+    <el-table :data="commonData" header-row-class-name="custom-table-header" @expand-change="expandChange">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <Table :data="showData[props.row.index]" :column="column" @option="handleOption" />
+        </template>
+      </el-table-column>
+      <el-table-column v-for="column in columnList" :label="column.label" :prop="column.prop"
+        show-overflow-tooltip></el-table-column>
+    </el-table>
+  </div>
 </template>
   
-  <script>
-  import Table from "./table";
-  
-  export default {
-    props: {
-      commonData: Object,
-      column: {//显示栏位管理数组
-        type: Array,
-        default: () => {
-          return [
-            {
-              "key": "name",
-              "name": "事件名称",
-              "type": "list",
-              "order": 0,
-              "hidden": true
-            },
-            {
-              "key": "eventNumber",
-              "name": "相关报告数量",
-              "type": "list",
-              "order": 0,
-              "hidden": true
-            },
-            {
-              "key": "projectNumber",
-              "name": "相关专题库数量",
-              "type": "list",
-              "order": 0,
-              "hidden": true
-            },
-            {
-              "key": "projectNumber1",
-              "name": "事件场景",
-              "type": "list",
-              "order": 0,
-              "hidden": true
-            },
-            {
-              "key": "projectNumber2",
-              "name": "事件时间",
-              "type": "list",
-              "order": 0,
-              "hidden": true
-            },
-            {
-              "key": "projectNumber3",
-              "name": "描述",
-              "type": "list",
-              "order": 0,
-              "hidden": true
-            },
-            {
-              "key": "projectNumber4",
-              "name": "创建人",
-              "type": "list",
-              "order": 0,
-              "hidden": true
-            },
-            {
-              "key": "time",
-              "name": "创建时间",
-              "type": "list",
-              "order": 0,
-              "hidden": true
-            },
-          ]
-        }
-      }
-    },
-    mixins: [],
-    components: {
-      Table
-    },
-    data() {
-      return {
-        columnList: [],
-        tableData: [],
-        showData: []
+<script>
+import Table from "./table";
+
+export default {
+  props: {
+    commonData: Object,
+    column: {//显示栏位管理数组
+      type: Array,
+      default: () => {
+        return [
+          {
+            "key": "name",
+            "name": "事件名称",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "eventNumber",
+            "name": "相关报告数量",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "projectNumber",
+            "name": "相关专题库数量",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "projectNumber1",
+            "name": "事件场景",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "projectNumber2",
+            "name": "事件时间",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "projectNumber3",
+            "name": "描述",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "projectNumber4",
+            "name": "创建人",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "time",
+            "name": "创建时间",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+        ]
       }
+    }
+  },
+  mixins: [],
+  components: {
+    Table
+  },
+  data() {
+    return {
+      columnList: [],
+      tableData: [],
+      showData: []
+    }
+  },
+  watch: {
+  },
+  mounted() {
+  },
+  methods: {
+    //操作列事件
+    handleOption(data) {
+      this.$emit('option', data)
     },
-    watch: {
-    },
-    mounted() {
-    },
-    methods: {
-      //操作列事件
-      handleOption(data) {
-        this.$emit('option', data)
-      },
-      //打开展开行获取数据并保存起来
-      expandChange(){
+    //打开展开行获取数据并保存起来
+    expandChange() {
 
-      }
     }
   }
-  </script>
+}
+</script>
   

+ 48 - 47
src/views/event/components/view/table.vue

@@ -1,53 +1,56 @@
 <template>
   <div class="eventTable height_100">
-      <el-table :data="tableData" header-row-class-name="custom-table-header">
-        <el-table-column label="#" width="60" type="index" align="center">
-          <template slot-scope="scope">
-            <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
-          </template>
-        </el-table-column>
+    <el-table :data="tableData" header-row-class-name="custom-table-header">
+      <el-table-column label="#" width="60" type="index" align="center">
+        <template slot-scope="scope">
+          <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
+        </template>
+      </el-table-column>
 
-        <el-table-column v-for="item in column" :key="item.key" :prop="item.key" :label="item.name" align="center">
-          <template slot-scope="scope">
-            <div v-if="['name', 'eventNumber', 'projectNumber'].includes(item.key)">
-              <el-link @click="handleItem(scope.row,item.key)">{{ scope.row[item.key] }}</el-link>
-            </div>
-            <div v-else v-html="getColumnData(scope.row,item.key)"></div>
-          </template>
-        </el-table-column>
+      <el-table-column v-for="item in column" :key="item.key" :prop="item.key" :label="item.name" align="center">
+        <template slot-scope="scope">
+          <div v-if="['name', 'eventNumber', 'projectNumber'].includes(item.key)">
+            <el-link @click="handleItem(scope.row, item.key)">{{ scope.row[item.key] }}</el-link>
+          </div>
+          <div v-else v-html="getColumnData(scope.row, item.key)"></div>
+        </template>
+      </el-table-column>
 
-        <el-table-column v-if="isOperate != '首页'" label="操作" align="center" width="150px">
-          <template slot-scope="scope">
-            <el-dropdown split-button type="primary" size="small" @click="handleClick($event,scope.row)"
-              @command="handleCommand($event,scope.row)">
-              <p>编 辑</p>
-              <el-dropdown-menu slot="dropdown" style="text-align:center">
-                <el-dropdown-item command="0">新增专题库</el-dropdown-item>
-                <el-dropdown-item>
-                  <el-dropdown trigger="hover" placement="right-start">
-                    <span class="el-dropdown-link"> 新增报告 </span>
-                    <el-dropdown-menu  class="children_item" v-if="dictMessage.REPORT_TYPE">
-                        <el-dropdown-item v-for="item in dictMessage.REPORT_TYPE.filter(item=>!['6'].includes(item.dictChildValue))" :key="item.dictChildLabel"  @click.native="handleAnalyse(item.dictChildValue,scope.row)" v-if="$permission('/pcs/report/add/' + item.permission)">{{item.dictChildLabel}}</el-dropdown-item>
-                    </el-dropdown-menu>
-                </el-dropdown> 
-                </el-dropdown-item>
-                <el-dropdown-item command="10" divided style="color:red">删 除</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
-      </el-table>
+      <el-table-column v-if="isOperate != '首页'" label="操作" align="center" width="150px">
+        <template slot-scope="scope">
+          <el-dropdown split-button type="primary" size="small" @click="handleClick($event, scope.row)"
+            @command="handleCommand($event, scope.row)">
+            <p>编 辑</p>
+            <el-dropdown-menu slot="dropdown" style="text-align:center">
+              <el-dropdown-item command="0">新增专题库</el-dropdown-item>
+              <el-dropdown-item>
+                <el-dropdown trigger="hover" placement="right-start">
+                  <span class="el-dropdown-link"> 新增报告 </span>
+                  <el-dropdown-menu class="children_item" v-if="dictMessage.REPORT_TYPE">
+                    <el-dropdown-item
+                      v-for="item in dictMessage.REPORT_TYPE.filter(item => !['6'].includes(item.dictChildValue))"
+                      :key="item.dictChildLabel" @click.native="handleAnalyse(item.dictChildValue, scope.row)"
+                      v-if="$permission('/pcs/report/add/' + item.permission)">{{ item.dictChildLabel }}</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </el-dropdown-item>
+              <el-dropdown-item command="10" divided style="color:red">删 除</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 
 <script>
 import mixins from '../mixins';
 export default {
-  mixins:[mixins],
+  mixins: [mixins],
   props: {
     isOperate: {//控制显示
       type: String,
-      default:''
+      default: ''
     },
     column: {//显示栏位管理数组
       type: Array,
@@ -115,27 +118,27 @@ export default {
   },
   data() {
     return {
-      
+
     };
   },
   watch: {
-    
+
   },
   mounted() {
-   
+
   },
   methods: {
     // 点击名称等事件
-    handleItem(row,key) {
+    handleItem(row, key) {
       // console.log(row,key);
     },
     // 
-    getColumnData(row,key) {
+    getColumnData(row, key) {
       if (key == 'projectNumber1') {
         if (row[key]) {
-          var a=''
+          var a = ''
           row[key].forEach(item => {
-            a+=item.name + '</br>'
+            a += item.name + '</br>'
           });
           return a
         } else {
@@ -148,8 +151,6 @@ export default {
 };
 </script>
 <style lang="scss">
-.eventTable {
-
-}
+.eventTable {}
 </style>
 <style lang="scss" scoped></style>

+ 1 - 1
src/views/product/components/commodity/view/table.vue

@@ -2,7 +2,7 @@
   <!-- 商品化专利table -->
   <div class="commodityTable">
     <el-table :data="tableData" style="width: 100%" header-row-class-name="custom-table-header">
-      <el-table-column width="80" align="center" v-if="!structureId">
+      <el-table-column width="80" align="center">
         <template slot-scope="scope">
           <div>
             <el-checkbox-group v-model="checkList" style="display:inline-block">