前端页面调整

frontend/src/components/spider/EditSpider.vue

@@ -14,7 +14,8 @@
               <span class="rollback-reason-label">打回原因：</span>
               <span class="rollback-reason-value">{{ formData.reason }}</span>
           </div> -->
-          <el-tag type="danger" v-if="formData.reason">打回原因：{{ formData.reason }} </el-tag>
+          <el-tag type="danger" v-if="formData.reason && (formData.state === 2||formData.state === 1)">打回原因：{{ formData.reason }} </el-tag>
+          <el-tag type="danger" v-if="formData.taskReason && formData.state === 0">打回原因2：{{ formData.taskReason }} </el-tag>
         </div>
       </div>
     </template>
@@ -512,6 +513,7 @@ const createInitListRow = (action, check, sleep) => {
 
 const setPageData = (row) => {
   if (!row) return
+  console.log(row)
   row.listDelayTime = row.listDelayTime || "1000"
   row.listTurnDelayTime = row.listTurnDelayTime || "1000"
   row.contentDelayTime = row.contentDelayTime || "1000"

frontend/src/components/spider/RunSpider.vue

@@ -35,6 +35,18 @@
                         <el-input v-model="formData.contentDelay"></el-input>
                     </el-form-item></el-col>
             </el-row>
+            <el-row>
+                <el-col :span="24">
+                    <el-form-item label="页面资源过滤">
+                      <el-input
+                          v-model="formData.filterResource"
+                          placeholder="多个以英文分号隔开(例：ws://;wss://;.tof;.woff;.ico;.mp4;.zip;.rar;.exe;)">
+                      </el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+
             <el-row>
                 <el-col :span="8"><el-form-item label="浏览器">
                         <el-radio-group v-model="formData.headless">
@@ -115,6 +127,7 @@ const defaultFormValue = {
     listDelay: '1000',
     trunPageDelay: '1000',
     contentDelay: '1000',
+    filterResource: ''
 }
 
 const formData = ref({
@@ -134,6 +147,7 @@ const formData = ref({
     headless: false,
     showImage: false,
     threads: '1',
+    filterResource: '',
 
     cssmark: {}
 })
@@ -159,6 +173,7 @@ const setPageData = (e) => {
         formData.value.listDelay = cssMark.listDelayTime || defaultFormValue.listDelay
         formData.value.trunPageDelay = cssMark.listTurnDelayTime || defaultFormValue.trunPageDelay
         formData.value.contentDelay = cssMark.contentDelayTime || defaultFormValue.contentDelay
+        formData.value.filterResource = cssMark.filterResource || defaultFormValue.filterResource
         formData.value.cssmark = cssMark
     }
 }
@@ -341,11 +356,13 @@ const doSaveInfo = () => {
   const listDelayTime = formDataVal.listDelay ? parseInt(formDataVal.listDelay) : 0
   const listTurnDelayTime = formDataVal.trunPageDelay ? parseInt(formDataVal.trunPageDelay) : 0
   const contentDelayTime = formDataVal.contentDelay ? parseInt(formDataVal.contentDelay) : 0
+  const filterResource = formDataVal.filterResource
   if (cssMark) {
     // 替换
     cssMark.listDelayTime = listDelayTime
     cssMark.listTurnDelayTime = listTurnDelayTime
     cssMark.contentDelayTime = contentDelayTime
+    cssMark.filterResource = filterResource
     payload.value = cssMark
   } else {
     // 初始化
@@ -353,6 +370,7 @@ const doSaveInfo = () => {
       listDelayTime,
       listTurnDelayTime,
       contentDelayTime,
+      filterResource
     }
   }
   emit('save', payload)

frontend/src/views/CodeList.vue

@@ -466,7 +466,7 @@ const getModifyUserList = async () => {
             const arr = filterConfig.modifyUserList
             const reqArr = data.list.map(r => {
                 return {
-                    label: r.s_name,
+                    label: r.s_fullname,
                     value: r.s_name,
                 }
             })
@@ -696,7 +696,7 @@ const tableEvents = {
             stype: '提交',
             code: lua.code
         }
-        lua.state = 1
+        // lua.state = 1
         ServerActionUpdateCodeState({ lua: [lua], param }).then(r => {
             if (r.err === 1) {
                 ElMessage({
@@ -748,7 +748,7 @@ const tableEvents = {
         const param = {
             stype: '退回',
         }
-        lua.state = 12
+        // lua.state = 12
         lua.reason = filters.rollbackReason
         ServerActionUpdateCodeState({ lua: [lua], param }).then(r => {
             if (r.err === 1) {

frontend/src/views/ReviewList.vue

@@ -443,7 +443,7 @@ const getModifyUserList = async () => {
             const arr = filterConfig.modifyUserList
             const reqArr = data.list.map(r => {
                 return {
-                    label: r.s_name,
+                    label: r.s_fullname,
                     value: r.s_name,
                 }
             })
@@ -644,6 +644,7 @@ const getLuaParams = row => {
         priority: row.priority,
         spiderimportant: row.spiderimportant,
         modifytime: row.modifytime,
+        state: row.state,
     }
     return baseInfo
 }
@@ -721,7 +722,7 @@ const tableEvents = {
         if (Array.isArray(rowArr) && rowArr.length > 0) {
             rowArr.forEach(row => {
                 const lua = getLuaParams(row)
-                lua.state = info.state
+                // lua.state = info.state
                 lua.reason = info.reason
                 luaArr.push(lua)
             })
@@ -785,7 +786,8 @@ const tableEvents = {
         }
         const luaArr = list.map(r => {
             const lua = getLuaParams(r)
-            lua.state = r.state
+            // lua.state = r.state
+            lua.event = r.event
             return lua
         })
         const param = {