Commit 0463d796 by 蒋勇

d

parent e50af0a1
......@@ -17,5 +17,9 @@ module.exports = {
},
parserOptions: {
parser: 'babel-eslint'
},
env:{
jquery:true,
node:true
}
}
......@@ -21,6 +21,7 @@
"html2canvas": "^1.0.0-alpha.12",
"iview": "^3.2.2",
"iview-area": "^1.5.17",
"jquery": "^3.5.1",
"js-cookie": "^2.2.0",
"simplemde": "^1.11.2",
"sortablejs": "^1.7.0",
......
......@@ -15,6 +15,7 @@ import '@/assets/icons/iconfont.css'
import TreeTable from 'tree-table-vue'
import VOrgTree from 'v-org-tree'
import 'v-org-tree/dist/v-org-tree.css'
import $ from 'jquery'
import ChildList from "@/view/components/tables/biztables.vue"
Vue.component("ChildList",ChildList)
// 实际打包时应该不引入mock
......
......@@ -28,7 +28,7 @@ export default {
],
lists: [
{
title: "子列表",
title: "路由信息",
bizCode: "route_info",
packageName:"common",
modelName:"route"
......
......@@ -120,9 +120,15 @@ export default {
Forms
},
props: {
initWhere: {
type: Object,
default(){
return {}
}
},
initPropZIndex: {
type: Number,
default: 100
default: 1100
},
packageName: String,
modelName: String,
......@@ -198,7 +204,12 @@ export default {
methods: {
ondrawvisable(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) {
......@@ -218,6 +229,10 @@ export default {
} else {
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.pageInfo = {
pageSize: this.pageInfo.pageSize,
......@@ -413,6 +428,7 @@ export default {
created() {},
computed: {
drawstyle() {
console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",this.initZIndex)
return {
"z-index": this.initZIndex
};
......
......@@ -107,7 +107,7 @@
:modelName="lst['modelName']"
:metaName="lst['bizCode']"
:packageName="lst['packageName']"
:initPropZIndex="200"
:initPropZIndex="1100"
></ChildList>
</TabPane>
</Tabs>
......
const path = require('path')
const webpack = require('webpack')
const resolve = dir => {
return path.join(__dirname, dir)
}
......@@ -35,10 +35,28 @@ module.exports = {
.set('_c', resolve('src/components'))
},
// 设为false打包时不生成.map文件
productionSourceMap: false
productionSourceMap: false,
// 这里写你调用接口的基础路径,来解决跨域,如果设置了代理,那你本地开发环境的axios的baseUrl要写为 '' ,即空字符串
// devServer: {
// proxy: 'localhost:3000'
// }
configureWebpack: {
plugins: [
new webpack.ProvidePlugin({
$:"jquery",
jQuery:"jquery",
"windows.jQuery":"jquery"
})
]
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment