预警告警

src/components/TableModel/index.vue

@@ -2,55 +2,165 @@
     <!-- 表格公共组件 -->
     <div>
         <!-- 表单搜索 -->
-    <el-form :model="queryParams" ref="queryFormRef" size="small" :inline="true" label-width="100px" v-show="showSearch"
+        <el-form
-      :rules="formRules">
+            :model="queryParams"
-      <el-form-item v-for="(item, v) in formLabel" :key="v" :label="item.f_label" :prop="item.f_model">
+            ref="queryFormRef"
-        <el-input v-if="item.f_type === 'ipt'" v-model="queryParams[item.f_model]" :placeholder="`请输入${item.f_label}`"
+            size="small"
-          clearable style="width: 240px" />
+            :inline="true"
-        <el-select v-if="item.f_type === 'sel'" v-model="queryParams[item.f_model]" clearable filterable
+            label-width="100px"
-          style="width: 240px" :placeholder="`请选择${item.f_label}`">
+            v-show="showSearch"
-          <el-option v-for="(sel, v) in item.f_selList" :key="v" :label="sel.label" :value="sel.value" />
+            :rules="formRules"
+        >
+            <el-form-item
+                v-for="(item, v) in formLabel"
+                :key="v"
+                :label="item.f_label"
+                :prop="item.f_model"
+            >
+                <el-input
+                    v-if="item.f_type === 'ipt'"
+                    v-model="queryParams[item.f_model]"
+                    :placeholder="`请输入${item.f_label}`"
+                    clearable
+                    style="width: 240px"
+                />
+                <el-select
+                    v-if="item.f_type === 'sel'"
+                    v-model="queryParams[item.f_model]"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                    :placeholder="`请选择${item.f_label}`"
+                >
+                    <el-option
+                        v-for="(sel, v) in item.f_selList"
+                        :key="v"
+                        :label="sel.label"
+                        :value="sel.value"
+                    />
                 </el-select>
-        <el-cascader v-if="item.f_type === 'selCasAdd'" v-model="queryParams[item.f_model]" :options="item.f_selList"
+                <el-cascader
-          :props="item.optionProps" :show-all-levels="false" clearable
+                    v-if="item.f_type === 'selCasAdd'"
-          @change="handleCasAdd($event, item.f_model, cascaderFunc, extraTableProp)" style="width: 240px" />
+                    v-model="queryParams[item.f_model]"
-        <el-cascader v-if="item.f_type === 'selCas'" v-model="queryParams[item.f_model]" :options="item.f_selList"
+                    :options="item.f_selList"
-          :props="item.optionProps" :show-all-levels="false" @change="handleCas($event, item.f_model)"
+                    :props="item.optionProps"
-          style="width: 240px" />
+                    :show-all-levels="false"
-        <el-date-picker v-if="item.f_type === 'date'" v-model="queryParams[item.f_model]" style="width: 240px"
+                    clearable
-          value-format="yyyy-MM-dd" type="date" :placeholder="`请输入${item.f_label}`" />
+                    @change="handleCasAdd($event, item.f_model, cascaderFunc, extraTableProp)"
-        <el-date-picker v-if="item.f_type === 'dateRange'" v-model="timeList" style="width: 240px"
+                    style="width: 240px"
-          type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
+                />
-          end-placeholder="结束日期" @change="onChangeTime($event,item.dateType)" />
+                <el-cascader
-        <el-input-number v-if="item.f_type === 'num'" v-model="queryParams[item.f_model]" :min="0"
+                  v-if="item.f_type === 'selCas'"
-          style="width: 240px"></el-input-number>
+                  v-model="queryParams[item.f_model]"
+                  :options="item.f_selList"
+                  :props="item.optionProps"
+                  :show-all-levels="false"
+                  @change="handleCas($event, item.f_model)"
+                  style="width: 240px"
+                />
+                <el-date-picker
+                    v-if="item.f_type === 'date'"
+                    v-model="queryParams[item.f_model]"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                     :placeholder="`请输入${item.f_label}`"
+                />
+                <el-date-picker
+                  v-if="item.f_type === 'dateRange'"
+                  v-model="queryParams[item.f_model]"
+                  style="width: 240px"
+                  type="daterange"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                />
+                <el-input-number
+                  v-if="item.f_type === 'num'"
+                  v-model="queryParams[item.f_model]"
+                  :min="0"
+                  style="width: 240px"
+                ></el-input-number>
             </el-form-item>
             <el-form-item v-if="showBtnCrews">
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+                <el-button
-          v-if="showSearchBtn">查询</el-button>
+                    type="primary"
-        <el-button type="success" icon="el-icon-edit" size="mini" @click="handleFill"
+                    icon="el-icon-search"
-          v-if="!showSearchBtn">填充</el-button>
+                    size="mini"
-        <el-button type="warning" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                    @click="handleQuery"
+                    v-if="showSearchBtn"
+                    >查询</el-button
+                >
+                <el-button
+                    type="success"
+                    icon="el-icon-edit"
+                    size="mini"
+                    @click="handleFill"
+                    v-if="!showSearchBtn"
+                    >填充</el-button
+                >
+                <el-button
+                    type="warning"
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
             </el-form-item>
         </el-form>
         <!-- 按钮集群 -->
