d

iview-admin/.eslintrc.js

@@ -17,5 +17,9 @@ module.exports = {
   },
   },
   parserOptions: {
   parserOptions: {
     parser: 'babel-eslint'
     parser: 'babel-eslint'
+  },
+  env:{
+    jquery:true,
+    node:true
   }
   }
 }
 }

iview-admin/package.json

@@ -21,6 +21,7 @@
     "html2canvas": "^1.0.0-alpha.12",
     "html2canvas": "^1.0.0-alpha.12",
     "iview": "^3.2.2",
     "iview": "^3.2.2",
     "iview-area": "^1.5.17",
     "iview-area": "^1.5.17",
+    "jquery": "^3.5.1",
     "js-cookie": "^2.2.0",
     "js-cookie": "^2.2.0",
     "simplemde": "^1.11.2",
     "simplemde": "^1.11.2",
     "sortablejs": "^1.7.0",
     "sortablejs": "^1.7.0",

iview-admin/src/main.js

@@ -15,6 +15,7 @@ import '@/assets/icons/iconfont.css'
 import TreeTable from 'tree-table-vue'
 import TreeTable from 'tree-table-vue'
 import VOrgTree from 'v-org-tree'
 import VOrgTree from 'v-org-tree'
 import 'v-org-tree/dist/v-org-tree.css'
 import 'v-org-tree/dist/v-org-tree.css'
+import $ from 'jquery'
 import ChildList  from "@/view/components/tables/biztables.vue"
 import ChildList  from "@/view/components/tables/biztables.vue"
 Vue.component("ChildList",ChildList)
 Vue.component("ChildList",ChildList)
 // 实际打包时应该不引入mock
 // 实际打包时应该不引入mock

iview-admin/src/store/module/metainfo/appinfo.js

@@ -28,7 +28,7 @@ export default {
     ],
     ],
     lists: [
     lists: [
       {
       {
-        title: "子列表",
+        title: "路由信息",
         bizCode: "route_info",
         bizCode: "route_info",
         packageName:"common",
         packageName:"common",
         modelName:"route"
         modelName:"route"

iview-admin/src/view/components/tables/biztables.vue

@@ -120,9 +120,15 @@ export default {
     Forms
     Forms
   },
   },
   props: {
   props: {
+    initWhere: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
     initPropZIndex: {
     initPropZIndex: {
       type: Number,
       type: Number,
-      default: 100
+      default: 1100
     },
     },
     packageName: String,
     packageName: String,
     modelName: String,
     modelName: String,
@@ -198,7 +204,12 @@ export default {
   methods: {
   methods: {
     ondrawvisable(v) {
     ondrawvisable(v) {
       if(v){
       if(v){
-        this.initZIndex = this.initZIndex + 10;
+        this.initZIndex = this.initZIndex;
+        $("div.ivu-drawer-wrap:even").map((index,item)=>{
+            $(item).css("z-index",""+(this.initZIndex++))
+        })
+        //$("div.ivu-drawer-wrap:last").css('z-index',"'"+this.initZIndex+"'")
+        
       }
       }
     },
     },
     setFormCtlVisable(prop, isShow) {
     setFormCtlVisable(prop, isShow) {
@@ -218,6 +229,10 @@ export default {
       } else {
       } else {
         rtn.search = this.$refs.searchform.formModel;
         rtn.search = this.$refs.searchform.formModel;
       }
       }
+      if(this.initWhere){
+         rtn.search=Object.assign(rtn.search,this.initWhere)
+      }
+      console.log("..................rtn.search", rtn.search)
       rtn.aggsinfo = { sum: this.sum_fields, avg: this.avg_fields };
       rtn.aggsinfo = { sum: this.sum_fields, avg: this.avg_fields };
       rtn.pageInfo = {
       rtn.pageInfo = {
         pageSize: this.pageInfo.pageSize,
         pageSize: this.pageInfo.pageSize,
@@ -413,6 +428,7 @@ export default {
   created() {},
   created() {},
   computed: {
   computed: {
     drawstyle() {
     drawstyle() {
+      console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",this.initZIndex)
       return {
       return {
         "z-index": this.initZIndex
         "z-index": this.initZIndex
       };
       };

iview-admin/src/view/components/tables/forms/forms.vue

@@ -107,7 +107,7 @@
               :modelName="lst['modelName']"
               :modelName="lst['modelName']"
               :metaName="lst['bizCode']"
               :metaName="lst['bizCode']"
               :packageName="lst['packageName']"
               :packageName="lst['packageName']"
-              :initPropZIndex="200"
+              :initPropZIndex="1100"
             ></ChildList>
             ></ChildList>
             </TabPane>
             </TabPane>
           </Tabs>
           </Tabs>

iview-admin/vue.config.js

 const path = require('path')
 const path = require('path')
-
+const webpack = require('webpack')
 const resolve = dir => {
 const resolve = dir => {
   return path.join(__dirname, dir)
   return path.join(__dirname, dir)
 }
 }
@@ -35,10 +35,28 @@ module.exports = {
       .set('_c', resolve('src/components'))
       .set('_c', resolve('src/components'))
   },
   },
   // 设为false打包时不生成.map文件
   // 设为false打包时不生成.map文件
-  productionSourceMap: false
+  productionSourceMap: false,
   // 这里写你调用接口的基础路径，来解决跨域，如果设置了代理，那你本地开发环境的axios的baseUrl要写为 '' ，即空字符串
   // 这里写你调用接口的基础路径，来解决跨域，如果设置了代理，那你本地开发环境的axios的baseUrl要写为 '' ，即空字符串
   // devServer: {
   // devServer: {
   //   proxy: 'localhost:3000'
   //   proxy: 'localhost:3000'
   // }
   // }
+  configureWebpack: {
+
+    plugins: [
+ 
+       new webpack.ProvidePlugin({
+ 
+         $:"jquery",
+ 
+         jQuery:"jquery",
+ 
+         "windows.jQuery":"jquery"
+ 
+       })
+ 
+     ]
+ 
+ }
+
   
   
 }
 }