详情返回带查询条件

src/views/auditPages/assetsManagement/assetsAuth.vue

@@ -1,9 +1,9 @@
 <template>
-  <assetsTypeOne :pageType="$route.query.pageType" :id="$route.query.id" v-if="$route.query.type == 0" />
-  <assetsTypeTwo :pageType="$route.query.pageType" :id="$route.query.id" v-else-if="$route.query.type == 1" />
-  <assetsTypeThree :pageType="$route.query.pageType" :id="$route.query.id" v-else-if="$route.query.type == 2" />
-  <assetsTypeFour :pageType="$route.query.pageType" :id="$route.query.id" v-else-if="$route.query.type == 3" />
-  <assetsTypeFive :pageType="$route.query.pageType" :id="$route.query.id" v-else-if="$route.query.type == 4" />
+  <assetsTypeOne :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" v-if="$route.query.type == 0" />
+  <assetsTypeTwo :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" v-else-if="$route.query.type == 1" />
+  <assetsTypeThree :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" v-else-if="$route.query.type == 2" />
+  <assetsTypeFour :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" v-else-if="$route.query.type == 3" />
+  <assetsTypeFive :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" v-else-if="$route.query.type == 4" />
 </template>
 <script>
 // web资产

src/views/auditPages/assetsManagement/email.vue

@@ -245,6 +245,9 @@ export default {
     }
   },
   mounted(){
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.getDeptTree();
     this.cancalDebounce();
@@ -347,13 +350,15 @@ export default {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "look",
           type:3,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline
         }})
       } else if(id == 2) {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "change",
           type:3,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline
         }})
       } else if(id == 3) {
         const userIds = row.id;

src/views/auditPages/assetsManagement/index.vue

@@ -264,6 +264,10 @@ export default {
     }
   },
   mounted(){
+    // console.log(this.$route.params,"params");
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.getDeptTree();
     this.cancalDebounce();
@@ -365,13 +369,15 @@ export default {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "look",
           type:0,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline,
         }})
       } else if(id == 2) {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "change",
           type:0,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline,
         }})
       } else if(id == 3) {
         const userIds = row.id;

src/views/auditPages/assetsManagement/mobileApplication.vue

@@ -271,6 +271,9 @@ export default {
     }
   },
   mounted(){
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.getDeptTree();
     this.cancalDebounce();
@@ -373,13 +376,15 @@ export default {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "look",
           type:4,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline
         }})
       } else if(id == 2) {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "change",
           type:4,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline
         }})
       } else if(id == 3) {
         const userIds = row.id;

src/views/auditPages/assetsManagement/officialAccount.vue

@@ -257,6 +257,9 @@ export default {
     }
   },
   mounted(){
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.getDeptTree();
     this.cancalDebounce();
@@ -359,13 +362,15 @@ export default {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "look",
           type:2,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline
         }})
       } else if(id == 2) {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "change",
           type:2,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline
         }})
       } else if(id == 3) {
         const userIds = row.id;

src/views/auditPages/assetsManagement/program.vue

@@ -256,6 +256,9 @@ export default {
     }
   },
   mounted(){
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.getDeptTree();
     this.cancalDebounce();
@@ -357,13 +360,15 @@ export default {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "look",
           type:1,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline
         }})
       } else if(id == 2) {
         this.$router.push({name: 'AssetsAuth',query: {
           pageType: "change",
           type:1,
-          id:row.id
+          id:row.id,
+          queryData:this.formInline
         }})
       } else if(id == 3) {
         const userIds = row.id;

src/views/auditPages/taskManagement/audit copy.vue

@@ -2532,7 +2532,15 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required>
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2759,7 +2767,7 @@ export default {
     'zc_yhgm','zc_xtbsfs','zc_hlwkfyt','fgfw','wlxz','ywlx','hlqk','fwdx',
     'fwfw','dbxx_dbdj','dbxx_zjps','sf_cpszsdj','sjzc_gxsx','sjzc_kfsx','sjzc_sjly',
     'sjzc_gxzq','sjzc_sjfjfl','fwq_czxt','wlw_fwdx','wlw_wlhlqk','wlw_fwfw','dwlx','sb_ip',
-    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls'
+    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls', 'database_type'
   ],
   components:{
     myUpload,

src/views/auditPages/unitAutonomicFill/assetsAuth.vue

@@ -1,9 +1,9 @@
 <template>
-  <assetsTypeOne :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-if="$route.query.type == 0" />
-  <assetsTypeTwo :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 1" />
-  <assetsTypeThree :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 2" />
-  <assetsTypeFour :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 3" />
-  <assetsTypeFive :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 4" />
+  <assetsTypeOne :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-if="$route.query.type == 0" />
+  <assetsTypeTwo :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 1" />
+  <assetsTypeThree :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 2" />
+  <assetsTypeFour :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 3" />
+  <assetsTypeFive :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 4" />
 </template>
 <script>
 // web资产

src/views/auditPages/unitAutonomicFill/index.vue

@@ -86,7 +86,7 @@
                   <span class="look-info" style="color: #1485EF;">查看</span>
                 </div>
                 <!--  -->
-                <div v-if="scope.row.auditState == 1 || scope.row.auditState == 3" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
+                <div v-if="scope.row.auditState == 1" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
                   @click="delInfo(scope.row)">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="del-info" style="color: #1485EF;">审批</span>
@@ -262,7 +262,9 @@ export default {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "look",
           btnShow: this.btnShow,
-          id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
+          id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null,
+          queryData:this.pagination,
+          name:'UnitFill'
         }
       })
     },
