diff --git a/src/api/systemData/dataInterface.js b/src/api/systemData/dataInterface.js
index 3568e5d..68cef67 100644
--- a/src/api/systemData/dataInterface.js
+++ b/src/api/systemData/dataInterface.js
@@ -1,13 +1,52 @@
 import request from '@/utils/request'
 
-// 获取字段列表
+// 查询需要判研的列表
+export function getListForJudge(data) {
+  return request({
+      url: `/Extend/BaseInspectionReport/GetListForJudge`,
+      method: 'GET',
+      data
+  })
+}
+// 查询当前登陆人发起的列表
 export function getList(data) {
   return request({
-      url: `/Extend/BaseInspectionReport`,
+      url: `/Extend/BaseInspectionReport/GetListForCurrentUser`,
       method: 'GET',
       data
   })
 }
+// 获取单个巡查上报
+export function getDetail(id) {
+  return request({
+      url: `/Extend/BaseInspectionReport/${id}`,
+      method: 'GET',
+  })
+}
+// 提交
+export function addForm(data) {
+  return request({
+      url: `/Extend/BaseInspectionReport`,
+      method: 'POST',
+      data
+  })
+}
+// 更新
+export function updataForm(data) {
+  return request({
+      url: `/Extend/BaseInspectionReport/${data.id}`,
+      method: 'PUT',
+      data
+  })
+}
+// 判研
+export function disposalSuggestions(data) {
+  return request({
+      url: `/Extend/BaseInspectionReport/${data.id}/disposalSuggestions`,
+      method: 'PUT',
+      data
+  })
+}
 
 
 // 获取接口列表(分页)
diff --git a/src/components/Generator/components/InputTable/index.vue b/src/components/Generator/components/InputTable/index.vue
index 19fc5ed..d6f3d7b 100644
--- a/src/components/Generator/components/InputTable/index.vue
+++ b/src/components/Generator/components/InputTable/index.vue
@@ -327,7 +327,7 @@ export default {
             top: 74%;
             z-index: 1;
           }
-          >>> .el-input__inner {
+          .el-input__inner {
             border-color: #f56c6c;
           }
         }