-    <el-row class="btn-container">
+        <el-row class="btn-container" >
             <div class="btn-handler">
                 <slot name="btn" :queryParams="queryParams"></slot>
             </div>
-      <ToolbarModel :showSearch.sync="showSearch" :indexNumShow.sync="indexNumShow" :selectionShow.sync="selectionShow"
+            <ToolbarModel
-        :handleShow.sync="handleShow" :columns="columCheckList" @queryTable="getTableList" v-if="showRightTools" />
+                :showSearch.sync="showSearch"
+                :indexNumShow.sync="indexNumShow"
+                :selectionShow.sync="selectionShow"
+                :handleShow.sync="handleShow"
+                :columns="columCheckList"
+                @queryTable="getTableList"
+                v-if="showRightTools"
+            />
         </el-row>
         <!-- 表格 -->
 
-    <el-table :data="tableList" border ref="tableRef" select-on-indeterminate style="width: 100%" v-loading="loading"
+        <el-table
+            :data="tableList"
+            border
+            ref="tableRef"
+            select-on-indeterminate
+            style="width: 100%"
+            v-loading="loading"
             @selection-change="handleSelectionChange">
         >
-      <el-table-column type="selection" width="45" align="center" v-if="showSel" :selectable="selectable" />
+            <el-table-column
-      <el-table-column width="55" align="center" label="序号" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)
+                type="selection"
-        " v-if="showIndex" />
+                width="45"
-      <el-table-column v-for="(item, v) in tableColumCheckProps" :key="v" :label="item.t_label" :prop="item.t_props"
+                align="center"
-        :width="item.t_width" align="center" show-overflow-tooltip>
+                v-if="showSel"
+                :selectable="selectable"
+            />
+            <el-table-column
+                width="55"
+                align="center"
+                label="序号"
+                type="index"
+                :index="
+                    indexContinuation(queryParams.pageNum, queryParams.pageSize)
+                "
+                v-if="showIndex"
+            />
+            <el-table-column
+                v-for="(item, v) in tableColumCheckProps"
+                :key="v"
+                :label="item.t_label"
+                :prop="item.t_props"
+                :width="item.t_width"
+                align="center"
+                show-overflow-tooltip
+            >
                 <template slot-scope="scope">
                     <!-- 判断当前列数据是否需要使用插槽的数据 -->
                     <template v-if="item.t_slot">
@@ -61,7 +171,12 @@
                     </template>
                 </template>
             </el-table-column>