@@ -273,7 +275,9 @@ export default {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "change",
           btnShow: this.btnShow,
-          id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
+          id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null,
+          queryData:this.pagination,
+          name:'UnitFill'
         }
       })
     },
@@ -328,6 +332,9 @@ export default {
     next(vm => {
       if(from.path == "/unitAssetsAuth") {
         vm.btnShow = from.query.btnShow
+        if(from.query.queryData) {
+          vm.pagination = from.query.queryData;
+        }
         if(vm.btnShow == 'web') {
           vm.getInfo(1);
         } else if(vm.btnShow == 'xcx') {

src/views/auditPages/unitManagement/index.vue

@@ -565,6 +565,9 @@
             <el-button type="primary" @click="newUnit" :disabled="false">确定</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType == 'look'">
+          <el-button type="primary" @click="cancel">返回</el-button>
+        </el-row>
       </div>
     </div>
   </div>
@@ -765,7 +768,8 @@ export default {
             postUnit('put',this.ruleForm).then(res=>{
               this.loading = false;
               this.$modal.msgSuccess("修改成功");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:'Unit',params:this.$route.query.queryData})
             }).catch(err=>{
               this.loading = false;
             })
@@ -810,7 +814,8 @@ export default {
       })
     },
     cancel(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:'Unit',params:this.$route.query.queryData})
     },
   },
   beforeRouteEnter(to,from,next){

src/views/components/assetsType/index.vue

@@ -17,6 +17,7 @@
               <el-form-item label="单位名称" required prop="dwmc">
                 <!-- <el-input v-model="ruleForm.dwmc" placeholder="请输入单位名称"></el-input> -->
                 <el-autocomplete
+                  :disabled="!disabledTwo"
                   v-model="ruleForm.dwmc"
                   :fetch-suggestions="querySearchAsync"
                   placeholder="请输入单位名称"
@@ -2613,7 +2614,15 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required>
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2805,6 +2814,9 @@
             <el-button type="primary" @click="newAssets" :loading="loading">保存</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
   </div>
@@ -2820,7 +2832,7 @@ export default {
     'zc_yhgm','zc_xtbsfs','zc_hlwkfyt','fgfw','wlxz','ywlx','hlqk','fwdx',
     'fwfw','dbxx_dbdj','dbxx_zjps','sf_cpszsdj','sjzc_gxsx','sjzc_kfsx','sjzc_sjly',
     'sjzc_gxzq','sjzc_sjfjfl','fwq_czxt','wlw_fwdx','wlw_wlhlqk','wlw_fwfw','dwlx','sb_ip',
-    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls'
+    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls', 'database_type'
   ],
   components:{
     myUpload
@@ -3004,9 +3016,10 @@ export default {
       },
       disabled:false,
       loading:false,
+      disabledTwo:true,
     }
   },
