更改bug

src/assets/styles/public.scss

@@ -309,7 +309,7 @@
 
     div {
       padding: 10px;
-      padding: 10px 20px;
+      padding: 5px 15px;
       border: 1px solid #F5F5F5;
       font-weight: 400;
       font-family: Alibaba PuHuiTiR;

src/views/auditPages/taskManagement/audit.vue

@@ -1357,7 +1357,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if='shaojunbuyao'>
                   <i @click="addGongyinglian('chepingUnit', 1)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'chepingUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1395,7 +1395,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if='shaojunbuyao'>
                   <i @click="addGongyinglian('yjgysUnit', 2)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'yjgysUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1433,7 +1433,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if='shaojunbuyao'>
                   <i @click="addGongyinglian('jfywUnit', 3)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'jfywUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1471,7 +1471,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if='shaojunbuyao'>
                   <i @click="addGongyinglian('xtsjUnit', 4)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'xtsjUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1528,7 +1528,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if='shaojunbuyao'>
                   <i @click="addGongyinglian('xtjsUnit', 5)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'xtjsUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1585,7 +1585,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if='shaojunbuyao'>
                   <i @click="addGongyinglian('xtyyUnit', 7)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'xtyyUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1623,7 +1623,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if='shaojunbuyao'>
                   <i @click="addGongyinglian('aqfwUnit', 6)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'aqfwUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1637,7 +1637,7 @@
             <el-row style="margin: 10px 0;">
               <span class="top-title-two-box">服务器信息</span>
             </el-row>
-            <div v-for="(domain, index) in fwqxx" :key="domain.key" :prop="'fwqxx.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.fwqxx" :key="domain.key" :prop="'fwqxx.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item class="daoqitixingren" required :label="'设备类型' + (index == 0 ? '' : index)">
@@ -1730,7 +1730,7 @@
             <el-row style="margin: 10px 0;">
               <span class="top-title-two-box">网络设备</span>
             </el-row>
-            <div v-for="(domain, index) in wlsb" :key="domain.key" :prop="'wlsb.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.wlsb" :key="domain.key" :prop="'wlsb.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item class="daoqitixingren" required :label="'设备类型' + (index == 0 ? '' : index)">
@@ -1804,7 +1804,7 @@
             <el-row style="margin: 10px 0;">
               <span class="top-title-two-box">安全设备</span>
             </el-row>
-            <div v-for="(domain, index) in aqsb" :key="domain.key" :prop="'aqsb.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.aqsb" :key="domain.key" :prop="'aqsb.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item class="daoqitixingren" required :label="'设备类型' + (index == 0 ? '' : index)">
@@ -2718,13 +2718,14 @@
                 <div>{{ruleForm.bfyy}}</div>
               </el-form-item>
             </el-row>
-            <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
+            
+          </div>
+        </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType == 'change'">
               <el-button type="danger" @click="newAssets(0)">不通过</el-button>
               <el-button type="primary" @click="newAssets(1)" >通过</el-button>
             </el-row>
       </div>
-        </el-form>
-      </div>
     </div>
   </div>
 </template>
@@ -2748,6 +2749,7 @@ export default {
   },
   data() {
     return {
+      shaojunbuyao:false,
       accept:['xls','xlsx','doc','docx','pdf','rar','zip','pcap','txt'],
       acceptTwo:['jpg','jpeg','png'],
       isMore:false,
@@ -2851,19 +2853,6 @@ export default {
             type:6
           }
         ],
-      },
-      // 地理位置
-      dlwz:[],
-      // 系统特征
-      xttz:[],
-      // 防篡改
-      xtfhqkFcg:[],
-      // 防泄漏
-      xtfhqkFxl:[],
-      // 防中断
-      xtfhqkFzd:[],
-      // 防勒索
-      xtfhqkFls:[],
           // 服务器
       fwqxx:[
         {
@@ -2915,6 +2904,20 @@ export default {
           type: 3,
         }
       ],
+      },
+      // 地理位置
+      dlwz:[],
+      // 系统特征
+      xttz:[],
+      // 防篡改
+      xtfhqkFcg:[],
+      // 防泄漏
+      xtfhqkFxl:[],
+      // 防中断
+      xtfhqkFzd:[],
+      // 防勒索
+      xtfhqkFls:[],
+    
       rules:{},
       disabled:false,
       loading:false,
@@ -2942,8 +2945,8 @@ export default {
         });
       })
     } else if (this.$route.query.pageType == 'change') {
+      this.disabled = true;
       this.getInfo(obj)
-      this.disabled = false;
       this.isMore = true;
     }
   },
@@ -2958,7 +2961,13 @@ export default {
           this.ruleForm.xjgywxt = {}
           this.$set(this.ruleForm.xjgywxt, 'remark', "")
         }
+        if(this.ruleForm.fwwz) {
+          let arr = this.ruleForm.fwwz.split("-")
+          this.select = arr[0]
+          this.ruleForm.fwwz = arr[1]
+        }
         this.ruleForm.xttz ? this.xttz = this.ruleForm.xttz.split(',') : [];
+
         let chepingUnit = this.ruleForm.gylxxList.filter((item) => item.type == 1)
         let yjgysUnit = this.ruleForm.gylxxList.filter((item) => item.type == 2)
         let jfywUnit = this.ruleForm.gylxxList.filter((item) => item.type == 3)