-      <el-table-column align="center" label="操作" v-if="handleShow && showOperation" :min-width="dynamicWidth">
+            <el-table-column
+                align="center"
+                label="操作"
+                v-if="handleShow && showOperation"
+                :min-width="dynamicWidth"
+            >
                 <template slot-scope="{ row }">
                     <div class="optionDivRef">
                         <slot :data="row" name="handle">-</slot>
@@ -71,8 +186,12 @@
         </el-table>
 
         <!-- 分页 -->
-    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        <pagination
-      @pagination="getTableList" />
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getTableList"
+        />
     </div>
 </template>
 
@@ -89,7 +208,7 @@ export default {
         /** 列表请求接口 */
         requestApi: {
             type: Function,
-      default: () => function () { },
+            default: () => function () {},
         },
         /** 列表配置项 */
         columnsList: {
@@ -168,7 +287,7 @@ export default {
         },
         columnsList: {
             handler(nv, ov) {
-        if (nv !== ov) {
+                if(nv !== ov) {
                     this.columnsList = nv
                     this.columCheckList = this.columnsList.map(e => {
                       this.$set(e, 'checked', true)
@@ -220,9 +339,7 @@ export default {
             columCheckList: [],
             // 操作列最小宽度
             dynamicWidth: 0,
-      idCount: 1,
+            idCount: 1
-      timeList:[],
-      typeList:[]
         }
     },
 
@@ -233,17 +350,9 @@ export default {
         })
         /* 生成查询参数 */
         this.formLabel.map(e => {
-      
-
-      if(e.f_type === 'dateRange') {
-        this.$set(this.queryParams, e.dateType[0], '')
-        this.$set(this.queryParams, e.dateType[1], '')
-        this.typeList = e.dateType
-      } else {
             this.$set(this.queryParams, e.f_model, '')
-      }
             // 设置表单必填
-      if (e.f_rule) {
+            if(e.f_rule) {
               this.$set(this.formRules, e.f_rule, [
                 {
                   required: true,
@@ -253,14 +362,14 @@ export default {
               ])
             }
         })
-    if (this.sendParams !== null) {
+        if(this.sendParams !== null) {
           Object.assign(this.queryParams, this.sendParams)
           /* for(let key in this.sendParams) {
             console.log(key, this.sendParams[key])
             this.$set(this.queryParams, key, this.sendParams[key])
           } */
         }
-    if (this.sendId !== null) this.queryParams.id = this.sendId
+        if(this.sendId !== null) this.queryParams.id = this.sendId
         this.getTableList()
     },
     updated() {
@@ -270,52 +379,45 @@ export default {
     methods: {
         /** 获取列表数据 */
         async getTableList() {
-      console.log(this.queryParams, '请求参数')
+          if(this.queryParams.time && this.queryParams.time.length !== 0) {
+            this.queryParams.startTime = this.queryParams.time[0]
+            this.queryParams.endTime = this.queryParams.time[1]
+            delete this.queryParams.time
+          }
+          console.log(this.queryParams)
+          if(Object.keys(this.formRules).length !== 0) {
+            this.$refs.queryFormRef.validate(async valid => {
+              if (valid) {
+                this.loading = true
                 const res = await this.requestApi(this.queryParams)
-
+                this.loading = false
                 console.log(res, '列表数据')
-
+                if (res.code === 200) {
+                  if (res.data) {
+                    this.tableList = res.data.rows || res.data
+                    this.total = res.data.total || res.data.length
+                  } else {
+                    this.tableList = res.rows || res.data
+                    this.total = res.data.total || res.rows.length
+                  }
+                }
+              }
+            })
+          } else {
+            this.loading = true
+            const res = await this.requestApi(this.queryParams)
+            this.loading = false
+            console.log(res, '列表数据2')
+            if (res.code === 200) {
+              if (res.data) {
                 this.tableList = res.data.rows || res.data
                 this.total = res.data.total
-      // if(this.queryParams.time && this.queryParams.time.length !== 0) {
+              } else {
-      //   this.queryParams.startTime = this.queryParams.time[0]
+                this.tableList = res.rows || res.data
-      //   this.queryParams.endTime = this.queryParams.time[1]
+                this.total = res.total
-      //   delete this.queryParams.time
+              }
-      // }
+            }
-      // console.log(this.queryParams)
+          }
-      // if(Object.keys(this.formRules).length !== 0) {
-      //   this.$refs.queryFormRef.validate(async valid => {
-      //     if (valid) {
-      //       this.loading = true
-      //       const res = await this.requestApi(this.queryParams)
-      //       this.loading = false
-      //       console.log(res, '列表数据')
-      //       if (res.code === 200) {
-      //         if (res.data) {
-      //           this.tableList = res.data.rows || res.data
-      //           this.total = res.data.total || res.data.length
-      //         } else {
-      //           this.tableList = res.rows || res.data
-      //           this.total = res.data.total || res.rows.length
-      //         }
-      //       }
-      //     }
-      //   })
-      // } else {
-      //   this.loading = true
-      //   const res = await this.requestApi(this.queryParams)
-      //   this.loading = false
-      //   console.log(res, '列表数据2')
-      //   if (res.code === 200) {
-      //     if (res.data) {
-      //       this.tableList = res.data.rows || res.data
-      //       this.total = res.data.total
-      //     } else {
-      //       this.tableList = res.rows || res.data
-      //       this.total = res.total
-      //     }
-      //   }
-      // }
 
         },
         /** 查询按钮 */
@@ -331,13 +433,6 @@ export default {
         /** 重置按钮 */
         resetQuery() {
             this.$refs.queryFormRef.resetFields()
-      this.timeList = []
-      if(this.typeList.length > 0) {
-        this.queryParams[this.typeList[0]] = ''
-        this.queryParams[this.typeList[1]] = ''
-      }
-      // this.queryParams[this.typeList[0]] = ''
-      // this.queryParams[this.typeList[1]] = ''
             this.queryParams.pageNum = 1
             this.queryParams.pageSize = 10
             this.getTableList()
@@ -353,11 +448,11 @@ export default {
           func,
           prop
         ) {
-      if (e.length !== 0) {
+          if(e.length !== 0) {
             this.queryParams[val] = e[e.length - 1]
             let setObj = {}
             // 合并
-        if (prop) {
+            if(prop) {
               Object.assign(setObj, prop)
             }
             // 设置id自增
@@ -370,8 +465,8 @@ export default {
               this.$set(setObj, 'name', res.data.parentName)
               this.$set(setObj, 'unitName', res.data.unitName)
               this.$set(setObj, 'typeName', res.data.name)
-        }).catch(err => { })
+            }).catch(err => {})
-        for (let key in this.queryParams) {
+            for(let key in this.queryParams) {
               this.$set(setObj, key, this.queryParams[key])
             }
             this.tableList.unshift(setObj)
@@ -416,17 +511,6 @@ export default {
           this.$emit('transIdList', this.msgList)
         },
 
-    /* 时间change事件 */
-    onChangeTime(e,type) {
-      console.log(e, '时间',type)
-      const [_1,_2]= type
-      const [_time1,_time2] = e
-      if(e.length > 0) {
-        this.$set(this.queryParams, _1, _time1)
-        this.$set(this.queryParams, _2, _time2)   
-      }     
-    }
-
     },
 }
 </script>
@@ -437,7 +521,6 @@ export default {
     display: flex;
     align-items: center;
 }
-
 ::v-deep .btn-handler {
     flex: 1;
 

src/views/base/edgeInsert/components/form-insert-all.vue

@@ -74,6 +74,10 @@
           style="margin-bottom: 100px"
         >
         </TableModelTwo>
+
+
+
+        
         <el-form-item label="审核意见" prop="remarks">
 <!--          <textarea id="remarks" v-model="projectParams.remarks" class="el-textarea" placeholder="请输入审核意见" disabled></textarea>-->
                  <el-input :rows="4" type="textarea" v-model="projectParams.remarks" placeholder="请输入审核意见" disabled/>