-  props:['pageType', 'id'],
+  props:['pageType', 'id', 'queryData'],
   mounted(){
     if(this.pageType == 'look') {
       this.getInfo(this.id)
@@ -3025,6 +3038,7 @@ export default {
     } else if(this.pageType == 'change') {
       this.getInfo(this.id)
       this.disabled = false;
+      this.disabledTwo = false;
       this.isMore = true;
     }
   },
@@ -3254,7 +3268,8 @@ export default {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("修改成功");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:'Assets',params: this.queryData})
             })
           } else {
             assetUnitData('post',this.ruleForm).then(res=>{
@@ -3268,7 +3283,8 @@ export default {
       })
     },
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:'Assets',params: this.queryData})
     },
   },
   // beforeRouteEnter(to,from,next){

src/views/components/assetsType/index_v1.vue

@@ -13,6 +13,7 @@
                 <!-- <el-input v-model="ruleForm.ssdw" placeholder="请输入所属单位"></el-input> -->
                 <!-- @select="handleSelect" -->
                 <el-autocomplete
+                  :disabled="!disabledTwo"
                   v-model="ruleForm.ssdw"
                   :fetch-suggestions="querySearchAsync"
                   placeholder="请输入所属单位"
@@ -264,6 +265,9 @@
             <el-button type="primary" @click="newAssets" :loading="loading">保存</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
   </div>
@@ -287,9 +291,10 @@ export default {
       },
       loading:false,
       disabled:false,
+      disabledTwo:true
     }
   },
-  props:['pageType', 'id'],
+  props:['pageType', 'id', 'queryData'],
   mounted(){
     if(this.pageType == 'look') {
       this.getInfo(this.id)
@@ -307,6 +312,7 @@ export default {
     } else if(this.pageType == 'change') {
       this.getInfo(this.id)
       this.disabled = false;
+      this.disabledTwo = false;
     }
   },
   methods:{
@@ -343,7 +349,8 @@ export default {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("修改成功");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:'Program',params: this.queryData})
             })
           } else {
             assetMiniPrograms('post',this.ruleForm).then(res=>{
@@ -357,7 +364,8 @@ export default {
       })
     },
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:'Program',params: this.queryData})
     },
   },
 }

src/views/components/assetsType/index_v2.vue

@@ -12,6 +12,7 @@
               <el-form-item label="所属单位" prop="ssdw">
                 <!-- <el-input v-model="ruleForm.ssdw" placeholder="请输入单位名称"></el-input> -->
                 <el-autocomplete
+                  :disabled="!disabledTwo"
                   v-model="ruleForm.ssdw"
                   :fetch-suggestions="querySearchAsync"
                   placeholder="请输入所属单位"
@@ -391,6 +392,9 @@
             <el-button type="primary" @click="newAssets" :loading="loading">保存</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
   </div>
@@ -414,9 +418,10 @@ export default {
       },
       loading:false,
       disabled:false,
+      disabledTwo:true,
     }
   },
-  props:['pageType', 'id'],
+  props:['pageType', 'id', 'queryData'],
   mounted(){
     if(this.pageType == 'look') {
       this.getInfo(this.id)
@@ -434,6 +439,8 @@ export default {
     } else if(this.pageType == 'change') {
       this.getInfo(this.id)
       this.disabled = false;
+      this.disabledTwo = false;
+
     }
   },
   methods:{
@@ -473,7 +480,8 @@ export default {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("修改成功");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:'OfficialAccount',params: this.queryData})
             })
           } else {
             assetOfficialAccount('post',this.ruleForm).then(res=>{
@@ -487,7 +495,8 @@ export default {
       })
     },
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:'OfficialAccount',params: this.queryData})
     },
   },
 }

src/views/components/assetsType/index_v3.vue

@@ -12,6 +12,7 @@
               <el-form-item label="所属单位" prop="ssdw">
                 <!-- <el-input v-model="ruleForm.ssdw" placeholder="请输入单位名称"></el-input> -->
                 <el-autocomplete
+                  :disabled="!disabledTwo"
                   v-model="ruleForm.ssdw"
                   :fetch-suggestions="querySearchAsync"
                   placeholder="请输入所属单位"
@@ -204,6 +205,9 @@
             <el-button type="primary" @click="newAssets" :loading="loading">保存</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
   </div>
@@ -227,9 +231,10 @@ export default {
       },
       loading:false,
       disabled:false,
+      disabledTwo:true,
     }
   },
