Merge branch 'feature/contentsecurity' of http://121.42.41.42:7070/r/esua-epdc-admin into feature/contentsecurity

src/views/modules/contentSecurity/checkrecords.vue

@@ -19,6 +19,23 @@
 <!--            <el-option label="人工审核" value="2"> </el-option>-->
 <!--          </el-select>-->
 <!--        </el-form-item>-->
+        <div>
+          <el-form-item label="手机号" prop="mobile" label-width="90px">
+            <el-input v-model="dataForm.mobile" placeholder="手机号" clearable maxlength="10" @keyup.native="btKeyUpMobile" style="width:200px"></el-input>
+          </el-form-item>
+          <el-form-item label="审核状态" prop="suggestion" label-width="90px">
+            <el-select v-model="dataForm.suggestion" placeholder="请选择" clearable style="width:200px">
+              <el-option v-for="item in suggestionList" :key="item.code" :label="item.description" :value="item.code" >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="系统状态" prop="decision" label-width="90px">
+            <el-select v-model="dataForm.systemStatus" placeholder="请选择" clearable>
+              <el-option label="正常" value="0"> </el-option>
+              <el-option label="异常" value="1"> </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
         <el-form-item label="时间"
                       prop="startTime" label-width="90px">
           <el-date-picker v-model="dataForm.startTime"
@@ -69,7 +86,8 @@
 <!--        <el-table-column prop="msg" label="系统返回信息" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="suggestion" label="审核状态" header-align="center" align="center"></el-table-column>
         <el-table-column prop="label" label="检测结果分类" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="rate" label="分类概率" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="system" label="系统状态" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="rate" label="分类概率" header-align="center" align="center"></el-table-column>-->
 <!--        <el-table-column prop="allPass" label="是否全部审核通过" header-align="center" align="center"></el-table-column>-->
 <!--        <el-table-column prop="delFlag" label="删除标识：0未删除 1已删除" header-align="center" align="center"></el-table-column>-->
 <!--        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>-->
@@ -121,8 +139,10 @@ export default {
         module:'',
         startTime:'',
         endTime:'',
-        suggestionCode:''
+        suggestionCode:'',
+        systemStatus:''
       },
+      suggestionList:[],
       handleVisible:false,
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -148,12 +168,17 @@ export default {
   },
   created: function () {
     this.getDataList()
+    this.getSuggestionInfo('check_state')
   },
   methods:{
     btKeyUpName (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '');
       this.dataForm.name = e.target.value
     },
+    btKeyUpMobile (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '');
+      this.dataForm.mobile = e.target.value
+    },
     btKeyUpModule (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '');
       this.dataForm.module = e.target.value
@@ -166,6 +191,15 @@ export default {
       this.$parent.selectComponent = 'CheckrecordsDetail'
       this.$router.push({ path: '/contentSecurity-checkrecordsroute', query: { id: id} })
     },
+    // 获取审核状态下拉信息
+    getSuggestionInfo (type) {
+      this.$http.get(`/contentSecurity/checkcode/getResourcesByType?type=` + type).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.suggestionList = res.data
+      }).catch(() => {})
+    },
     openHandle (id) {
       this.handleVisible = true
       this.$nextTick(() => {

src/views/modules/contentSecurity/violationsrecords.vue

@@ -6,12 +6,17 @@
           <el-form-item label="用户名" prop="name" label-width="90px">
             <el-input v-model="dataForm.name" placeholder="用户名" clearable maxlength="10" @keyup.native="btKeyUpName" style="width:200px"></el-input>
           </el-form-item>
-          <el-form-item label="内容" prop="content" label-width="50px">
+          <el-form-item label="内容" prop="content" label-width="70px">
             <el-input v-model="dataForm.content" placeholder="内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
           </el-form-item>
+        </div>
+          <div>
               <el-form-item label="功能模块" prop="module" label-width="90px">
                   <el-input v-model="dataForm.module" placeholder="功能模块" clearable maxlength="10" @keyup.native="btKeyUpModule" style="width:200px"></el-input>
               </el-form-item>
+              <el-form-item label="手机号" prop="mobile" label-width="70px">
+                  <el-input v-model="dataForm.mobile" placeholder="手机号" clearable maxlength="10" @keyup.native="btKeyUpMobile" style="width:200px"></el-input>
+              </el-form-item>
           </div>
         <el-form-item label="判定方式" prop="decision" label-width="90px">
           <el-select v-model="dataForm.decision" placeholder="请选择" clearable>
@@ -20,7 +25,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="时间"
-                      prop="startTime">
+                      prop="startTime" label-width="67px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -123,6 +128,7 @@ export default {
         module:'',
         startTime:'',
         endTime:'',
+        mobile:''
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -161,6 +167,10 @@ export default {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '');
       this.dataForm.content = e.target.value
     },
+      btKeyUpMobile (e) {
+          e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '');
+          this.dataForm.mobile = e.target.value
+      },
     selectDetails (id) {
       this.$parent.selectComponent = 'ViolationsrecordsDetail'
       this.$router.push({ path: '/contentSecurity-violationsrecordsroute', query: { id: id} })