Skip to content

Commit

Permalink
some changes
Browse files Browse the repository at this point in the history
  • Loading branch information
BoBoooooo committed Oct 30, 2018
1 parent 97ffefa commit b1d2885
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 46 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
"svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
},
"dependencies": {
"echarts": "^3.8.5",
"font-awesome": "4.7.0",
"http-proxy-middleware": "^0.17.3",
"axios": "0.18.0",
"screenfull": "3.3.3",

"echarts": "^3.8.5",
"element-ui": "2.4.6",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"font-awesome": "4.7.0",
"form-making": "^1.1.0",
"http-proxy-middleware": "^0.17.3",
"js-cookie": "2.2.0",
"mini-css-extract-plugin": "^0.4.1",
"normalize.css": "7.0.0",
"nprogress": "0.2.0",
"vue-multiselect": "^2.0.8",
"screenfull": "3.3.3",
"vue": "2.5.17",
"vue-multiselect": "^2.0.8",
"vue-router": "3.0.1",
"vuex": "3.0.1"
},
Expand Down
8 changes: 6 additions & 2 deletions src/components/UploadAffix/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
:data="Params['Param']"
:headers="token"
v-if="!Params.IsDetail"
>
:show-file-list = "false"
:on-success="test()"
>
<el-button size="small" style="float:left;margin-top:10px 0" type="primary">点击上传</el-button>
</el-upload>

