From 5a954ed5ab6a5c8589435423c669697dd554819b Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Mon, 9 Sep 2024 16:19:49 +0800
Subject: [PATCH] 研判状态改变

---
 src/assets/data.js                       | 11 ++++++++++-
 src/views/DisposalSuggestions/index.vue  | 10 ++++------
 src/views/baseCaseHandling/index.vue     |  8 ++++++--
 src/views/baseInspectionReport/Form.vue  |  1 -
 src/views/baseSpecialAction/Form.vue     |  1 -
 src/views/baseSpecialAction/index.vue    |  1 -
 src/views/baseSpecialhandle/index.vue    |  3 ---
 src/views/baseSystemInfo/InspectForm.vue |  1 -
 8 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/assets/data.js b/src/assets/data.js
index df05b4d..604b3a7 100644
--- a/src/assets/data.js
+++ b/src/assets/data.js
@@ -1,4 +1,13 @@
 // 假数据
 
 // 1.归属平台
-export const MediaPlatList = ['微信', '微博', '抖音', '今日头条', '小红书', '其他'];
\ No newline at end of file
+export const MediaPlatList = ['微信', '微博', '抖音', '今日头条', '小红书', '其他'];
+
+// 核查处置状态列表
+const reportStatusList = [
+    {id: '577006621985604869', name: '未研判'},
+    {id: '577006641364189019', name: '未下发'},
+    {id: '577004235234524513', name: '待处置'},
+    {id: '577006696312866053', name: '已处置'},
+    {id: '577006666214540549', name: '已研判'},
+];
\ No newline at end of file
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index 849dcc9..e38a39c 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -40,11 +40,9 @@
                <NCC-table v-loading="listLoading" :data="list">
                    <el-table-column show-overflow-tooltip prop="platformNameStr" label="应用名称" align="left" />
                    <el-table-column show-overflow-tooltip label="应用类型" prop="platformType" align="left">
-                           <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</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>
+                        <template slot-scope="scope">{{ scope.row.platformNameStr || scope.row.platformName }}</template>
                    </el-table-column>
+                   <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left" />
                    <!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> -->
 				    <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" />
                     <el-table-column show-overflow-tooltip prop="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/>
@@ -59,8 +57,8 @@
                    </el-table-column> -->
                    <el-table-column label="操作" fixed="right" width="100">
                         <template slot-scope="scope">
-                                <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’可以研判 -->
-                           <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">{{ scope.row.stage == '577006621985604869' ? '研判' : '下发'}}</el-button>
+                                <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’ / 已处置 ‘577006696312866053’ 可以研判 -->
+                           <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage) == -1">{{ scope.row.stage == '577006641364189019' ? '下发' : '研判'}}</el-button>
                            <el-button type="text" v-else @click="toHandle(scope.row.id)" >处理</el-button>
                            <el-button type="text" @click="toDetail(scope.row.id)" >详情</el-button>
                        </template>
diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue
index 64d78ba..1a0d677 100644
--- a/src/views/baseCaseHandling/index.vue
+++ b/src/views/baseCaseHandling/index.vue
@@ -61,8 +61,12 @@
               <!-- <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/> -->
               <el-table-column prop="number" label="档案号" align="left" show-overflow-tooltip/>
               <el-table-column prop="registrationTime" label="登记时间" :formatter="ncc.tableDateFormat" align="left" show-overflow-tooltip/>
-              <el-table-column prop="systemNameStr" label="应用名称" align="left" width="150" show-overflow-tooltip />
-              <el-table-column prop="registeredEntityStr" label="运营主体" align="left" show-overflow-tooltip/>
+              <el-table-column prop="systemNameStr" label="应用名称" align="left" width="150" show-overflow-tooltip >
+                <template slot-scope="scope">{{ scope.row.systemNameStr || scope.row.systemName }}</template>
+              </el-table-column>
+              <el-table-column prop="registeredEntityStr" label="运营主体" align="left" show-overflow-tooltip>
+                <template slot-scope="scope">{{ scope.row.registeredEntityStr || scope.row.registeredEntity }}</template>
+              </el-table-column>
               <el-table-column label="类别" prop="category" align="left">
                 <template slot-scope="scope">{{ scope.row.category | dynamicTextUP(systemTypeOptions) }}</template>
               </el-table-column>
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 78fa387..7fe85be 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -386,7 +386,6 @@ export default {
     dataFormSubmit() {
       this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
-          console.log(this.dataForm);
           let obj = {
             ...this.dataForm,
             questionType: this.dataForm.questionType == '其他' ? this.dataForm.otherQuestionType : this.dataForm.questionType,
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index 8244fa9..7545092 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -293,7 +293,6 @@ export default {
           ...this.dataForm,
           state: type
         }
-        console.log(obj);
         let url = !this.dataForm.id ? '/Extend/BaseSpecialAction/Release' : '/Extend/BaseSpecialAction/Update';
         let method = !this.dataForm.id ? 'PUT' : 'POST';
         this.toPostForm(url, method, obj);
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 4581527..5ce01f2 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -159,7 +159,6 @@ export default {
         params: query,
       }).then((res) => {
         this.list = res.data.list;
-        // console.log(this.list, 'list');
         this.total = res.data.pagination.total;
         this.listLoading = false;
       }).catch(() => {
diff --git a/src/views/baseSpecialhandle/index.vue b/src/views/baseSpecialhandle/index.vue
index c642cee..ab063e7 100644
--- a/src/views/baseSpecialhandle/index.vue
+++ b/src/views/baseSpecialhandle/index.vue
@@ -190,9 +190,6 @@ export default {
       //   data: {type: 1},
       // }).then((res) => {
       // this.BaseList = res.data.list[0].children.find(v => v.category == row.originId);
-
-      //   res.data.
-      //  console.log(res);
       // });
     },
 
diff --git a/src/views/baseSystemInfo/InspectForm.vue b/src/views/baseSystemInfo/InspectForm.vue
index e1a0925..38660d6 100644
--- a/src/views/baseSystemInfo/InspectForm.vue
+++ b/src/views/baseSystemInfo/InspectForm.vue
@@ -285,7 +285,6 @@ export default {
     dataFormSubmit() {
       this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
-          console.log(this.dataForm);
           let obj = {
             ...this.dataForm,
             questionType: this.dataForm.questionType == '其他' ? this.dataForm.otherQuestionType : this.dataForm.questionType,
--
libgit2 0.21.4