@@ -361,7 +361,7 @@ export default {
 
 .ncc-table-box.table {
   // 索引和删除按钮切换
-  >>> .el-table__row:hover {
+  .el-table__row:hover {
     .index {
       display: none;
       &.btn-disabled {
@@ -377,15 +377,15 @@ export default {
       opacity: 1;
     }
   }
-  >>> .el-input-number {
+  .el-input-number {
     width: 100%;
     min-width: 120px;
   }
-  >>> .el-table__header th {
+  .el-table__header th {
     line-height: 1;
   }
 
-  >>> .el-table .el-table__body {
+  .el-table .el-table__body {
     td {
       padding: 2px 0;
       background: #fff !important;
diff --git a/src/main.js b/src/main.js
index 73b796c..155cbad 100644
--- a/src/main.js
+++ b/src/main.js
@@ -58,7 +58,7 @@ Vue.directive('loadMore', {
     })
   }
 })
-new Vue({
+export default new Vue({
   router,
   store,
   i18n,
diff --git a/src/utils/index.js b/src/utils/index.js
index ef25042..b865bc3 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,234 +1,352 @@
+/**
+ * Parse the time to string
+ * @param {(Object|string|number)} time
+ * @param {string} cFormat
+ * @returns {string | null}
+ */
+export function parseTime(time, cFormat) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if ((typeof time === 'string')) {
+    if ((/^[0-9]+$/.test(time))) {
+      // support "1548221490638"
+      time = parseInt(time)
+    } else {
+      // support safari
+      // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
+      time = time.replace(new RegExp(/-/gm), '/')
+    }
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+    const value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+    return value.toString().padStart(2, '0')
+  })
+  return time_str
+}
+
+/**
+ * @param {number} time
+ * @param {string} option
+ * @returns {string}
+ */
+export function formatTime(time, option) {
+  if (('' + time).length === 10) {
+    time = parseInt(time) * 1000
+  } else {
+    time = +time
+  }
+  const d = new Date(time)
+  const now = Date.now()
 
+  const diff = (now - d) / 1000
+
+  if (diff < 30) {
+    return '刚刚'
+  } else if (diff < 3600) {
+    // less 1 hour
+    return Math.ceil(diff / 60) + '分钟前'
+  } else if (diff < 3600 * 24) {
+    return Math.ceil(diff / 3600) + '小时前'
+  } else if (diff < 3600 * 24 * 2) {
+    return '1天前'
+  }
+  if (option) {
+    return parseTime(time, option)
+  } else {
+    return (
+      d.getMonth() +
+      1 +
+      '月' +
+      d.getDate() +
+      '日' +
+      d.getHours() +
+      '时' +
+      d.getMinutes() +
+      '分'
+    )
+  }
+}
 
 /**
- * 通用js方法封装处理
- * Copyright (c) 2019 ruoyi
+ * @param {string} url
+ * @returns {Object}
  */
+export function getQueryObject(url) {
+  url = url == null ? window.location.href : url
+  const search = url.substring(url.lastIndexOf('?') + 1)
+  const obj = {}
+  const reg = /([^?&=]+)=([^?&=]*)/g
+  search.replace(reg, (rs, $1, $2) => {
+    const name = decodeURIComponent($1)
+    let val = decodeURIComponent($2)
+    val = String(val)
+    obj[name] = val
+    return rs
+  })
+  return obj
+}
 
-// 日期格式化
-export function parseTime(time, pattern) {
-    if (arguments.length === 0 || !time) {
-      return null
-    }
-    const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
-    let date
-    if (typeof time === 'object') {
-      date = time
-    } else {
-      if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
-        time = parseInt(time)
-      } else if (typeof time === 'string') {
-        time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
-      }
-      if ((typeof time === 'number') && (time.toString().length === 10)) {
-        time = time * 1000
-      }
-      date = new Date(time)
-    }
-    const formatObj = {
-      y: date.getFullYear(),
-      m: date.getMonth() + 1,
-      d: date.getDate(),
-      h: date.getHours(),
-      i: date.getMinutes(),
-      s: date.getSeconds(),
-      a: date.getDay()
+/**
+ * @param {string} input value
+ * @returns {number} output value
+ */
+export function byteLength(str) {
+  // returns the byte length of an utf8 string
+  let s = str.length
+  for (var i = str.length - 1; i >= 0; i--) {
+    const code = str.charCodeAt(i)
+    if (code > 0x7f && code <= 0x7ff) s++
+    else if (code > 0x7ff && code <= 0xffff) s += 2
+    if (code >= 0xDC00 && code <= 0xDFFF) i--
+  }
+  return s
+}
+
+/**
+ * @param {Array} actual
+ * @returns {Array}
+ */
+export function cleanArray(actual) {
+  const newArray = []
+  for (let i = 0; i < actual.length; i++) {
+    if (actual[i]) {
+      newArray.push(actual[i])
     }
-    const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-      let value = formatObj[key]
-      // Note: getDay() returns 0 on Sunday
-      if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
-      if (result.length > 0 && value < 10) {
-        value = '0' + value
-      }
-      return value || 0
+  }
+  return newArray
+}
+
+/**
+ * @param {Object} json
+ * @returns {Array}
+ */
+export function param(json) {
+  if (!json) return ''
+  return cleanArray(
+    Object.keys(json).map(key => {
+      if (json[key] === undefined) return ''
+      return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
     })
-    return time_str
+  ).join('&')
+}
+
+/**
+ * @param {string} url
+ * @returns {Object}
+ */
+export function param2Obj(url) {
+  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
+  if (!search) {
+    return {}
   }
-  
-  // 表单重置
-  export function resetForm(refName) {
-    if (this.$refs[refName]) {
-      this.$refs[refName].resetFields();
+  const obj = {}
+  const searchArr = search.split('&')
+  searchArr.forEach(v => {
+    const index = v.indexOf('=')
+    if (index !== -1) {
+      const name = v.substring(0, index)
+      const val = v.substring(index + 1, v.length)
+      obj[name] = val
     }
+  })
+  return obj
+}
+
+/**
+ * @param {string} val
+ * @returns {string}
+ */
+export function html2Text(val) {
+  const div = document.createElement('div')
+  div.innerHTML = val
+  return div.textContent || div.innerText
+}
+
+/**
+ * Merges two objects, giving the last one precedence
+ * @param {Object} target
+ * @param {(Object|Array)} source
+ * @returns {Object}
+ */
+export function objectMerge(target, source) {
+  if (typeof target !== 'object') {
+    target = {}
+  }
+  if (Array.isArray(source)) {
+    return source.slice()
   }
-  
-  // 添加日期范围
-  export function addDateRange(params, dateRange, propName) {
-    let search = params;
-    search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
-    dateRange = Array.isArray(dateRange) ? dateRange : [];
-    if (typeof (propName) === 'undefined') {
-      search.params['beginTime'] = dateRange[0];
-      search.params['endTime'] = dateRange[1];
+  Object.keys(source).forEach(property => {
+    const sourceProperty = source[property]
+    if (typeof sourceProperty === 'object') {
+      target[property] = objectMerge(target[property], sourceProperty)
     } else {
-      search.params['begin' + propName] = dateRange[0];
-      search.params['end' + propName] = dateRange[1];
+      target[property] = sourceProperty
     }
-    return search;
+  })
+  return target
+}
+
+/**
+ * @param {HTMLElement} element
+ * @param {string} className
+ */
+export function toggleClass(element, className) {
+  if (!element || !className) {
+    return
   }
-  
-  // 回显数据字典
-  export function selectDictLabel(datas, value) {
-    if (value === undefined) {
-      return "";
-    }
-    var actions = [];
-    Object.keys(datas).some((key) => {
-      if (datas[key].value == ('' + value)) {
-        actions.push(datas[key].label);
-        return true;
-      }
-    })
-    if (actions.length === 0) {
-      actions.push(value);
-    }
-    return actions.join('');
+  let classString = element.className
+  const nameIndex = classString.indexOf(className)
+  if (nameIndex === -1) {
+    classString += '' + className
+  } else {
+    classString =
+      classString.substr(0, nameIndex) +
+      classString.substr(nameIndex + className.length)
   }
-  
-  // 回显数据字典（字符串、数组）
-  export function selectDictLabels(datas, value, separator) {
-    if (value === undefined || value.length ===0) {
-      return "";
-    }
-    if (Array.isArray(value)) {
-      value = value.join(",");
-    }
-    var actions = [];
-    var currentSeparator = undefined === separator ? "," : separator;
-    var temp = value.split(currentSeparator);
-    Object.keys(value.split(currentSeparator)).some((val) => {
-      var match = false;
-      Object.keys(datas).some((key) => {
-        if (datas[key].value == ('' + temp[val])) {
-          actions.push(datas[key].label + currentSeparator);
-          match = true;
-        }
-      })
-      if (!match) {
-        actions.push(temp[val] + currentSeparator);
-      }
-    })
-    return actions.join('').substring(0, actions.join('').length - 1);
-  }
-  
-  // 字符串格式化(%s )
-  export function sprintf(str) {
-    var args = arguments, flag = true, i = 1;
-    str = str.replace(/%s/g, function () {
-      var arg = args[i++];
-      if (typeof arg === 'undefined') {
-        flag = false;
-        return '';
-      }
-      return arg;
-    });
-    return flag ? str : '';
-  }
-  
-  // 转换字符串，undefined,null等转化为""
-  export function parseStrEmpty(str) {
-    if (!str || str == "undefined" || str == "null") {
-      return "";
-    }
-    return str;
-  }
-  
-  // 数据合并
-  export function mergeRecursive(source, target) {
-    for (var p in target) {
-      try {
-        if (target[p].constructor == Object) {
-          source[p] = mergeRecursive(source[p], target[p]);
-        } else {
-          source[p] = target[p];
-        }
-      } catch (e) {
-        source[p] = target[p];
-      }
-    }
-    return source;
-  };
-  
-  /**
-   * 构造树型结构数据
-   * @param {*} data 数据源
-   * @param {*} id id字段 默认 'id'
-   * @param {*} parentId 父节点字段 默认 'parentId'
-   * @param {*} children 孩子节点字段 默认 'children'
-   */
-  export function handleTree(data, id, parentId, children) {
-    let config = {
-      id: id || 'id',
-      parentId: parentId || 'parentId',
-      childrenList: children || 'children'
-    };
-  
-    var childrenListMap = {};
-    var nodeIds = {};
-    var tree = [];
-  
-    for (let d of data) {
-      let parentId = d[config.parentId];
-      if (childrenListMap[parentId] == null) {
-        childrenListMap[parentId] = [];
-      }
-      nodeIds[d[config.id]] = d;
-      childrenListMap[parentId].push(d);
-    }
-  
-    for (let d of data) {
-      let parentId = d[config.parentId];
-      if (nodeIds[parentId] == null) {
-        tree.push(d);
-      }
-    }
-  
-    for (let t of tree) {
-      adaptToChildrenList(t);
-    }
-  
-    function adaptToChildrenList(o) {
-      if (childrenListMap[o[config.id]] !== null) {
-        o[config.childrenList] = childrenListMap[o[config.id]];
-      }
-      if (o[config.childrenList]) {
-        for (let c of o[config.childrenList]) {
-          adaptToChildrenList(c);
-        }
+  element.className = classString
+}
+
+/**
+ * @param {string} type
+ * @returns {Date}
+ */
+export function getTime(type) {
+  if (type === 'start') {
+    return new Date().getTime() - 3600 * 1000 * 24 * 90
+  } else {
+    return new Date(new Date().toDateString())
+  }
+}
+
+/**
+ * @param {Function} func
+ * @param {number} wait
+ * @param {boolean} immediate
+ * @return {*}
+ */
+export function debounce(func, wait, immediate) {
+  let timeout, args, context, timestamp, result
+
+  const later = function() {
+    // 据上一次触发时间间隔
+    const last = +new Date() - timestamp
+
+    // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
+    if (last < wait && last > 0) {
+      timeout = setTimeout(later, wait - last)
+    } else {
+      timeout = null
+      // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
+      if (!immediate) {
+        result = func.apply(context, args)
+        if (!timeout) context = args = null
       }
     }
-    return tree;
-  }
-  
-  /**
-  * 参数处理
-  * @param {*} params  参数
-  */
-  export function tansParams(params) {
-    let result = ''
-    for (const propName of Object.keys(params)) {
-      const value = params[propName];
-      var part = encodeURIComponent(propName) + "=";
-      if (value !== null && value !== "" && typeof (value) !== "undefined") {
-        if (typeof value === 'object') {
-          for (const key of Object.keys(value)) {
-            if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
-              let params = propName + '[' + key + ']';
-              var subPart = encodeURIComponent(params) + "=";
-              result += subPart + encodeURIComponent(value[key]) + "&";
-            }
-          }
-        } else {
-          result += part + encodeURIComponent(value) + "&";
-        }
-      }
+  }
+
+  return function(...args) {
+    context = this
+    timestamp = +new Date()
+    const callNow = immediate && !timeout
+    // 如果延时不存在，重新设定延时
+    if (!timeout) timeout = setTimeout(later, wait)
+    if (callNow) {
+      result = func.apply(context, args)
+      context = args = null
     }
+
     return result
   }
-  
-  // 验证是否为blob格式
-  export function blobValidate(data) {
-    return data.type !== 'application/json'
+}
+
+/**
+ * This is just a simple version of deep copy
+ * Has a lot of edge cases bug
+ * If you want to use a perfect deep copy, use lodash's _.cloneDeep
+ * @param {Object} source
+ * @returns {Object}
+ */
+export function deepClone(source) {
+  if (!source && typeof source !== 'object') {
+    throw new Error('error arguments', 'deepClone')
+  }
+  const targetObj = source.constructor === Array ? [] : {}
+  Object.keys(source).forEach(keys => {
+    if (source[keys] && typeof source[keys] === 'object') {
+      targetObj[keys] = deepClone(source[keys])
+    } else {
+      targetObj[keys] = source[keys]
+    }
+  })
+  return targetObj
+}
+
+/**
+ * @param {Array} arr
+ * @returns {Array}
+ */
+export function uniqueArr(arr) {
+  return Array.from(new Set(arr))
+}
+
+/**
+ * @returns {string}
+ */
+export function createUniqueString() {
+  const timestamp = +new Date() + ''
+  const randomNum = parseInt((1 + Math.random()) * 65536) + ''
+  return (+(randomNum + timestamp)).toString(32)
+}
+
+/**
+ * Check if an element has a class
+ * @param {HTMLElement} elm
+ * @param {string} cls
+ * @returns {boolean}
+ */
+export function hasClass(ele, cls) {
+  return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'))
+}
+
+/**
+ * Add class to element
+ * @param {HTMLElement} elm
+ * @param {string} cls
+ */
+export function addClass(ele, cls) {
+  if (!hasClass(ele, cls)) ele.className += ' ' + cls
+}
+
+/**
+ * Remove class from element
+ * @param {HTMLElement} elm
+ * @param {string} cls
+ */
+export function removeClass(ele, cls) {
+  if (hasClass(ele, cls)) {
+    const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
+    ele.className = ele.className.replace(reg, ' ')
   }
-  
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index f597507..f058db7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,6 +20,7 @@ const service = axios.create({
 //拦截器（请求，响应）
 //请求
 service.interceptors.request.use(config => {
+    if (config.url.indexOf('http') > -1) config.baseURL = ''
     // 是否需要设置 token
     const isToken = (config.headers || {}).isToken === false
     // 是否需要防止数据重复提交
@@ -28,14 +29,16 @@ service.interceptors.request.use(config => {
     if (getToken() && !isToken) {
         config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-    // get请求映射params参数
-    if (config.method === 'get' && config.params) {
-        let url = config.url + '?' + tansParams(config.params);
-        url = url.slice(0, -1);
-        config.params = {};
-        config.url = url;
+    if (config.method == 'get') {
+        config.params = config.data
     }
-    return config;
+    // let timestamp = Date.parse(new Date()) / 1000
+    // if (config.url.indexOf('?') > -1) {
+    //     config.url += `&n=${timestamp}`
+    // } else {
+    //     config.url += `?n=${timestamp}`
+    // }
+    return config
 })
 //响应
 service.interceptors.response.use(res => {
diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
new file mode 100644
index 0000000..c537361
--- /dev/null
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -0,0 +1,260 @@
+<template>
+	<el-dialog title="判研建议" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%">
+		<el-row :gutter="15" class="" >
+			<el-col :span="24" class="form_title">
+				巡查上报详情
+			</el-col>
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules" v-loading="loading">
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="主键" prop="id">
+							<el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="来源" prop="source">
+							<el-select v-model="dataForm.source" placeholder="请选择" clearable :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in sourceOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="平台名称" prop="platformName">
+							<el-input v-model="dataForm.platformName" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="平台类型" prop="platformType">
+							<el-select v-model="dataForm.platformType" placeholder="请选择" clearable :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in platformTypeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="部门" prop="department">
+							<dep-select v-model="dataForm.department" placeholder="请选择" clearable >
+							</dep-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="问题类型" prop="questionType">
+							<el-radio-group v-model="dataForm.questionType" :style='{}' >
+								<el-radio v-for="(item, index) in questionTypeOptions" :key="index" :label="item.id"  >{{item.fullName}}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="问题分类" prop="questionClass">
+							<el-select v-model="dataForm.questionClass" placeholder="请选择" clearable :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in questionClassOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="问题内容" prop="questionContent">
+							<el-input v-model="dataForm.questionContent" placeholder="请输入" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="有害链接" prop="link">
+							<el-input v-model="dataForm.link" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="取证内容" prop="obtainEvidence">
+							<NCC-UploadFz v-model="dataForm.obtainEvidence" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
+							</NCC-UploadFz>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="附件上传" prop="annex">
+							<NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
+							</NCC-UploadFz>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="处置建议" prop="disposalSuggestions">
+							<el-input v-model="dataForm.disposalSuggestions" placeholder="请输入" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="阶段" prop="stage">
+							<el-select v-model="dataForm.stage" placeholder="请选择" clearable :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in stageOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建用户" prop="creatorUserId">
+							<el-input v-model="dataForm.creatorUserId" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改用户" prop="lastModifyUserId">
+							<el-input v-model="dataForm.lastModifyUserId" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+			</el-form>
+			<el-col :span="24" class="form_title">
+				判研建议
+			</el-col>
+			<el-form ref="suggestionForm" :model="suggestionForm" size="small" label-width="100px" label-position="right">
+				<el-col :span="24">
+					<el-form-item label="处置建议" prop="disposalSuggestions">
+						<el-input v-model="suggestionForm.disposalSuggestions" placeholder="请输入处置建议" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="判断意见" prop="judgmentOpinions">
+						<el-input v-model="suggestionForm.judgmentOpinions" placeholder="请输入判断意见" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="判断分类" prop="judgmentClass">
+						<el-input v-model="suggestionForm.judgmentClass" placeholder="请输入判断分类" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { getDetail, disposalSuggestions } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: true,
+				visible: false,
+				isDetail: true,
+				dataForm: {
+					id:'',
+					id:undefined,
+					source:undefined,
+					platformName:undefined,
+					platformType:undefined,
+					department:undefined,
+					questionType:undefined,
+					questionClass:undefined,
+					questionContent:undefined,
+					link:undefined,
+					obtainEvidence:[],
+					annex:[],
+					disposalSuggestions:undefined,
+					stage:undefined,
+					creatorUserId:undefined,
+					creatorTime:undefined,
+					lastModifyUserId:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+				},
+				sourceOptions:[{"fullName":"市网信办线索","id":"市网信办线索"},{"fullName":"自主巡查发现","id":"自主巡查发现"}],
+				platformTypeOptions : [],
+				questionTypeOptions : [],
+				questionClassOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+				stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+
+				suggestionForm: {
+					disposalSuggestions: "", //处置建议
+					judgmentOpinions: "", //判断意见
+					judgmentClass: "" //判断分类
+				}
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getplatformTypeOptions();
+			this.getquestionTypeOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getplatformTypeOptions(){
+				getDictionaryDataSelector('576279943168656645').then(res => {
+					this.platformTypeOptions = res.data.list
+				});
+			},
+			getquestionTypeOptions(){
+				getDictionaryDataSelector('577006814432855301').then(res => {
+					this.questionTypeOptions = res.data.list
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+				this.$nextTick(async () => {
+					this.$refs['elForm'].resetFields();
+					this.$refs['suggestionForm'].resetFields();
+					if (this.dataForm.id) {
+						let res = await getDetail(this.dataForm.id)
+						this.dataForm = res.data;
+						this.loading = false;
+						if(!this.dataForm.obtainEvidence)this.dataForm.obtainEvidence=[];
+						if(!this.dataForm.annex)this.dataForm.annex=[];
+					}
+				})
+			},
+			dataFormSubmit() {
+				if(!this.suggestionForm.disposalSuggestions && !this.suggestionForm.judgmentOpinions && !this.suggestionForm.judgmentClass) {
+					this.$message({
+						message: '判研建议不能为空！',
+						type: 'danger',
+					})
+				}
+				this.$refs['suggestionForm'].validate(async (valid) => {
+                    if (valid) {
+						let res = await disposalSuggestions(this.dataForm);
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false, this.$emit('refresh', true)
+							}
+						})
+                    }
+                })
+			},
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.form_title {
+		line-height: 30px;
+		padding-left: 40px;
+		color: #409eff;
+	}
+</style>
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
new file mode 100644
index 0000000..a8549ae
--- /dev/null
+++ b/src/views/DisposalSuggestions/index.vue
@@ -0,0 +1,209 @@
+<template>
+    <div class="SystemInfo item-box common-info-box">
+   <div class="item-title">上报线索研判</div>
+   <div class="item-body">
+       <div class="NCC-common-layout">
+       <div class="NCC-common-layout-center">
+           <el-row class="NCC-common-search-box" :gutter="16">
+               <el-form @submit.native.prevent size="mini">
+                   <el-col :span="4">
+                       <el-form-item label="">
+                           <el-input v-model="query.platformName" placeholder="请输入平台名称" clearable />	
+                       </el-form-item>
+                   </el-col>
+                   <el-col :span="4">
+                       <el-form-item label="">
+                           <el-select v-model="query.platformType" placeholder="请选择平台类型" clearable >
+                               <el-option v-for="(item, index) in platformTypeOptions" :key="index" :label="item.fullName" :value="item.id"  />
+                           </el-select>
+                       </el-form-item>
+                   </el-col>
+                   <el-col :span="4">
+                       <el-form-item label="">
+                           <depSelect v-model="query.department" placeholder="请选择部门" />
+                       </el-form-item>
+                   </el-col>
+                   <el-col :span="4">
+                       <el-form-item label="">
+                           <el-select v-model="query.questionType" placeholder="请选择问题类型" >
+                               <el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id"  />
+                           </el-select>
+                       </el-form-item>
+                   </el-col>
+                   <el-col :span="4">
+                       <el-form-item label="">
+                           <el-select v-model="query.questionClass" placeholder="请选择问题分类" clearable >
+                               <el-option v-for="(item, index) in questionClassOptions" :key="index" :label="item.fullName" :value="item.id"  />
+                           </el-select>
+                       </el-form-item>
+                   </el-col>
+                   <el-col :span="4">
+                       <el-form-item>
+                           <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                       </el-form-item>
+                   </el-col>
+               </el-form>
+           </el-row>
+           <div class="NCC-common-layout-main NCC-flex-main">
+               <NCC-table v-loading="listLoading" :data="list">
+                   <el-table-column show-overflow-tooltip prop="platformName" label="平台名称" align="left" />
+                   <el-table-column show-overflow-tooltip label="平台类型" prop="platformType" align="left">
+                           <template slot-scope="scope">{{ scope.row.platformType | dynamicText(platformTypeOptions) }}</template>
+                   </el-table-column>
+                   <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left">
+                           <template slot-scope="scope">{{ scope.row.questionType | dynamicText(questionTypeOptions) }}</template>
+                   </el-table-column>
+                   <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" />
+                   <el-table-column show-overflow-tooltip prop="disposalSuggestions" label="处置建议" align="left" />
+                   <el-table-column show-overflow-tooltip prop="id" label="主键" align="left" />
+                   <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" />
+                   <el-table-column show-overflow-tooltip label="问题分类" prop="questionClass" align="left">
+                           <template slot-scope="scope">{{ scope.row.questionClass | dynamicText(questionClassOptions) }}</template>
+                   </el-table-column>
+                   <el-table-column show-overflow-tooltip label="阶段" prop="stage" align="left">
+                           <template slot-scope="scope">{{ scope.row.stage | dynamicText(stageOptions) }}</template>
+                   </el-table-column>
+                   <el-table-column label="操作" fixed="right" width="100">
+                        <template slot-scope="scope">
+                           <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >判研</el-button>
+                       </template>
+                   </el-table-column>
+               </NCC-table>
+               <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+           </div>
+       </div>
+       <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+   </div>
+   </div>
+   </div>
+   
+</template>
+<script>
+   import request from '@/utils/request'
+   import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+   import NCCForm from './Form'
+   import { getListForJudge, previewDataInterface } from '@/api/systemData/dataInterface'
+   export default {
+       components: { NCCForm },
+       data() {
+           return {
+               showAll: false,
+               query: {
+                   platformName:undefined,
+                   platformType:undefined,
+                   department:undefined,
+                   questionType:undefined,
+                   questionClass:undefined,
+               },
+               list: [],
+               listLoading: true,
+               multipleSelection: [], total: 0,
+               listQuery: {
+                   currentPage: 1,
+                   pageSize: 20,
+                   sort: "desc",
+                   sidx: "",
+               },
+               formVisible: false,
+               exportBoxVisible: false,
+               columnList: [
+                   { prop: 'platformName', label: '平台名称' },
+                   { prop: 'platformType', label: '平台类型' },
+                   { prop: 'questionType', label: '问题类型' },
+                   { prop: 'link', label: '有害链接' },
+                   { prop: 'disposalSuggestions', label: '处置建议' },
+                   { prop: 'id', label: '主键' },
+                   { prop: 'department', label: '部门' },
+                   { prop: 'questionClass', label: '问题分类' },
+                   { prop: 'stage', label: '阶段' },
+               ],
+               sourceOptions:[{"fullName":"市网信办线索","id":"市网信办线索"},{"fullName":"自主巡查发现","id":"自主巡查发现"}],
+               platformTypeOptions : [],
+               questionTypeOptions : [],
+               questionClassOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+               stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+           }
+       },
+       computed: {},
+       created() {
+           this.initData()
+           this.getplatformTypeOptions();
+           this.getquestionTypeOptions();
+       },
+       methods: {
+           getplatformTypeOptions(){
+               getDictionaryDataSelector('576279943168656645').then(res => {
+                   this.platformTypeOptions = res.data.list
+               });
+           },
+           getquestionTypeOptions(){
+               getDictionaryDataSelector('577006814432855301').then(res => {
+                   this.questionTypeOptions = res.data.list
+               });
+           },
+           initData() {
+               this.listLoading = true;
+               let _query = {
+                   ...this.listQuery,
+                   ...this.query
+               };
+               let query = {}
+               for (let key in _query) {
+                   if (Array.isArray(_query[key])) {
+                       query[key] = _query[key].join()
+                   } else {
+                       query[key] = _query[key]
+                   }
+               }
+               getListForJudge(query).then(res => {
+                   this.list = res.data.list
+                   this.total = res.data.pagination.total
+                   this.listLoading = false
+               })
+           },
+          
+           addOrUpdateHandle(id, isDetail) {
+               this.formVisible = true
+               this.$nextTick(() => {
+                   this.$refs.NCCForm.init(id, isDetail)
+               })
+           },
+           search() {
+               this.listQuery = {
+                   currentPage: 1,
+                   pageSize: 20,
+                   sort: "desc",
+                   sidx: "",
+               }
+               this.initData()
+           },
+           refresh(isrRefresh) {
+               this.formVisible = false
+               if (isrRefresh) this.reset()
+           },
+           reset() {
+               for (let key in this.query) {
+                   this.query[key] = undefined
+               }
+               this.listQuery = {
+                   currentPage: 1,
+                   pageSize: 20,
+                   sort: "desc",
+                   sidx: "",
+               }
+               this.initData()
+           }
+       }
+   }
+</script>
+<style scoped lang="scss">
+.common-info-box {
+ :deep(.el-table__body-wrapper.is-scrolling-none) {
+   height: calc(100% - 47px);
+   overflow-y: scroll;
+ }
+ .item-body {
+   height: calc(100% - 35px);
+ }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index b7a0045..a71961a 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -120,7 +120,7 @@
 <script>
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getDetail, addForm, updataForm } from '@/api/systemData/dataInterface'
 	export default {
 		components: {},
 		props: [],
@@ -184,56 +184,28 @@
 				this.dataForm.id = id || 0;
                 this.visible = true;
                 this.isDetail = isDetail || false;
-				this.$nextTick(() => {
+				this.$nextTick(async () => {
 					this.$refs['elForm'].resetFields();
 					if (this.dataForm.id) {
-						request({
-							url: '/Extend/BaseInspectionReport/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-							if(!this.dataForm.obtainEvidence)this.dataForm.obtainEvidence=[];
-							if(!this.dataForm.annex)this.dataForm.annex=[];
-						})
+						let res = await getDetail(this.dataForm.id)
+						this.dataForm = res.data;
+						if(!this.dataForm.obtainEvidence)this.dataForm.obtainEvidence=[];
+						if(!this.dataForm.annex)this.dataForm.annex=[];
 					}
 				})
 			},
 			dataFormSubmit() {
-				this.$refs['elForm'].validate((valid) => {
+				this.$refs['elForm'].validate(async (valid) => {
                     if (valid) {
-                        if (!this.dataForm.id) {
-                            request({
-                                url: `/Extend/BaseInspectionReport`,
-                                method: 'post',
-                                data: this.dataForm,
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false,
-                                            this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        } else {
-                            request({
-                                url: '/Extend/BaseInspectionReport/' + this.dataForm.id,
-                                method: 'PUT',
-                                data: this.dataForm
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false
-                                        this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        }
+						let res = !this.dataForm.id ? await addForm(this.dataForm) : await updataForm(this.dataForm);
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false, this.$emit('refresh', true)
+							}
+						})
                     }
                 })
 			},
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index 5f5f691..c55835e 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -8,12 +8,12 @@
 				<el-form @submit.native.prevent size="mini">
 					<el-col :span="4">
 						<el-form-item label="">
-							<el-input v-model="query.platformName" placeholder="平台名称" clearable />	
+							<el-input v-model="query.platformName" placeholder="请输入平台名称" clearable />	
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="">
-							<el-select v-model="query.platformType" placeholder="平台类型" clearable >
+							<el-select v-model="query.platformType" placeholder="请选择平台类型" clearable >
 								<el-option v-for="(item, index) in platformTypeOptions" :key="index" :label="item.fullName" :value="item.id"  />
 							</el-select>
 						</el-form-item>
@@ -25,14 +25,14 @@
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="">
-							<el-select v-model="query.questionType" placeholder="问题类型" >
+							<el-select v-model="query.questionType" placeholder="请选择问题类型" >
 								<el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id"  />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="">
-							<el-select v-model="query.questionClass" placeholder="问题分类" clearable >
+							<el-select v-model="query.questionClass" placeholder="请选择问题分类" clearable >
 								<el-option v-for="(item, index) in questionClassOptions" :key="index" :label="item.fullName" :value="item.id"  />
 							</el-select>
 						</el-form-item>
@@ -135,8 +135,8 @@
 		computed: {},
 		created() {
 			this.initData()
-			// this.getplatformTypeOptions();
-			// this.getquestionTypeOptions();
+			this.getplatformTypeOptions();
+			this.getquestionTypeOptions();
 		},
 		methods: {
 			getplatformTypeOptions(){
@@ -164,8 +164,10 @@
                     }
                 }
                 getList(query).then(res => {
-                    this.list = res.data.list
-                    this.total = res.data.pagination.total
+                    if(res.data) {
+                        this.list = res.data.list
+                        this.total = res.data.pagination.total
+                    }
                     this.listLoading = false
                 })
             },
diff --git a/src/views/extend/zyOaProfit/Form.vue b/src/views/extend/zyOaProfit/Form.vue
index 60c834a..43bbf5e 100644
--- a/src/views/extend/zyOaProfit/Form.vue
+++ b/src/views/extend/zyOaProfit/Form.vue
@@ -82,7 +82,7 @@ export default {
 .timeline {
   padding-top: 30px;
 }
->>> .el-timeline-content {
+.el-timeline-content {
   p {
     padding: 0;
     margin: 0;
diff --git a/src/views/extend/zyOaWfFinrmbt/ExportBox.vue b/src/views/extend/zyOaWfFinrmbt/ExportBox.vue
index 4fc5c07..bb73c80 100644
--- a/src/views/extend/zyOaWfFinrmbt/ExportBox.vue
+++ b/src/views/extend/zyOaWfFinrmbt/ExportBox.vue
@@ -60,7 +60,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
->>> .el-dialog__body {
+.el-dialog__body {
   padding: 20px !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/homePage/components/news/NewsDialog.vue b/src/views/homePage/components/news/NewsDialog.vue
index 2aefd56..ef2cbad 100644
--- a/src/views/homePage/components/news/NewsDialog.vue
+++ b/src/views/homePage/components/news/NewsDialog.vue
@@ -11,6 +11,7 @@
         class="list"
         v-infinite-scroll="load"
         infinite-scroll-disabled="disabled"
+        infinite-scroll-immediate
       >
         <li class="list-item" v-for="i in count" :key="i">
           <div class="item-title">
@@ -30,12 +31,14 @@
 </template>
 
 <script>
+import {getMessageList} from "@/api/system/message";
 export default {
   name: "NewsDialog",
   data() {
     return {
       count: 10,
       loading: false,
+      messageList: [],
     };
   },
   computed: {
@@ -46,11 +49,17 @@ export default {
       return this.loading || this.noMore;
     },
   },
+  created() {
+    this.load();
+  },
   mounted() {},
   methods: {
     load() {
       console.log(11);
       this.loading = true;
+      getMessageList({ pageIndex: 1, pageSize: 10 }).then((res) => {
+        console.log(res);
+      });
       setTimeout(() => {
         this.count += 2;
         this.loading = false;
diff --git a/src/views/homePage/components/news/index.vue b/src/views/homePage/components/news/index.vue
index ebb7a90..a119c1c 100644
--- a/src/views/homePage/components/news/index.vue
+++ b/src/views/homePage/components/news/index.vue
@@ -34,7 +34,7 @@ export default {
     };
   },
   created() {
-    this.initWebSocket()
+    // this.initWebSocket()
   },
   computed: {},
   mounted() {},