-  props:['pageType', 'id'],
+  props:['pageType', 'id', 'queryData'],
   mounted(){
     if(this.pageType == 'look') {
       this.getInfo(this.id)
@@ -247,6 +252,7 @@ export default {
     } else if(this.pageType == 'change') {
       this.getInfo(this.id)
       this.disabled = false;
+      this.disabledTwo = false;
     }
   },
   methods:{
@@ -278,7 +284,8 @@ export default {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("修改成功");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:'Email',params: this.queryData})
             })
           } else {
             assetEmail('post',this.ruleForm).then(res=>{
@@ -292,7 +299,8 @@ export default {
       })
     },
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:'Email',params: this.queryData})
     },
   },
 }

src/views/components/assetsType/index_v4.vue

@@ -12,6 +12,7 @@
               <el-form-item label="所属单位" required prop="ssdw">
                 <!-- <el-input v-model="ruleForm.ssdw" placeholder="请输入单位名称"></el-input> -->
                 <el-autocomplete
+                  :disabled="!disabledTwo"
                   v-model="ruleForm.ssdw"
                   :fetch-suggestions="querySearchAsync"
                   placeholder="请输入所属单位"
@@ -180,6 +181,9 @@
             <el-button type="primary" @click="newAssets" :loading="loading">保存</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
   </div>
@@ -203,9 +207,10 @@ export default {
       },
       loading:false,
       disabled:false,
+      disabledTwo:true,
     }
   },
-  props:['pageType', 'id'],
+  props:['pageType', 'id', 'queryData'],
   mounted(){
     if(this.pageType == 'look') {
       this.getInfo(this.id)
@@ -223,6 +228,7 @@ export default {
     } else if(this.pageType == 'change') {
       this.getInfo(this.id)
       this.disabled = false;
+      this.disabledTwo = false;
     }
   },
   methods:{
@@ -254,7 +260,8 @@ export default {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("修改成功");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:'MobileApplication',params: this.queryData})
             })
           } else {
             assetApp('post',this.ruleForm).then(res=>{
@@ -268,7 +275,8 @@ export default {
       })
     },
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:'MobileApplication',params: this.queryData})
     },
   },
 }

src/views/components/myAssetsType/index.vue

@@ -2533,7 +2533,15 @@
                 <el-form-item label="数据库类型" required :prop="`sjzcSjklx`" :rules="{
                   required: true, message: '请输入', trigger: 'blur'
                 }">
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2729,6 +2737,9 @@
             <el-button type="primary" :disabled="false" @click="btnPass" :loading="loading">通过</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
     <my-dialog title="提示" ref="liebiaoDialog" class="taskDialogBox" width="40%">
@@ -2761,7 +2772,7 @@ export default {
     'zc_yhgm','zc_xtbsfs','zc_hlwkfyt','fgfw','wlxz','ywlx','hlqk','fwdx',
     'fwfw','dbxx_dbdj','dbxx_zjps','sf_cpszsdj','sjzc_gxsx','sjzc_kfsx','sjzc_sjly',
     'sjzc_gxzq','sjzc_sjfjfl','fwq_czxt','wlw_fwdx','wlw_wlhlqk','wlw_fwfw','dwlx','sb_ip',
-    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls'
+    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls', 'database_type'
   ],
   components:{
     myUpload,
@@ -2987,7 +2998,7 @@ export default {
       },
     }
   },