@@ -2966,6 +2975,7 @@ export default {
         let xtjsUnit = this.ruleForm.gylxxList.filter((item) => item.type == 5)
         let xtyyUnit = this.ruleForm.gylxxList.filter((item) => item.type == 7)
         let aqfwUnit = this.ruleForm.gylxxList.filter((item) => item.type == 6)
+
         this.$set(this.ruleForm, 'chepingUnit', chepingUnit.length > 0 ? chepingUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 1 }])
         this.$set(this.ruleForm, 'yjgysUnit', yjgysUnit.length > 0 ? yjgysUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 2 }])
         this.$set(this.ruleForm, 'jfywUnit', jfywUnit.length > 0 ? jfywUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 3 }])
@@ -2974,9 +2984,22 @@ export default {
         this.$set(this.ruleForm, 'xtyyUnit', xtyyUnit.length > 0 ? xtyyUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 7 }])
         this.$set(this.ruleForm, 'aqfwUnit', aqfwUnit.length > 0 ? aqfwUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 6 }])
 
-        this.fwqxx = (this.ruleForm.jcwlList.filter((item) => item.type == 1) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 1) : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 1}])
+        let fwqxx = this.ruleForm.jcwlList.filter((item) => item.type == 1)
-        this.wlsb = (this.ruleForm.jcwlList.filter((item) => item.type == 2) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 2) : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 2}])
+        let wlsb = this.ruleForm.jcwlList.filter((item) => item.type == 2)
-        this.aqsb = (this.ruleForm.jcwlList.filter((item) => item.type == 3) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 3) : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 3}])
+        let aqsb = this.ruleForm.jcwlList.filter((item) => item.type == 3)
+
+
+        // this.ruleForm.fwqxx = (this.ruleForm.jcwlList.filter((item) => item.type == 1) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 1) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 1 }])
+
+        this.$set(this.ruleForm, 'fwqxx', fwqxx.length > 0 ? fwqxx : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 1 }])
+
+        this.$set(this.ruleForm, 'wlsb', wlsb.length > 0 ? wlsb : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 2 }])
+
+        this.$set(this.ruleForm, 'aqsb', aqsb.length > 0 ? aqsb : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 3 }])
+
+        // this.ruleForm.wlsb = (this.ruleForm.jcwlList.filter((item) => item.type == 2) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 2) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 2 }])
+
+        // this.ruleForm.aqsb = (this.ruleForm.jcwlList.filter((item) => item.type == 3) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 3) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 3 }])
 
         this.ruleForm.xtfhqkFcg ? this.xtfhqkFcg = this.ruleForm.xtfhqkFcg.split(',') : [];
         this.ruleForm.xtfhqkFcg ? this.xtfhqkFxl = this.ruleForm.xtfhqkFxl.split(',') : [];
@@ -2991,8 +3014,9 @@ export default {
         } else if (this.ruleForm.sheng) {
           this.dlwz = [this.ruleForm.sheng]
         }
+      this.loading = false
+
       })
-        this.loading = false;
 
     },
     changeRadio(id){

src/views/system/user/danweiList.vue

@@ -14,7 +14,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="单位类型：" prop="dwlx">
-              <el-select v-model="queryParams.dwlx" placeholder="用户状态" clearable>
+              <el-select v-model="queryParams.dwlx" placeholder="请选择单位类型" clearable>
                 <el-option v-for="dict in dict.type.dwlx" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>

src/views/unitPages/myTask/audit.vue

@@ -2690,7 +2690,7 @@
                 <div>{{ruleForm.bfyy}}</div>
               </el-form-item>
             </el-row>
-            <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
+            <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType == 'change'">
               <el-button type="danger" @click="newAssets(0)">报废</el-button>
               <el-button @click="newAssets(1)">取消</el-button>
               <el-button type="warning" @click="newAssets(2)">暂存</el-button>
@@ -2699,11 +2699,11 @@
           </div>
         </el-form>
       </div>
-      <my-dialog title="报废原因" ref="liebiaoDialog"  @close="importClose" class="taskDialogBox" width="40%">
+      <my-dialog title="提示" ref="liebiaoDialog"  @close="importClose" class="taskDialogBox" width="40%">
       <el-row>
         <el-col :span="21">
           <el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
-            <el-form-item  prop="bfyy">
+            <el-form-item label="报废原因:" prop="bfyy">
               <el-input v-model="dialogruleForm.bfyy" placeholder="请输入报废原因"></el-input>
             </el-form-item>
             <el-form-item class="newTask-form-item">

src/views/unitPages/myTask/info.vue

@@ -9,7 +9,7 @@
           <div class="top-info">
             <el-row class="top-row">
               <el-col :span="8">
-                <!-- 任务编号：<span>{{ titleInfoObj.id }}</span> -->
+                任务下发时间：<span>{{ titleInfoObj.taskTime }}</span>
               </el-col>
               <el-col :span="8">
                 任务名称：<span>{{ titleInfoObj.taskName }}</span>
@@ -22,9 +22,7 @@
               <el-col :span="8">
                 任务期限：<span>{{ titleInfoObj.taskDeadline }}</span>
               </el-col>
-              <el-col :span="8">
+             
-                任务下发时间：<span>{{ titleInfoObj.taskTime }}</span>
-              </el-col>
             </el-row>
           </div>
         </div>