Expand Down Expand Up @@ -74,7 +76,9 @@ export default {
})
})
},
test(){
console.log("上传成功");
},
fetchData_File(id) {
this.listLoading = true
GetFileList(id).then(response => {
Expand Down
3 changes: 3 additions & 0 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ import '@/permission' // 权限import axios from 'axios';
// import axios from 'axios'
import '@/styles/index.scss' // global css
import * as filters from './filters' // global filters
import FormMaking from 'form-making' //form designer
import 'form-making/dist/FormMaking.css'

Vue.use(FormMaking)
Vue.use(ElementUI)
Object.keys(filters).forEach(key => {
Vue.filter(key, filters[key])
Expand Down
4 changes: 0 additions & 4 deletions src/utils/fetch.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ service.interceptors.request.use(config => {
service.interceptors.response.use(
response => {
const res = response.data
console.log(response)
if(response.headers["content-type"]=="application/octet-stream")
{
 let date = new Date();
Expand All @@ -49,8 +48,6 @@ service.interceptors.response.use(
        document.body.appendChild(a);
        a.click();
        a.remove();


}
// 401 403 :帐号信息与token不匹配 需要重新拉取token
if (res.code === 401 || res.code === 403) {
Expand Down Expand Up @@ -84,7 +81,6 @@ service.interceptors.response.use(

}

console.log(res)
return res


Expand Down
8 changes: 4 additions & 4 deletions src/views/Archive/person.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:currentpage="listQuery.pageNumber"
:current-page="listQuery.pageNumber"
:page-sizes="[10, 20, 30]"
:pagesize="listQuery.pageSize"  
:page-size="listQuery.pageSize"  
layout="total,sizes, prev, pager, next"
:total="listQuery.totalCount" style="margin-top:5px">
</el-pagination>
Expand Down Expand Up @@ -128,8 +128,8 @@ export default {
temp_obj: {},
listQuery: {
totalCount: null,
pageSize: "10",
pageNumber: "1",
pageSize: 10,
pageNumber: 1,
SearchKey: "",
SearchValue: ""
},
Expand Down
6 changes: 3 additions & 3 deletions src/views/Archive/person_detail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
@current-change="handleCurrentChange"
:currentpage="listQuery.pageNumber"
:page-sizes="[10, 20, 30]"
:pagesize="listQuery.pageSize"  
:page-size="listQuery.pageSize"  
layout="total,sizes, prev, pager, next"
:total="listQuery.totalCount" style="margin-top:5px">
</el-pagination>
Expand Down Expand Up @@ -105,8 +105,8 @@ export default {
temp_obj: {},
listQuery: {
totalCount: null,
pageSize: "10",
pageNumber: "1",
pageSize: 10,
pageNumber: 1,
SearchKey: "",
SearchValue: ""
},
Expand Down
12 changes: 1 addition & 11 deletions src/views/dashboard/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,9 @@ export default {
created() {
this.GetNowTime();
this.GetReport();
console.log("created!");
// this.GetMusic()
},
beforeCreate() {
console.log("beforeCreate");
},
mounted() {
console.log("mounted!");
},
beforeMount() {
console.log("beforemounted");
}
};
</script>

Expand Down
8 changes: 4 additions & 4 deletions src/views/system/dept.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</template>
</el-table-column>
</el-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :currentpage="listQuery.pageNumber"
:page-sizes="[10, 20, 30]" :pagesize="listQuery.pageSize"   layout="total,sizes, prev, pager, next" :total="listQuery.totalCount"
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.pageNumber"
:page-sizes="[10, 20, 30]" :page-size="listQuery.pageSize"   layout="total,sizes, prev, pager, next" :total="listQuery.totalCount"
style="margin-top:5px">
</el-pagination>
<!-- <el-tree :data="depttree" default-expand-all node-key="id" ref="tree" highlight-current :props="defaultProps">
Expand Down Expand Up @@ -88,8 +88,8 @@
},
listQuery: {
totalCount: 0,
pageSize: "10",
pageNumber: "1"
pageSize: 10,
pageNumber: 1
},
depttree: [],
defaultProps: {
Expand Down
8 changes: 4 additions & 4 deletions src/views/system/menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
</template>
</el-table-column>
</el-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :currentpage="listQuery.pageNumber"
:page-sizes="[10, 20, 30]" :pagesize="listQuery.pageSize"   layout="total,sizes, prev, pager, next" :total="listQuery.totalCount"
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.pageNumber"
:page-sizes="[10, 20, 30]" :page-size="listQuery.pageSize"   layout="total,sizes, prev, pager, next" :total="listQuery.totalCount"
style="margin-top:5px">
</el-pagination>
<!-- <el-tree :data="depttree" default-expand-all node-key="id" ref="tree" highlight-current :props="defaultProps">
Expand Down Expand Up @@ -116,8 +116,8 @@
},
listQuery: {
totalCount: 0,
pageSize: "10",
pageNumber: "1"
pageSize: 10,
pageNumber: 1
},
depttree: [],
defaultProps: {
Expand Down
8 changes: 4 additions & 4 deletions src/views/system/role.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</template>
</el-table-column>
</el-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :currentpage="listQuery.pageNumber"
:page-sizes="[10, 20, 30]" :pagesize="listQuery.pageSize"   layout="total,sizes, prev, pager, next" :total="listQuery.totalCount"
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.pageNumber"
:page-sizes="[10, 20, 30]" :page-size="listQuery.pageSize"   layout="total,sizes, prev, pager, next" :total="listQuery.totalCount"
style="margin-top:5px">
</el-pagination>

Expand Down Expand Up @@ -96,8 +96,8 @@ export default {
menu: null,
listQuery: {
totalCount: 0,
pageSize: "10",
pageNumber: "1"
pageSize: 10,
pageNumber: 1
},
defaultProps: {
children: "children",
Expand Down
8 changes: 4 additions & 4 deletions src/views/system/users.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
</template>
</el-table-column>
</el-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :currentpage="listQuery.pageNumber"
:page-sizes="[10, 20, 30]" :pagesize="listQuery.pageSize"   layout="total,sizes, prev, pager, next" :total="listQuery.totalCount"
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.pageNumber"
:page-sizes="[10, 20, 30]" :page-size="listQuery.pageSize"   layout="total,sizes, prev, pager, next" :total="listQuery.totalCount"
style="margin-top:5px">
</el-pagination>

Expand Down Expand Up @@ -148,8 +148,8 @@ export default {
selected: null,
listQuery: {
totalCount: 0,
pageSize: "10",
pageNumber: "1"
pageSize: 10,
pageNumber: 1
}
};
},
Expand Down

0 comments on commit b1d2885

Please sign in to comment.