-  props:['pageType', 'id', 'audit', 'isModdle'],
+  props:['pageType', 'id', 'audit', 'isModdle', 'name', 'queryData'],
   mounted(){
     if(this.isModdle) {
       if(this.pageType == 'look') {
@@ -3350,7 +3361,8 @@ export default {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             }).catch(err=>{
               this.loading = false;
             })
@@ -3369,7 +3381,8 @@ export default {
     },
     // 取消按钮
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:this.name,params: this.queryData})
     },
     // 驳回按钮
     btnReject(){
@@ -3394,7 +3407,8 @@ export default {
           assetAudit(tijioaobj).then(res=>{
             if(res.code == 200){
               this.$modal.msgSuccess("审核驳回");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             }
           })
         } else {
@@ -3408,7 +3422,8 @@ export default {
       this.loading = true;
       assetAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
         this.$modal.msgSuccess("审核通过");
-        this.$router.go(-1);
+        // this.$router.go(-1);
+        this.$router.push({name:this.name,params: this.queryData})
         this.loading = false;
       }).catch(err=>{
         this.loading = false;

src/views/components/myAssetsType/index_v1.vue

@@ -267,6 +267,9 @@
             <el-button type="primary" :disabled="false" @click="btnPass" :loading="loading">通过</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
     <my-dialog title="提示" ref="liebiaoDialog" class="taskDialogBox" width="40%">
@@ -384,7 +387,7 @@ export default {
       },
     }
   },
-  props:['pageType', 'id', 'audit', 'isModdle'],
+  props:['pageType', 'id', 'audit', 'isModdle', 'name', 'queryData'],
   mounted(){
     if(this.isModdle) {
       if(this.pageType == 'look') {
@@ -474,7 +477,9 @@ export default {
             miniProgramsUnitEdit(this.ruleForm).then(res=>{
               this.loading = false;
               this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              
+              this.$router.push({name:this.name,params: this.queryData})
             })
           } else {
             assetMiniPrograms('post',this.ruleForm).then(res=>{
@@ -487,7 +492,8 @@ export default {
       })
     },
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:this.name,params: this.queryData})
     },
     // 驳回按钮
     btnReject(){
@@ -512,7 +518,8 @@ export default {
           miniProgramsAudit(tijioaobj).then(res=>{
             if(res.code == 200){
               this.$modal.msgSuccess("审核驳回");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             }
           })
         } else {
@@ -526,7 +533,8 @@ export default {
       this.loading = true;
       miniProgramsAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
         this.$modal.msgSuccess("审核通过");
-        this.$router.go(-1);
+        // this.$router.go(-1);
+        this.$router.push({name:this.name,params: this.queryData})
         this.loading = false;
       }).catch(err=>{
         this.loading = false;

src/views/components/myAssetsType/index_v2.vue

@@ -419,6 +419,9 @@
             <el-button type="primary" :disabled="false" @click="btnPass" :loading="loading">通过</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
     <my-dialog title="提示" ref="liebiaoDialog" class="taskDialogBox" width="40%">
@@ -535,7 +538,7 @@ export default {
       },
     }
   },
-  props:['pageType', 'id', 'audit', 'isModdle'],
+  props:['pageType', 'id', 'audit', 'isModdle', 'name', 'queryData'],
   mounted(){
     if(this.isModdle) {
       if(this.pageType == 'look') {
@@ -627,7 +630,8 @@ export default {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             })
           } else {
             assetOfficialAccount('post',this.ruleForm).then(res=>{
@@ -641,7 +645,8 @@ export default {
       })
     },
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:this.name,params: this.queryData})
     },
     // 驳回按钮
     btnReject(){
@@ -666,7 +671,8 @@ export default {
           gzhAudit(tijioaobj).then(res=>{
             if(res.code == 200){
               this.$modal.msgSuccess("审核驳回");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             }
           })
         } else {
@@ -680,7 +686,8 @@ export default {
       this.loading = true;
       gzhAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
         this.$modal.msgSuccess("审核通过");
-        this.$router.go(-1);
+        // this.$router.go(-1);
+        this.$router.push({name:this.name,params: this.queryData})
         this.loading = false;
       }).catch(err=>{
         this.loading = false;

src/views/components/myAssetsType/index_v3.vue

@@ -208,6 +208,9 @@
             <el-button type="primary" :disabled="false" @click="btnPass" :loading="loading">通过</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
     <my-dialog title="提示" ref="liebiaoDialog" class="taskDialogBox" width="40%">
@@ -304,7 +307,7 @@ export default {
       },
     }
   },
-  props:['pageType', 'id', 'audit', 'isModdle'],
+  props:['pageType', 'id', 'audit', 'isModdle', 'name', 'queryData'],
   mounted(){
     if(this.isModdle) {
       if(this.pageType == 'look') {
@@ -390,21 +393,24 @@ export default {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             })
           } else {
             assetEmail('post',this.ruleForm).then(res=>{
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("新增成功");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             })
           }
         }
       })
     },
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:this.name,params: this.queryData})
     },
     // 驳回按钮
     btnReject(){
@@ -429,7 +435,8 @@ export default {
           EmailAudit(tijioaobj).then(res=>{
             if(res.code == 200){
               this.$modal.msgSuccess("审核驳回");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             }
           })
         } else {
@@ -443,7 +450,8 @@ export default {
       this.loading = true;
       EmailAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
         this.$modal.msgSuccess("审核通过");
-        this.$router.go(-1);
+        // this.$router.go(-1);
+        this.$router.push({name:this.name,params: this.queryData})
         this.loading = false;
       }).catch(err=>{
         this.loading = false;

src/views/components/myAssetsType/index_v4.vue

@@ -184,6 +184,9 @@
             <el-button type="primary" :disabled="false" @click="btnPass" :loading="loading">通过</el-button>
           </el-row>
         </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
+          <el-button type="primary" @click="sendBack">返回</el-button>
+        </el-row>
       </div>
     </div>
     <my-dialog title="提示" ref="liebiaoDialog" class="taskDialogBox" width="40%">
@@ -283,7 +286,7 @@ export default {
       },
     }
   },
-  props:['pageType', 'id', 'audit', 'isModdle'],
+  props:['pageType', 'id', 'audit', 'isModdle', 'name', 'queryData'],
   mounted(){
     if(this.isModdle) {
       if(this.pageType == 'look') {
@@ -369,7 +372,8 @@ export default {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             })
           } else {
             assetApp('post',this.ruleForm).then(res=>{
@@ -383,7 +387,8 @@ export default {
       })
     },
     sendBack(){
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$router.push({name:this.name,params: this.queryData})
     },
     // 驳回按钮
     btnReject(){
@@ -408,7 +413,8 @@ export default {
           AppAudit(tijioaobj).then(res=>{
             if(res.code == 200){
               this.$modal.msgSuccess("审核驳回");
-              this.$router.go(-1);
+              // this.$router.go(-1);
+              this.$router.push({name:this.name,params: this.queryData})
             }
           })
         } else {
@@ -422,7 +428,8 @@ export default {
       this.loading = true;
       AppAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
         this.$modal.msgSuccess("审核通过");
-        this.$router.go(-1);
+        // this.$router.go(-1);
+        this.$router.push({name:this.name,params: this.queryData})
         this.loading = false;
       }).catch(err=>{
         this.loading = false;

src/views/components/myUpload/index.vue

@@ -68,7 +68,7 @@ export default {
       number: 0,
       uploadList: [],
       // baseUrl: process.env.VUE_APP_BASE_API,
-      baseUrl: location.origin,
+      baseUrl: location.origin + '/api',
       // uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
       uploadFileUrl: location.origin + '/api/common/upload',
       headers: {
@@ -151,6 +151,14 @@ export default {
       if (res.code === 200) {
         this.uploadList.push({ name: res.fileName, url: res.fileName });
         this.uploadedSuccessfully();
+      } else if(res.code == 401) {
+        this.$store.dispatch('LogOut').then(() => {
+          // location.href = '/login';
+          this.$modal.msgError(res.msg);
+          this.$modal.closeLoading();
+          this.uploadedSuccessfully();
+          this.$router.replace("/login");
+        })
       } else {
         this.number--;
         this.$modal.closeLoading();

src/views/components/renwuType/index_v2.vue

@@ -17,7 +17,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="平台类型" prop="ptlx">
+              <el-form-item label="平台类型" prop="ptlx" required>
                 <el-select v-model="ruleForm.ptlx" placeholder="请选择平台类型" disabled>
                   <el-option v-for="dict in dict.type.sys_ptlx_type" :key="dict.value" :label="dict.label"
                     :value="dict.value" />
@@ -455,6 +455,9 @@ export default {
       }
       assetTaskofficetaskSh(obj).then(res => {
         this.ruleForm = res.data;
+        if(!this.ruleForm.ptlx) {
+          this.ruleForm.ptlx = '1'
+        }
         setTimeout(() => {
           this.$refs.ruleForm.clearValidate()
 

src/views/components/renwuType/webType1.vue

@@ -2315,7 +2315,15 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required>
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2512,7 +2520,7 @@ export default {
     'zc_yhgm', 'zc_xtbsfs', 'zc_hlwkfyt', 'fgfw', 'wlxz', 'ywlx', 'hlqk', 'fwdx',
     'fwfw', 'dbxx_dbdj', 'dbxx_zjps', 'sf_cpszsdj', 'sjzc_gxsx', 'sjzc_kfsx', 'sjzc_sjly',
     'sjzc_gxzq', 'sjzc_sjfjfl', 'fwq_czxt', 'wlw_fwdx', 'wlw_wlhlqk', 'wlw_fwfw', 'dwlx', 'sb_ip',
-    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls'
+    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type'
   ],
   components: {
     myUpload,

src/views/components/renwuType/webType2DW.vue

@@ -2541,7 +2541,15 @@
                 <el-form-item label="数据库类型" required :prop="`sjzcSjklx`" :rules="{
                   required: true, message: '请输入', trigger: 'blur'
                 }">
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2778,7 +2786,7 @@ export default {
     'zc_yhgm', 'zc_xtbsfs', 'zc_hlwkfyt', 'fgfw', 'wlxz', 'ywlx', 'hlqk', 'fwdx',
     'fwfw', 'dbxx_dbdj', 'dbxx_zjps', 'sf_cpszsdj', 'sjzc_gxsx', 'sjzc_kfsx', 'sjzc_sjly',
     'sjzc_gxzq', 'sjzc_sjfjfl', 'fwq_czxt', 'wlw_fwdx', 'wlw_wlhlqk', 'wlw_fwfw', 'dwlx', 'sb_ip',
-    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls'
+    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type'
   ],
   components: {
     myUpload, myDialog

src/views/system/user/index.vue

@@ -453,13 +453,16 @@ export default {
     }
   },
   created() {
-    this.getList();
-    this.getDeptTree();
     // this.getConfigKey("sys.user.initPassword").then(response => {
     //   this.initPassword = response.msg;
     // });
   },
   mounted(){
+    if(this.$route.params) {
+      this.queryParams = this.$route.params;
+    }
+    this.getList();
+    this.getDeptTree();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -540,14 +543,16 @@ export default {
     handleUpdate(row) {
       this.$router.push({name: 'UnitAuth',query: {
         pageType: "change",
-        id: row.id
+        id: row.id,
+        queryData:this.queryParams
       }})
     },
     /** 查看按钮操作 */
     handleLookdate(row){
       this.$router.push({name: 'UnitAuth',query: {
         pageType: "look",
-        id: row.id
+        id: row.id,
+        queryData:this.queryParams
       }})
     },
     /** 删除按钮操作 */

src/views/unitPages/assetRecord/assetsAuth.vue

@@ -1,9 +1,9 @@
 <template>
-  <assetsTypeOne :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" v-if="$route.query.type == 0" />
-  <assetsTypeTwo :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 1" />
-  <assetsTypeThree :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 2" />
-  <assetsTypeFour :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 3" />
-  <assetsTypeFive :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 4" />
+  <assetsTypeOne :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-if="$route.query.type == 0" />
+  <assetsTypeTwo :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 1" />
+  <assetsTypeThree :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 2" />
+  <assetsTypeFour :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 3" />
+  <assetsTypeFive :pageType="$route.query.pageType" :isModdle="true" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 4" />
 </template>
 <script>
 // web资产

src/views/unitPages/assetRecord/index.vue

@@ -262,7 +262,9 @@ export default {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "look",
           btnShow: this.btnShow,
-          id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
+          id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null,
+          name: "AssetRecord",
+          queryData:this.pagination
         }
       })
     },
@@ -274,7 +276,9 @@ export default {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "change",
           btnShow: this.btnShow,
-          id:  this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
+          id:  this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null,
+          name: "AssetRecord",
+          queryData:this.pagination
         }
       })
     },
@@ -329,6 +333,9 @@ export default {
     next(vm => {
       if(from.path == "/assetsAuthRecord") {
         vm.btnShow = from.query.btnShow
+        if(from.query.queryData) {
+          vm.pagination = from.query.queryData;
+        }
         if(vm.btnShow == 'web') {
           vm.getInfo(1);
         } else if(vm.btnShow == 'xcx') {

src/views/unitPages/myAssets/assetsAuth.vue

@@ -1,9 +1,9 @@
 <template>
-  <assetsTypeOne :pageType="$route.query.pageType" :id="$route.query.id" v-if="$route.query.type == 0" />
-  <assetsTypeTwo :pageType="$route.query.pageType" :id="$route.query.id" v-else-if="$route.query.type == 1" />
-  <assetsTypeThree :pageType="$route.query.pageType" :id="$route.query.id" v-else-if="$route.query.type == 2" />
-  <assetsTypeFour :pageType="$route.query.pageType" :id="$route.query.id" v-else-if="$route.query.type == 3" />
-  <assetsTypeFive :pageType="$route.query.pageType" :id="$route.query.id" v-else-if="$route.query.type == 4" />
+  <assetsTypeOne :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-if="$route.query.type == 0" />
+  <assetsTypeTwo :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 1" />
+  <assetsTypeThree :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 2" />
+  <assetsTypeFour :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 3" />
+  <assetsTypeFive :pageType="$route.query.pageType" :id="$route.query.id" :queryData="$route.query.queryData" :name="$route.query.name" v-else-if="$route.query.type == 4" />
 </template>
 <script>
 // web资产

src/views/unitPages/myAssets/email.vue

@@ -124,6 +124,9 @@ export default {
     }
   },
   mounted(){
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
@@ -178,7 +181,9 @@ export default {
       this.$router.push({name: 'myAssetsAuth',query: {
         pageType: id == 1 ? "look" : "change",
         type:3,
-        id:row.id
+        id:row.id,
+        queryData:this.formInline,
+        name:"MyEmail"
       }})
     },
     // 修改table背景色

src/views/unitPages/myAssets/index.vue

@@ -142,6 +142,9 @@ export default {
     }
   },
   mounted(){
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
@@ -188,7 +191,9 @@ export default {
       this.$router.push({name: 'myAssetsAuth',query: {
         pageType: id == 1 ? "look" : "change",
         type:0,
-        id: row.id
+        id: row.id,
+        queryData:this.formInline,
+        name:"MyWebAssets"
       }})
     },
     // 修改table背景色

src/views/unitPages/myAssets/mobileApplication.vue

@@ -152,6 +152,9 @@ export default {
     }
   },
   mounted(){
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
@@ -202,7 +205,9 @@ export default {
       this.$router.push({name: 'myAssetsAuth',query: {
         pageType: id == 1 ? "look" : "change",
         type:4,
-        id:row.id
+        id:row.id,
+        queryData:this.formInline,
+        name:"MyMobileApplication"
       }})
     },
     // 修改table背景色

src/views/unitPages/myAssets/officialAccount.vue

@@ -158,6 +158,9 @@ export default {
     }
   },
   mounted(){
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
@@ -208,7 +211,9 @@ export default {
       this.$router.push({name: 'myAssetsAuth',query: {
         pageType: id == 1 ? "look" : "change",
         type:2,
-        id:row.id
+        id:row.id,
+        queryData:this.formInline,
+        name:"MyOfficialAccount"
       }})
     },
     // 修改table背景色

src/views/unitPages/myAssets/program.vue

@@ -157,6 +157,9 @@ export default {
     }
   },
   mounted(){
+    if(this.$route.params) {
+      this.formInline = this.$route.params;
+    }
     this.getList();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
@@ -206,7 +209,9 @@ export default {
       this.$router.push({name: 'myAssetsAuth',query: {
         pageType: id == 1 ? "look" : "change",
         type:1,
-        id:row.id
+        id:row.id,
+        queryData:this.formInline,
+        name:"MyProgram"
       }})
     },
     // 修改table背景色

src/views/unitPages/myTask/audit copy.vue

@@ -2509,7 +2509,15 @@
                 <el-form-item label="数据库类型" required :prop="`sjzcSjklx`" :rules="{
                     required: true, message: '请输入', trigger: 'blur'
                   }">
-                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
+                  <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
+                  <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
+                    <el-option
+                      v-for="dict in dict.type.database_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2736,7 +2744,7 @@ export default {
     'zc_yhgm', 'zc_xtbsfs', 'zc_hlwkfyt', 'fgfw', 'wlxz', 'ywlx', 'hlqk', 'fwdx',
     'fwfw', 'dbxx_dbdj', 'dbxx_zjps', 'sf_cpszsdj', 'sjzc_gxsx', 'sjzc_kfsx', 'sjzc_sjly',
     'sjzc_gxzq', 'sjzc_sjfjfl', 'fwq_czxt', 'wlw_fwdx', 'wlw_wlhlqk', 'wlw_fwfw', 'dwlx', 'sb_ip',
-    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls'
+    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type'
   ],
   components: {
     myUpload,myDialog