Merge branch 'master' of http://gitea.biutag.com/supervision/supervision-vue

src/components/file/list.vue

@@ -499,4 +499,4 @@ function rotateRight() {
         color: #fff;
     }
 }
-</style>
+</style>

src/components/file/upload.vue

@@ -70,7 +70,7 @@ watch(
 
 watch(files, () => {
     emit("update:files", files.value);
-});
+},{immediate:true});
 
 function beforeUpload(file) {
     // 文件大小限制 1024 * 1024 * 100 （100MB）

src/views/datav/Global.vue

@@ -301,7 +301,7 @@ const option = ref({
           <div class="tooltip-title">${dataItem.originalName}</div>
           <div class="tooltip-content">
             <ul class="tooltip-ul" >
-              <li>现场督察 <span>${dataItem.supervisePro || 0}</span></li>
+              <li>现场督察 <span>${dataItem.supervisionPro || 0}</span></li>
               <li>数字督察 <span>${dataItem.numSupervisionPro  || 0}</span></li>
               <li>案件核查<span>${dataItem.caseVerificationPro  || 0}</span></li>
               <li>局长信箱 <span>${dataItem.mailboxNumber  || 0}</span></li>

src/views/mobileSupervise/Inspection.vue

@@ -1124,7 +1124,7 @@
           <el-table-column
               label="是否存在督察问题"
               prop="hasProblem"
-              width="120"
+              width="80"
               align="center"
           >
             <template #default="{ row }">
@@ -1135,9 +1135,14 @@
           <el-table-column
               label="单位"
               prop="departName"
-              width="140"
+              width="80"
               show-overflow-tooltip
           />
+          <el-table-column
+            prop="createName"
+            label="问题录入人"
+            width="80"
+          />
           <el-table-column label="下发状态" >
             <template #default="{row}">
               <el-tag type="info" v-if=" row.hasProblem && row.distributionState == '0' ">未下发</el-tag>
@@ -1240,6 +1245,11 @@
               width="140"
               show-overflow-tooltip
           />
+          <el-table-column
+              prop="createName"
+              label="问题录入人"
+              width="80"
+          />
           <el-table-column
               label="问题类型"
               prop="problemType"
@@ -1384,6 +1394,11 @@
             prop="testingResult"
             width="90"
         />
+        <el-table-column
+          label="问题录入人"
+          prop="createName"
+          width="80"
+        />
         <el-table-column
             label="测酒时间"
             prop="testingTime"
@@ -1637,6 +1652,7 @@
                 <p>督察状态: {{ props.row.supStatus }}</p>
                 <p >督察方式: {{ props.row.supType }}</p>
                 <p>督察情况: {{props.row.supDesc}}</p>
+                <p>录入人：{{props.row.createName}}</p>
                 <p>附件：</p>
                 <file-list v-model:files="props.row.fileVoList" :removeEnable="false" />
               </div>
@@ -1652,6 +1668,7 @@
           </el-table-column>
           <el-table-column label="督察方式" prop="supType"></el-table-column>
           <el-table-column label="督察情况" prop="supDesc"></el-table-column>
+          <el-table-column label="问题录入人" prop="createName"></el-table-column>
           <el-table-column label="操作">
             <template #default="{row}">
               <el-button  v-if="row.supStatus != '在控'" @click="issueMatterFun(row,'risk_personal')" type="primary" link>下发</el-button>

src/views/mobileSupervise/TaskProblem.vue

@@ -69,8 +69,9 @@
       </el-tabs>
         <div class="table-container">
             <el-table :data="list" v-loading="loading">
-                <el-table-column label="发现时间" prop="createTime" />
-                <el-table-column label="问题来源" >
+                <el-table-column label="发现时间" prop="createTime" width="120" />
+                <el-table-column label="问题录入时间" prop="supTime" width="120"></el-table-column>
+                <el-table-column label="问题来源"  width="100">
                     <template #default="{ row }">
                         <span>{{ getDictLable(dict.taskType, row.taskType) }}</span>
                     </template>
@@ -83,6 +84,7 @@
                 <el-table-column
                     label="涉及人员"
                     prop="peoples"
+                    width="80"
                     show-overflow-tooltip
                 />
                 <el-table-column
@@ -96,8 +98,9 @@
                     label="问题描述"
                     prop="thingDesc"
                     show-overflow-tooltip
+
                 />
-                <el-table-column label="分发状态">
+                <el-table-column label="分发状态" width="100">
                     <template #default="{ row }">
                         <span v-if="row.distributionState === '0'">未分发</span>
                         <span v-if="row.distributionState === '1'">已分发</span>
@@ -111,13 +114,7 @@
                             @click="showDeatil(row)"
                             >问题详情</el-button
                         >
-                        <el-button
-                          type="primary"
-                          link
-                          @click="upProblemStateFun(row)"
-                        >
-                          {{row.problemState == '1'?'删除':'恢复'}}
-                        </el-button>
+
                         <el-button
                                     @click="upProblemFun(row)"
                                     type="primary"
@@ -138,7 +135,13 @@
 <!--                            @click="delProblemsFun(row)"-->
 <!--                            >删除</el-button-->
 <!--                        >-->
-
+                      <el-button
+                          :type="row.problemState == '1'?'danger':'primary' "
+                          link
+                          @click="upProblemStateFun(row)"
+                      >
+                        {{row.problemState == '1'?'删除':'恢复'}}
+                      </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -425,7 +428,7 @@
           <file-upload
               style="width: 100%"
               :uploadDrag="true"
-              :files="upFormData.files"></file-upload>
+              v-model:files="upFormData.files"></file-upload>
         </el-col>
       </el-row>
     </el-form>
@@ -519,7 +522,7 @@
     inputPeopleFun();
     const handleUpData = async()=>{
       upLoading.value=true
-      console.log('upFormData',upFormData.value)
+
       const res = await  upTaskProblem(upFormData.value)
       upShow.value=false;
       getList()
@@ -533,6 +536,7 @@
       upFormData.value={
       }
     }
+
     //下发问题
     const handleSubmitTask =async ()=>{
       await formRefs.value.validate();
@@ -599,7 +603,7 @@
       upFormData.value=await getTaskProblem(row.id)
       upFormData.value.files =  JSON.parse(upFormData.value.files )
       if(upFormData.value.peoples ){
-        console.log('peoples',upFormData.value.peoples)
+
         let lists = JSON.parse(upFormData.value.peoples );
         upFormData.value.peoples=lists;
         upFormData.value.peopleIds = lists.map((s)=>{
@@ -626,6 +630,12 @@
 
     },{deep:true,immediate:true})
 
+
+    watch(()=>upFormData.value.files,(val)=>{
+      console.log('val',val)
+      upFormData.value.files = val;
+    },{immediate:true,deep:true})
+
 </script>
 <style lang="scss" scoped>