Skip to content

N
NEW-MT-WD-DESKTOP
Commit 2813d7d8 authored by 陶进's avatar 陶进
Browse files
Options

提交一下

parent 528ab007
Expand all Show whitespace changes
Inline Side-by-side
Showing with 6374 additions and 5170 deletions
src/assist/axios.js
View file @ 2813d7d8
const { app } = require('electron').remote const axios = require("axios")
const axios = require('axios') const baseUrl = require(app.getAppPath() + '/build_config/url').baseUrl
const path = app.getAppPath()
const baseUrl = require(path + '/build_config/url').baseUrl
const { BrowserWindow } = require('electron').remote
var info = JSON.parse(localStorage.getItem('userInfo')) var info = JSON.parse(localStorage.getItem('userInfo'))
console.log(info)
var net = axios.create({ var net = axios.create({
baseURL: baseUrl, baseURL: baseUrl,
timeout: 1000000 timeout: 1000000
}); });
var netPost = function (url, data) { var netPost = function (url, data) {
return net.post(url, { return net.post(url, {
'Token': info.token, 'Token': info.token,
...@@ -77,7 +72,8 @@ net.interceptors.response.use(function (res) { ...@@ -77,7 +72,8 @@ net.interceptors.response.use(function (res) {
// 对响应错误做点什么 // 对响应错误做点什么
return Promise.reject(error) return Promise.reject(error)
}) })
module.exports = {
netPost function newHttp(){
return { netPost: netPost }
} }
// export default axios // export default axios
src/assist/dictionary.js
View file @ 2813d7d8
This diff is collapsed.
src/assist/loadVue.js
View file @ 2813d7d8
module.exports = (filename, dirname)=>{ const nodeHttp = require('http')
console.log(filename)
console.log(dirname) async function getVueFile(url) {
const fs = require('fs') return new Promise(function (resolve, reject) {
const os = require('os') nodeHttp.get(url, function (req, res) {
const platform = os.platform() var html = '';
const filePath = filename.replace('.js','.vue') req.on('data', (data) => {
const dirName = dirname.replace('.js','.vue') html += data
var name })
if(platform == 'darwin'){ req.on('end', () => {
name = dirName.split('/').pop() resolve(html)
}else{ });
name = dirName.split('\\').pop() req.on('error', (e) => {
} reject(e.message);
var data = fs.readFileSync(filePath); });
});
});
}
async function loadComponent(name, url) {
var data = await getVueFile(url)
var str = data.toString() var str = data.toString()
str = str.substring(0, str.lastIndexOf('</template>')) str = str.substring(0, str.lastIndexOf('</template>'))
str = str.replace('<template>','') str = str.replace('<template>','')
......
src/views/main_views/indexManage/components/condition/index.js
View file @ 2813d7d8
var init = require('../../lib/init.js') // var init = require('../../lib/init.js')
var value = init(__filename, __dirname) // var value = init(__filename, __dirname)
//以上代码引入vue、css等,初始化 //以上代码引入vue、css等,初始化
async function getCondition() {
module.exports = { var value = await loadComponent('publicIndex', window.global.urls.loadUrl + '/src/views/main_views/indexManage/components/condition/index.vue')
return {
name: value.name, name: value.name,
data: function () { data: function () {
return { return {
...@@ -41,4 +42,5 @@ module.exports = { ...@@ -41,4 +42,5 @@ module.exports = {
return isRequired return isRequired
} }
} }
}
} }
src/views/main_views/indexManage/indexManage.css
View file @ 2813d7d8
...@@ -2012,4 +2012,269 @@ ...@@ -2012,4 +2012,269 @@
cursor: pointer; cursor: pointer;
box-sizing: border-box; box-sizing: border-box;
} }
.calculater-display{
border-bottom: 1px solid #eaeaea;
height: 320px;
box-sizing: border-box;
padding: 10px;
max-width: 600px;
overflow: scroll;
overflow-x: hidden;
}
.calculater-keybord{
font-size: 0px;
border-bottom: 1px solid #eaeaea;
border-top: 0;
/* border-bottom: 0; */
box-sizing: border-box;
max-width: 600px;
height: 40px;
}
.calculater-keybord .single-bord:last-child{
border-right: 1px solid #eaeaea;
}
.calculater-keybord .single-bord{
width: 40px;
height: 40px;
text-align: center;
line-height: 40px;
font-size: 20px;
color: #333;
box-sizing: border-box;
cursor: pointer;
user-select: none;
float: left;
border-right: 1px solid #eaeaea;
}
.calculater-keybord .single-bord.long{
width: 80px;
}
.calculater-keybord .single-bord.active{
color: #d0021b;
background: #FFE7E7;
}
.calculater-keybord .single-bord.active:active{
color: #fff;
background: #d0021b;
}
.calculater-keybord .single-bord:active{
background: #FFE7E7;
}
.calculater-keybord .single-bord:hover{
color: #d0021b;
}
.calculater-keybord .single-bord+.single-bord{
/* border-left: 1px solid #eaeaea; */
}
.calculater-keybord .single-bord.text{
font-size: 12px;
}
.calculater-operation{
margin-top: 12px;
}
/* .calculater-tip{
font-size: 12px;
} */
.calculater-operation span{
display: inline-block;
padding: 4px 8px;
border: 1px solid #eaeaea;
border-radius: 4px;
cursor: pointer;
}
.calculater-operation span:active{
color: #d0021b;
background: #FFE7E7;
}
.calculater-operation span:hover{
background: #FFE7E7;
}
.cal-index-detail{
border: 1px solid #eaeaea;
font-size: 12px;
padding: 10px;
box-sizing: border-box;
margin-left: 10px;
height: 400px;
overflow: overlay;
min-width: 240px;
max-width: 240px;
}
#invented{
position: fixed;
opacity: 0;
left: 0;
top: 0;
z-index: -1;
font-size: 12px;
}
.flex{
display: flex;
}
.calculater-display input{
outline: 0;
border: 0;
cursor: pointer;
font-size: 12px;
margin-bottom: 4px;
}
.calculater-display input:focus{
outline: 0;
}
.calculater-display .cal-index.brackets{
background: #d0daff;
}
.cal-index{
background: #FFE7E7;
margin: 0 2px;
}
.cal-index.active{
color: #d0021b;
}
.calculater-display:focus{
outline: 0;
}
.index-choose-dialog .single-column {
display: flex;
align-items: center;
padding: 8px 0;
}
.mini.el-input--mini .el-input__inner{
height: 20px;
line-height: 20px;
/* border-radius: 4px; */
padding: 0 4px;
}
.mini.el-input--mini .el-input-group__append{
min-width: 10px;
text-align: center;
padding: 0 4px;
}
.mini.el-select .el-input--mini .el-input__inner{
height: 20px;
line-height: 20px;
padding-left: 4px;
padding-right: 4px;
}
.mini.el-select .el-input .el-select__caret{
line-height: 20px;
}
.controller-item+.controller-item{
margin-top: 8px;
}
.mini .el-switch__core{
height: 14px;
}
.mini .el-switch__core:after{
height: 10px;
width: 10px;
}
.mini.el-switch.is-checked .el-switch__core::after{
width: 10px;
height: 10px;
}
.mini.el-switch.is-checked .el-switch__core::after{
margin-left: -11px;
}
.mini .el-input__inner{
height: 20px;
line-height: 20px;
font-size: 12px;
}
.mini .el-input__icon{
line-height: 20px;
}
.mini.el-input--suffix .el-input__inner{
padding-right: 0;
}
.mini .el-input__icon{
width: 20px;
}
.mini .el-input__inner{
font-size: 12px;
line-height: 20px;
height: 20px;
}
.mini.el-select .el-input__inner{
padding-left: 4px;
}
.absolute-operation{
position: absolute;
right: 4px;
top: 8px;
font-size: 14px;
cursor: pointer;
}
.absolute-operation:hover{
color: #D0021B;
}
.index-controller .column {
margin-bottom: 12px;
}
.index-controller .column .column-title {
color: #999;
margin-bottom: 6px;
}
.function-params-item {
background: rgb(245, 247, 250);
padding: 8px;
border-radius: 4px;
position: relative;
}
.function-params-item .item-title {
margin-bottom: 4px;
}
.func-show-dom {
padding-bottom: 4px;
}
.function-params-item+.function-params-item {
margin-top: 8px;
}
.index-choose-dialog-inner {
display: flex;
}
.index-choose-dialog .index-detail {
padding-left: 20px;
border-left: 1px solid #EBEEF5;
flex: auto;
}
.index-detail {
flex: auto;
padding-left: 20px;
display: flex;
flex-direction: column;
/* overflow: scroll; */
position: relative;
}
.index-choose-dialog .index-list {
padding-right: 20px;
}
.index-list {
border: 1px solid #f0f0f0;
background: #F9F9F9;
border-radius: 2px;
padding: 4px;
}
.index-choose-dialog .el-dialog__body{
font-size: 12px;
}
.cal-container{
border: 1px solid #eaeaea;
}
.index-list-tree{
overflow: scroll;
overflow-x: hidden;
}
.mini .el-radio__inner {
width: 10px;
height: 10px;
}
.mini .el-radio__label {
font-size: 12px;
font-weight: normal;
padding-left: 6px;
}
.mini .el-radio{
margin-right: 16px;
}
\ No newline at end of file
src/views/main_views/indexManage/indexManage.html
View file @ 2813d7d8
...@@ -14,41 +14,78 @@ ...@@ -14,41 +14,78 @@
<router-view></router-view> <router-view></router-view>
</div> </div>
</body> </body>
<script>
const { app } = require('electron').remote
const { ipcRenderer } = require('electron')
window.global.urls = require(app.getAppPath() + '/build_config/url')
</script>
<script src="../../../static/vue/vue.min.js"></script> <script src="../../../static/vue/vue.min.js"></script>
<script src="../../../static/element/index.js"></script> <script src="../../../static/element/index.js"></script>
<script src="../../../static/vue-router/vue-router.js"></script> <script src="../../../static/vue-router/vue-router.js"></script>
<script src='../../../static/xlsx/xlsx.full.min.js'></script> <script src='../../../static/xlsx/xlsx.full.min.js'></script>
<script src="../../../static/plTable/index.js"></script> <script src="../../../static/plTable/index.js"></script>
<!-- <script src="../../lib/vue/vue.js"></script>
<script src="../../lib/element/index.js"></script> <script src="../../../assist/loadVue.js"></script>
<script type="text/javascript" src='../../lib/xlsx/xlsx.full.min.js'></script> <script src="./routers/publicIndex/publicIndex.js"></script>
<script src="../../lib/vue-router/vue-router.js"></script> <script src="./routers/myIndex/myIndex.js"></script>
<script src="../../lib/plTable/index.js"></script> <script src="./routers/indexAudit/indexAudit.js"></script>
<script src="../../lib/echarts/echarts.min.js"></script> --> <script src="./routers/categoryAudit/categoryAudit.js"></script>
<script> <script src="./routers/indexRecord/indexRecord.js"></script>
const { app } = require('electron').remote <script src="./components/condition/index.js"></script>
const path = app.getAppPath() <script src="./components/calculater/calculater.js"></script>
const { routes } = require(path + '/src/views/main_views/indexManage/routers/router.js') <script src="../../../assist/axios.js"></script>
const router = new VueRouter({ routes }) <script src="./indexManage.js"></script>
const http = require(path + '/src/assist/axios.js')
<script>
var http = newHttp()
const mytools = new tools()
console.log(mytools)
var info = JSON.parse(localStorage.getItem('userInfo')) var info = JSON.parse(localStorage.getItem('userInfo'))
const { splitPane } = require('vue-splitpane') const { splitPane } = require('vue-splitpane')
Vue.component('split-pane', splitPane) Vue.component('split-pane', splitPane)
async function init() {
var myIndex = await getMyIndex()
var indexAudit = await getIndexAudit()
var publicIndex = await getPublicIndex()
var categoryAudit = await getCategoryAudit()
var indexRecord = await getIndexRecord()
// var component = await getMain()
// var component = await getMain()
// var component = await getMain()
var routes = [
{ path: '/', component: myIndex },
{ path: '/indexAudit', component: indexAudit },
{ path: '/publicIndex', component: publicIndex },
{ path: '/categoryAudit', component: categoryAudit },
{ path: '/indexRecord', component: indexRecord }
]
console.log(routes)
var router = new VueRouter({ routes })
new Vue({ new Vue({
router, router,
el: '#app', el: '#app',
data: function() { data: function () {
return { return {
hasPadding: true
} }
}, },
mounted () { mounted() {
}, },
methods: { methods: {
} }
}) })
}
init()
</script> </script>
</html> </html>
\ No newline at end of file
src/views/main_views/indexManage/routers/categoryAudit/categoryAudit.js
View file @ 2813d7d8
const http = require('../../../lib/axios/axios.js') async function getCategoryAudit() {
const { dialog } = require('electron').remote var condition = await getCondition()
const officegen = require('officegen') var value = await loadComponent('publicIndex', window.global.urls.loadUrl + '/src/views/main_views/indexManage/routers/categoryAudit/categoryAudit.vue')
const path = require('path'); return {
const fs = require('fs')
const filePath = path.resolve(__dirname, './categoryAudit.vue')
let newTemplate = ''
var data = fs.readFileSync(filePath);
var str = data.toString()
var newStr = str.substring(0, str.lastIndexOf('</template>'))
newTemplate = newStr.replace('<template>','')
var keyBord = require('../../lib/keyBord')
var tools = require('../../lib/tools.js')
const condition = require('../../components/condition/index.js')
module.exports = {
categoryAudit: {
data: function () { data: function () {
return { return {
tableData: [], tableData: [],
...@@ -78,10 +64,10 @@ module.exports = { ...@@ -78,10 +64,10 @@ module.exports = {
} }
}, },
components: {condition}, components: {condition},
template: newTemplate, template: value.template,
mounted () { mounted () {
this.checkPermission(48, 'indexPermission') this.checkPermission(48, 'indexPermission')
this.currentAccount = store.get('accountId') this.currentAccount = info.accountId
this.getIndexData() this.getIndexData()
this.getBadge(1, 'isDotEdit') this.getBadge(1, 'isDotEdit')
this.getBadge(2, 'isDotSort') this.getBadge(2, 'isDotSort')
...@@ -98,7 +84,7 @@ module.exports = { ...@@ -98,7 +84,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Account/Account/CheckPermission', { http.netPost('Account/Account/CheckPermission', {
"id": id, "id": id,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -115,7 +101,7 @@ module.exports = { ...@@ -115,7 +101,7 @@ module.exports = {
http.netPost('Data/CustomIndex/ViewIndexSort', { http.netPost('Data/CustomIndex/ViewIndexSort', {
"status": type == 'pass'?1:2, //1通过2拒绝 "status": type == 'pass'?1:2, //1通过2拒绝
"id": this.activeIndex.Id, "id": this.activeIndex.Id,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -135,7 +121,7 @@ module.exports = { ...@@ -135,7 +121,7 @@ module.exports = {
http.netPost('Data/CustomIndex/GetPendingViewIndexSort', { http.netPost('Data/CustomIndex/GetPendingViewIndexSort', {
"Current": (this.pageCurrent - 1) * this.psize, "Current": (this.pageCurrent - 1) * this.psize,
"Psize": this.psize, "Psize": this.psize,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -164,7 +150,7 @@ module.exports = { ...@@ -164,7 +150,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/GetTodoCustomIndexCount', { http.netPost('Data/CustomIndex/GetTodoCustomIndexCount', {
"countOption": type, "countOption": type,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
......
src/views/main_views/indexManage/routers/indexAudit/indexAudit.js
View file @ 2813d7d8
const http = require('../../../lib/axios/axios.js') async function getIndexAudit() {
const { dialog } = require('electron').remote var condition = await getCondition()
const officegen = require('officegen') var calculater = await getCalculater()
const path = require('path'); var value = await loadComponent('publicIndex', window.global.urls.loadUrl + '/src/views/main_views/indexManage/routers/indexAudit/indexAudit.vue')
const fs = require('fs') return {
const filePath = path.resolve(__dirname, './indexAudit.vue')
let newTemplate = ''
var data = fs.readFileSync(filePath);
var str = data.toString()
var newStr = str.substring(0, str.lastIndexOf('</template>'))
newTemplate = newStr.replace('<template>','')
var keyBord = require('../../lib/keyBord')
var tools = require('../../lib/tools.js')
const condition = require('../../components/condition/index.js')
module.exports = {
indexAudit: {
data: function () { data: function () {
return { return {
tableData: [], tableData: [],
...@@ -80,13 +67,13 @@ module.exports = { ...@@ -80,13 +67,13 @@ module.exports = {
} }
}, },
components: {condition}, components: {condition},
template: newTemplate, template: value.template,
mounted () { mounted () {
this.currentAccount = store.get('accountId') this.currentAccount = info.accountId
this.getDefaultType() this.getDefaultType()
this.getPublicCategory() this.getPublicCategory()
tools.getKeyboardObj(keyBord, this.keyboardObj) mytools.getKeyboardObj(mytools.getKeyboard(), this.keyboardObj)
tools.getIndexs(this.initIndexObj).then(res => { mytools.getIndexs(this.initIndexObj).then(res => {
this.getIndexData() this.getIndexData()
}) })
this.getZjhIndustryCategoryList() this.getZjhIndustryCategoryList()
...@@ -111,7 +98,7 @@ module.exports = { ...@@ -111,7 +98,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Account/Account/CheckPermission', { http.netPost('Account/Account/CheckPermission', {
"id": id, "id": id,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -693,7 +680,7 @@ module.exports = { ...@@ -693,7 +680,7 @@ module.exports = {
"status": type == 'pass'?16:32, "status": type == 'pass'?16:32,
"id": this.activeIndex.Id, "id": this.activeIndex.Id,
"codes": arr, "codes": arr,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -815,7 +802,7 @@ module.exports = { ...@@ -815,7 +802,7 @@ module.exports = {
getDefaultType () { getDefaultType () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/GetAllIndexArgs', { http.netPost('Data/CustomIndex/GetAllIndexArgs', {
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -850,7 +837,7 @@ module.exports = { ...@@ -850,7 +837,7 @@ module.exports = {
"Current": (this.pageCurrent - 1) * this.psize, "Current": (this.pageCurrent - 1) * this.psize,
"Psize": this.psize, "Psize": this.psize,
"name": this.searchedName, "name": this.searchedName,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -904,7 +891,7 @@ module.exports = { ...@@ -904,7 +891,7 @@ module.exports = {
}, },
setDetailCondition (data, id, key) { setDetailCondition (data, id, key) {
tools.getUsedCompany(data.Algorithm.Object || data.Algorithm, this.companyNameObj).then(res => { mytools.getUsedCompany(data.Algorithm.Object || data.Algorithm, this.companyNameObj).then(res => {
this[key] = { this[key] = {
indexParams: {}, indexParams: {},
dateParams: {}, dateParams: {},
...@@ -914,7 +901,7 @@ module.exports = { ...@@ -914,7 +901,7 @@ module.exports = {
dom: '', dom: '',
showDom: '' showDom: ''
} }
tools.getSaveCondition(this[key], data.Algorithm.Object || data.Algorithm, this.initIndex, this.initIndexObj, this.companyNameObj, this.keyboardObj) mytools.getSaveCondition(this[key], data.Algorithm.Object || data.Algorithm, this.initIndex, this.initIndexObj, this.companyNameObj, this.keyboardObj)
this.$nextTick(()=>{ this.$nextTick(()=>{
var spans = document.getElementById(id).getElementsByTagName('span') var spans = document.getElementById(id).getElementsByTagName('span')
var html = '' var html = ''
...@@ -923,7 +910,7 @@ module.exports = { ...@@ -923,7 +910,7 @@ module.exports = {
}) })
document.getElementById(id).innerHTML = html document.getElementById(id).innerHTML = html
var spans = document.getElementById(id).getElementsByTagName('span') var spans = document.getElementById(id).getElementsByTagName('span')
tools.formatShowDom(spans) mytools.formatShowDom(spans)
}) })
}) })
}, },
...@@ -932,7 +919,7 @@ module.exports = { ...@@ -932,7 +919,7 @@ module.exports = {
this.activeIndex = data this.activeIndex = data
this.showIndexDetail = true this.showIndexDetail = true
tools.getUsedCompany(data.Algorithm.Object, this.companyNameObj).then(res => { mytools.getUsedCompany(data.Algorithm.Object, this.companyNameObj).then(res => {
this.activeIndexCondition = { this.activeIndexCondition = {
indexParams: {}, indexParams: {},
dateParams: {}, dateParams: {},
...@@ -943,7 +930,7 @@ module.exports = { ...@@ -943,7 +930,7 @@ module.exports = {
showDom: '' showDom: ''
} }
tools.getSaveCondition(this.activeIndexCondition, data.Algorithm.Object, this.initIndex, this.initIndexObj, this.companyNameObj, this.keyboardObj) mytools.getSaveCondition(this.activeIndexCondition, data.Algorithm.Object, this.initIndex, this.initIndexObj, this.companyNameObj, this.keyboardObj)
this.$nextTick(()=>{ this.$nextTick(()=>{
var spans = document.getElementById('conditionBox').getElementsByTagName('span') var spans = document.getElementById('conditionBox').getElementsByTagName('span')
...@@ -953,7 +940,7 @@ module.exports = { ...@@ -953,7 +940,7 @@ module.exports = {
}) })
document.getElementById('conditionBox').innerHTML = html document.getElementById('conditionBox').innerHTML = html
var spans = document.getElementById('conditionBox').getElementsByTagName('span') var spans = document.getElementById('conditionBox').getElementsByTagName('span')
tools.formatShowDom(spans) mytools.formatShowDom(spans)
}) })
}) })
}, },
...@@ -961,7 +948,7 @@ module.exports = { ...@@ -961,7 +948,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/GetTodoCustomIndexCount', { http.netPost('Data/CustomIndex/GetTodoCustomIndexCount', {
"countOption": type, "countOption": type,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
......
src/views/main_views/indexManage/routers/indexRecord/indexRecord.js
View file @ 2813d7d8
const http = require('../../../lib/axios/axios.js') async function getIndexRecord() {
const { dialog } = require('electron').remote var condition = await getCondition()
const officegen = require('officegen') var value = await loadComponent('publicIndex', window.global.urls.loadUrl + '/src/views/main_views/indexManage/routers/indexRecord/indexRecord.vue')
const path = require('path'); return {
const fs = require('fs')
const filePath = path.resolve(__dirname, './indexRecord.vue')
let newTemplate = ''
var data = fs.readFileSync(filePath);
var str = data.toString()
var newStr = str.substring(0, str.lastIndexOf('</template>'))
newTemplate = newStr.replace('<template>','')
const condition = require('../../components/condition/index.js')
module.exports = {
indexRecord: {
data: function () { data: function () {
return { return {
tableData: [], tableData: [],
...@@ -79,10 +66,10 @@ module.exports = { ...@@ -79,10 +66,10 @@ module.exports = {
} }
}, },
components: {condition}, components: {condition},
template: newTemplate, template: value.template,
mounted () { mounted () {
this.checkPermission(48, 'indexPermission') this.checkPermission(48, 'indexPermission')
this.currentAccount = store.get('accountId') this.currentAccount = info.accountId
this.getIndexData() this.getIndexData()
this.getBadge(1, 'isDotEdit') this.getBadge(1, 'isDotEdit')
this.getBadge(2, 'isDotSort') this.getBadge(2, 'isDotSort')
...@@ -99,7 +86,7 @@ module.exports = { ...@@ -99,7 +86,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Account/Account/CheckPermission', { http.netPost('Account/Account/CheckPermission', {
"id": id, "id": id,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -119,7 +106,7 @@ module.exports = { ...@@ -119,7 +106,7 @@ module.exports = {
"Current": (this.pageCurrent - 1) * this.psize, "Current": (this.pageCurrent - 1) * this.psize,
"Psize": this.psize, "Psize": this.psize,
"name": this.searchName, "name": this.searchName,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -152,7 +139,7 @@ module.exports = { ...@@ -152,7 +139,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/GetTodoCustomIndexCount', { http.netPost('Data/CustomIndex/GetTodoCustomIndexCount', {
"countOption": type, "countOption": type,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
......
src/views/main_views/indexManage/routers/myIndex/myIndex.js
View file @ 2813d7d8
const http = require('../../../lib/axios/axios.js') async function getMyIndex() {
const { dialog } = require('electron').remote var condition = await getCondition()
const officegen = require('officegen') var calculater = await getCalculater()
const path = require('path'); var value = await loadComponent('publicIndex', window.global.urls.loadUrl + '/src/views/main_views/indexManage/routers/myIndex/myIndex.vue')
const fs = require('fs') return {
const filePath = path.resolve(__dirname, './myIndex.vue')
let newTemplate = ''
var data = fs.readFileSync(filePath);
var str = data.toString()
var newStr = str.substring(0, str.lastIndexOf('</template>'))
newTemplate = newStr.replace('<template>', '')
// const calculater = require('../components/calculater')
const calculater = require('../../../components/complexCondition/index')
var keyBord = require('../../lib/keyBord')
var tools = require('../../lib/tools.js')
const { ipcRenderer } = require('electron')
const condition = require('../../components/condition/index.js')
module.exports = {
myIndex: {
data: function () { data: function () {
return { return {
treeData: [], treeData: [],
...@@ -164,7 +148,7 @@ module.exports = { ...@@ -164,7 +148,7 @@ module.exports = {
computed: { computed: {
}, },
template: newTemplate, template: value.template,
mounted() { mounted() {
var that = this var that = this
ipcRenderer.on('copy-multiple-condition-reply', function (event, arg) { ipcRenderer.on('copy-multiple-condition-reply', function (event, arg) {
...@@ -174,7 +158,7 @@ module.exports = { ...@@ -174,7 +158,7 @@ module.exports = {
this.getIndexs().then(res => { this.getIndexs().then(res => {
this.getIndexCateGory('init') this.getIndexCateGory('init')
this.getDefaultType() this.getDefaultType()
tools.getKeyboardObj(keyBord, this.keyboardObj) mytools.getKeyboardObj(mytools.getKeyboard(), this.keyboardObj)
}) })
this.getZjhIndustryCategoryList() this.getZjhIndustryCategoryList()
...@@ -201,7 +185,7 @@ module.exports = { ...@@ -201,7 +185,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Account/Account/CheckPermission', { http.netPost('Account/Account/CheckPermission', {
"id": id, "id": id,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -315,7 +299,7 @@ module.exports = { ...@@ -315,7 +299,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/UnSubmitIndex', { http.netPost('Data/CustomIndex/UnSubmitIndex', {
"id": this.activeIndex.PublicIndexId, "id": this.activeIndex.PublicIndexId,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -852,7 +836,7 @@ module.exports = { ...@@ -852,7 +836,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/RemoveCustomIndex', { http.netPost('Data/CustomIndex/RemoveCustomIndex', {
"id": this.activeIndex.Id, "id": this.activeIndex.Id,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -876,7 +860,7 @@ module.exports = { ...@@ -876,7 +860,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/IndexNameSimilarity', { http.netPost('Data/CustomIndex/IndexNameSimilarity', {
"customIndexId": this.activeIndex.Id, "customIndexId": this.activeIndex.Id,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -903,7 +887,7 @@ module.exports = { ...@@ -903,7 +887,7 @@ module.exports = {
http.netPost('Data/CustomIndex/SubmitIndexToView', { http.netPost('Data/CustomIndex/SubmitIndexToView', {
"id": this.activeIndex.Id, "id": this.activeIndex.Id,
"archiveCodes": arr, "archiveCodes": arr,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -993,7 +977,7 @@ module.exports = { ...@@ -993,7 +977,7 @@ module.exports = {
getDefaultType() { getDefaultType() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/GetAllIndexArgs', { http.netPost('Data/CustomIndex/GetAllIndexArgs', {
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -1070,7 +1054,7 @@ module.exports = { ...@@ -1070,7 +1054,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/RemoveArchive', { http.netPost('Data/CustomIndex/RemoveArchive', {
"Id": this.activeIndex.Id, "Id": this.activeIndex.Id,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -1091,7 +1075,7 @@ module.exports = { ...@@ -1091,7 +1075,7 @@ module.exports = {
// "Psize": 100, // "Psize": 100,
// "Code": "B", // "Code": "B",
// 'Name': '', // 'Name': '',
// "AccountId": store.get('accountId') // "AccountId": info.accountId
// }) // })
// .then((res) => { // .then((res) => {
// if (res.data.Status == 1) { // if (res.data.Status == 1) {
...@@ -1113,7 +1097,7 @@ module.exports = { ...@@ -1113,7 +1097,7 @@ module.exports = {
"Psize": 100, "Psize": 100,
"Code": "B", "Code": "B",
'Name': '', 'Name': '',
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -1297,7 +1281,7 @@ module.exports = { ...@@ -1297,7 +1281,7 @@ module.exports = {
dom: '', dom: '',
showDom: '' showDom: ''
} }
tools.getSaveCondition(this.activeIndexCondition, data.Algorithm.Object, this.initIndex, this.initIndexObj, this.companyNameObj, this.keyboardObj) mytools.getSaveCondition(this.activeIndexCondition, data.Algorithm.Object, this.initIndex, this.initIndexObj, this.companyNameObj, this.keyboardObj)
this.$nextTick(() => { this.$nextTick(() => {
var spans = document.getElementById('conditionBox').getElementsByTagName('span') var spans = document.getElementById('conditionBox').getElementsByTagName('span')
...@@ -1307,7 +1291,7 @@ module.exports = { ...@@ -1307,7 +1291,7 @@ module.exports = {
}) })
document.getElementById('conditionBox').innerHTML = html document.getElementById('conditionBox').innerHTML = html
var spans = document.getElementById('conditionBox').getElementsByTagName('span') var spans = document.getElementById('conditionBox').getElementsByTagName('span')
tools.formatShowDom(spans) mytools.formatShowDom(spans)
}) })
}) })
this.activeIndex = data this.activeIndex = data
...@@ -1450,7 +1434,7 @@ module.exports = { ...@@ -1450,7 +1434,7 @@ module.exports = {
this.treeLoading = true this.treeLoading = true
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/GetMyIndexArchivesLight', { http.netPost('Data/CustomIndex/GetMyIndexArchivesLight', {
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -1537,7 +1521,7 @@ module.exports = { ...@@ -1537,7 +1521,7 @@ module.exports = {
"id": this.addCategoryType == 'add' ? 0 : this.activeIndex.Id, "id": this.addCategoryType == 'add' ? 0 : this.activeIndex.Id,
"archiveName": this.inputedCategoryName, "archiveName": this.inputedCategoryName,
"parentId": this.addCategoryType == 'add' ? this.activeIndex.Id : this.activeIndex.ParentId, "parentId": this.addCategoryType == 'add' ? this.activeIndex.Id : this.activeIndex.ParentId,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
this.createOrChangeCategoryLoading = false this.createOrChangeCategoryLoading = false
...@@ -1595,7 +1579,7 @@ module.exports = { ...@@ -1595,7 +1579,7 @@ module.exports = {
"remark": this.editIndexDetail, //备注 "remark": this.editIndexDetail, //备注
"keywordIds": keywordIds, "keywordIds": keywordIds,
"dimensionIds": dimensionIds, "dimensionIds": dimensionIds,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -1716,7 +1700,7 @@ module.exports = { ...@@ -1716,7 +1700,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/GetMyIndexByIds', { http.netPost('Data/CustomIndex/GetMyIndexByIds', {
"ids": ids, "ids": ids,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -1730,7 +1714,7 @@ module.exports = { ...@@ -1730,7 +1714,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/CustomIndex/GetTodoCustomIndexCount', { http.netPost('Data/CustomIndex/GetTodoCustomIndexCount', {
"countOption": type, "countOption": type,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
...@@ -1750,7 +1734,7 @@ module.exports = { ...@@ -1750,7 +1734,7 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
http.netPost('Data/Encode/GetEncodeDetailsByCodes', { http.netPost('Data/Encode/GetEncodeDetailsByCodes', {
"codes": codes, "codes": codes,
"AccountId": store.get('accountId') "AccountId": info.accountId
}) })
.then((res) => { .then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
......
src/views/main_views/indexManage/routers/myIndex/myIndex.vue
View file @ 2813d7d8
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
<!-- 未选中指标的显示 --> <!-- 未选中指标的显示 -->
<div class="detail-container" v-if="!activeIndex.isIndex"> <div class="detail-container" v-if="!activeIndex.isIndex">
<div class="empty-status"> <div class="empty-status">
<img src="../../static/image/empty.png" alt /> <img src="../../../static/images/empty.png" alt />
<div class="empty-tip">请从左侧点击指标或者分类</div> <div class="empty-tip">请从左侧点击指标或者分类</div>
</div> </div>
</div> </div>
......
src/views/main_views/indexManage/routers/publicIndex/publicIndex.vue
View file @ 2813d7d8
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
<!-- 未选中指标的显示 --> <!-- 未选中指标的显示 -->
<div class="detail-container" v-if="!activeIndex.DataType"> <div class="detail-container" v-if="!activeIndex.DataType">
<div class="empty-status"> <div class="empty-status">
<img src="../../static/image/empty.png" alt /> <img src="../../../static/images/empty.png" alt />
<div class="empty-tip">请从左侧点击指标或者分类</div> <div class="empty-tip">请从左侧点击指标或者分类</div>
</div> </div>
</div> </div>
......
src/views/main_views/indexManage/routers/routers.js deleted 100644 → 0
View file @ 528ab007
const { publicIndex } = require('./publicIndex.js')
const { indexAudit } = require('./indexAudit.js')
const { myIndex } = require('./myIndex.js')
const { categoryAudit } = require('./categoryAudit.js')
const { indexRecord } = require('./indexRecord.js')
const routes = [
{ path: '/', component: myIndex },
{ path: '/indexAudit', component: indexAudit },
{ path: '/publicIndex', component: publicIndex },
{ path: '/categoryAudit', component: categoryAudit },
{ path: '/indexRecord', component: indexRecord }
]
module.exports = {
routes: routes
}
\ No newline at end of file
src/views/main_views/report/report.html
View file @ 2813d7d8
...@@ -214,22 +214,25 @@ ...@@ -214,22 +214,25 @@
</div> </div>
</body> </body>
<script>
const { ipcRenderer } = require('electron')
const { app } = require('electron').remote
</script>
<!-- import Vue before Element --> <!-- import Vue before Element -->
<script src="../../../static/vue/vue.js"></script> <script src="../../../static/vue/vue.js"></script>
<script src="../../../static/element/index.js"></script> <script src="../../../static/element/index.js"></script>
<script src="../../../assist/axios.js"></script>
<script src="./report.js"></script>
<script> <script>
const { ipcRenderer } = require('electron') const http = newHttp()
const { app } = require('electron').remote
const path = app.getAppPath()
const http = require(path + '/src/assist/axios.js')
const tools = require(path + '/src/views/main_views/report/report.js')
const { dialog } = require('electron').remote const { dialog } = require('electron').remote
const Datastore = require('nedb') const Datastore = require('nedb')
const { shell } = require('electron') const { shell } = require('electron')
var info = JSON.parse(localStorage.getItem('userInfo')) var info = JSON.parse(localStorage.getItem('userInfo'))
var menu = tools.hsmenu() var menu = hsmenu()
new Vue({ new Vue({
el: '#app', el: '#app',
......
src/views/main_views/report/report.js
View file @ 2813d7d8
module.exports.hsmenu = () => { function hsmenu () {
return [{ return [{
label: '全部', label: '全部',
code: [] code: []
......
src/views/main_views/stockMarket/routers/main/main.js
View file @ 2813d7d8
const { app } = require('electron').remote
const path = app.getAppPath()
const init = require(path + '/src/assist/loadVue.js')
var value = init(__filename, __dirname)
console.log(__filename)
console.log(__dirname)
console.log(value)
//以上代码引入vue、css等,初始化 //以上代码引入vue、css等,初始化
const { ipcRenderer } = require('electron') const loadUrl = window.global.urls.loadUrl
const { historyListPrice } = require(path + '/src/assist/dictionary.js')
module.exports[value.name] = { async function getMain() {
var value = await loadComponent('main', loadUrl + '/src/views/main_views/stockMarket/routers/main/main.vue')
return {
data: function () { data: function () {
return { return {
selectType: '1', selectType: '1',
...@@ -38,7 +30,7 @@ module.exports[value.name] = { ...@@ -38,7 +30,7 @@ module.exports[value.name] = {
positionData: [], positionData: [],
industryCompany: [], industryCompany: [],
// 新的数据 // 新的数据
historyPrice: historyListPrice(), historyPrice: getDictionary().historyListPrice(),
choosedDate: '2019-01-21', choosedDate: '2019-01-21',
sort: [{ sort: [{
'FieldName': 'TRADEDATE', 'FieldName': 'TRADEDATE',
...@@ -159,9 +151,11 @@ module.exports[value.name] = { ...@@ -159,9 +151,11 @@ module.exports[value.name] = {
'Psize': that.psize 'Psize': that.psize
}) })
.then((res) => { .then((res) => {
console.log(res)
that.total = res.data.Data.Total that.total = res.data.Data.Total
that.showTable = true that.showTable = true
that.tableData = res.data.Data.Records that.tableData = res.data.Data.Records
console.log(that.tableData)
}) })
}, },
changeDate() { changeDate() {
...@@ -397,6 +391,5 @@ module.exports[value.name] = { ...@@ -397,6 +391,5 @@ module.exports[value.name] = {
this.getStockList() this.getStockList()
} }
} }
}
} }
\ No newline at end of file
src/views/main_views/stockMarket/routers/router.js
View file @ 2813d7d8
// const { app } = require('electron').remote
// const path = app.getAppPath()
// const { main } = require(path + '/src/views/main_views/stockMarket/routers/main/main.js')
// const routes = [
// { path: '/', component: main }
// ]
// module.exports = {
// routes: routes
// }
class routers { class routers {
constructor() {} constructor() {}
getRouters() { getRouters(component) {
return [ return [
{ path: '/', component: 'main' } { path: '/', component: component }
] ]
} }
} }
......
src/views/main_views/stockMarket/stockMarket.html
View file @ 2813d7d8
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
...@@ -9,49 +10,63 @@ ...@@ -9,49 +10,63 @@
<link rel="stylesheet" href="./stockMarket.css"> <link rel="stylesheet" href="./stockMarket.css">
</head> </head>
<body> <body>
<div id="app" class="report-page-container"> <div id="app" class="report-page-container">
<router-view></router-view> <router-view></router-view>
</div> </div>
</body> </body>
<script src="../../../static/vue/vue.min.js"></script> <script>
<script src="../../../static/element/index.js"></script>
<script src="../../../static/vue-router/vue-router.js"></script>
<script src='../../../static/xlsx/xlsx.full.min.js'></script>
<script src="../../../static/plTable/index.js"></script>
<script src="./routers/router.js"></script>
<script>
const { app } = require('electron').remote const { app } = require('electron').remote
const { ipcRenderer } = require('electron')
window.global.urls = require(app.getAppPath() + '/build_config/url')
</script>
<script src="../../../static/vue/vue.min.js"></script>
<script src="../../../static/element/index.js"></script>
<script src="../../../static/vue-router/vue-router.js"></script>
<script src='../../../static/xlsx/xlsx.full.min.js'></script>
<script src="../../../static/plTable/index.js"></script>
const path = app.getAppPath() <script src="../../../assist/loadVue.js"></script>
<script src="./routers/main/main.js"></script>
// const { routes } = require('./routers/router.js') <script src="./routers/router.js"></script>
const routes = new routers().getRouters() <script src="../../../assist/axios.js"></script>
console.log(routes) <script src="../../../assist/dictionary.js"></script>
const router = new VueRouter({ routes }) <script>
const http = require(path + '/src/assist/axios.js') var http = newHttp()
var info = JSON.parse(localStorage.getItem('userInfo')) var info = JSON.parse(localStorage.getItem('userInfo'))
const { splitPane } = require('vue-splitpane') const { splitPane } = require('vue-splitpane')
Vue.component('split-pane', splitPane) Vue.component('split-pane', splitPane)
async function init() {
var component = await getMain()
var routes = new routers().getRouters(component)
var router = new VueRouter({ routes })
new Vue({ new Vue({
router, router,
el: '#app', el: '#app',
data: function() { data: function () {
return { return {
} }
}, },
mounted () { mounted() {
}, },
methods: { methods: {
} }
}) })
</script> }
init()
</script>
</html> </html>
\ No newline at end of file
src/views/main_views/szxData/routers/main/main.js
View file @ 2813d7d8
const { app } = require('electron').remote const loadUrl = window.global.urls.loadUrl
const path = app.getAppPath()
const init = require(path + '/src/assist/loadVue.js')
var value = init(__filename, __dirname)
console.log(value)
//以上代码引入vue、css等,初始化 //以上代码引入vue、css等,初始化
const officegen = require('officegen') const officegen = require('officegen')
...@@ -11,7 +6,10 @@ const { dialog } = require('electron').remote ...@@ -11,7 +6,10 @@ const { dialog } = require('electron').remote
const fs = require('fs') const fs = require('fs')
const Excel = require('exceljs'); const Excel = require('exceljs');
module.exports[value.name] = {
async function getMain() {
var value = await loadComponent('main', loadUrl + '/src/views/main_views/szxData/routers/main/main.vue')
return {
data: function () { data: function () {
return { return {
treeData: [], treeData: [],
...@@ -258,7 +256,7 @@ module.exports[value.name] = { ...@@ -258,7 +256,7 @@ module.exports[value.name] = {
} }
}, },
classifyFields: [11530,11528,11541,11540,11545,11562,11559], classifyFields: [11530, 11528, 11541, 11540, 11545, 11562, 11559],
basicFields: [14054, 14068, 14062], basicFields: [14054, 14068, 14062],
middleCheckedIds: [], middleCheckedIds: [],
sameFields: [] sameFields: []
...@@ -982,8 +980,8 @@ module.exports[value.name] = { ...@@ -982,8 +980,8 @@ module.exports[value.name] = {
type: item.FieldType type: item.FieldType
}) })
}else{ } else {
this.sameFields.push(item.Id+'') this.sameFields.push(item.Id + '')
} }
}) })
...@@ -1033,7 +1031,7 @@ module.exports[value.name] = { ...@@ -1033,7 +1031,7 @@ module.exports[value.name] = {
} }
// this.$set(this, 'tableHeaders', headers) // this.$set(this, 'tableHeaders', headers)
this.$nextTick(()=>{ this.$nextTick(() => {
this.tableHeaders = headers this.tableHeaders = headers
}) })
// this.tableHeaders = headers // this.tableHeaders = headers
...@@ -1068,7 +1066,7 @@ module.exports[value.name] = { ...@@ -1068,7 +1066,7 @@ module.exports[value.name] = {
var dateArr = [], targetArr = [], directionArr = [], selectionArr = [] var dateArr = [], targetArr = [], directionArr = [], selectionArr = []
this.tableHeaders.forEach(item => { this.tableHeaders.forEach(item => {
if(item.checked){ if (item.checked) {
if (item.isActiveDate) { if (item.isActiveDate) {
dateArr.push(item) dateArr.push(item)
} }
...@@ -1131,7 +1129,7 @@ module.exports[value.name] = { ...@@ -1131,7 +1129,7 @@ module.exports[value.name] = {
this.getTableData(this.currentDB, checkedIds, where, sort, this.getJoinIds(this.tableHeaders)) this.getTableData(this.currentDB, checkedIds, where, sort, this.getJoinIds(this.tableHeaders))
}, },
getJoinIds (headers) { getJoinIds(headers) {
console.log(this.sameFields) console.log(this.sameFields)
var classifyDict = {}, basicDict = {}, classifyArr = [], basicArr = [], Joins = [] var classifyDict = {}, basicDict = {}, classifyArr = [], basicArr = [], Joins = []
...@@ -1147,7 +1145,7 @@ module.exports[value.name] = { ...@@ -1147,7 +1145,7 @@ module.exports[value.name] = {
console.log(classifyArr) console.log(classifyArr)
basicArr = headers.filter(item => basicDict[item.id] && (this.sameFields.indexOf(item.id) < 0)).map(item => item.id) basicArr = headers.filter(item => basicDict[item.id] && (this.sameFields.indexOf(item.id) < 0)).map(item => item.id)
if(classifyArr.length > 0) { if (classifyArr.length > 0) {
Joins.push({ Joins.push({
"JoinOption": 0, // 连接类型 "JoinOption": 0, // 连接类型
"TableId": 14, // 连接表ID, "TableId": 14, // 连接表ID,
...@@ -1160,7 +1158,7 @@ module.exports[value.name] = { ...@@ -1160,7 +1158,7 @@ module.exports[value.name] = {
] ]
}) })
} }
if(basicArr.length > 0){ if (basicArr.length > 0) {
Joins.push({ Joins.push({
"JoinOption": 0, // 连接类型 "JoinOption": 0, // 连接类型
"TableId": 17, // 连接表ID, "TableId": 17, // 连接表ID,
...@@ -1193,7 +1191,7 @@ module.exports[value.name] = { ...@@ -1193,7 +1191,7 @@ module.exports[value.name] = {
"Psize": this.choosedPsize "Psize": this.choosedPsize
}).then((res) => { }).then((res) => {
if (res.data.Status == 1) { if (res.data.Status == 1) {
if(this.currentDB.JoinTableId == data.JoinTableId){ if (this.currentDB.JoinTableId == data.JoinTableId) {
this.tableData = res.data.Data.Records this.tableData = res.data.Data.Records
this.totalPage = res.data.Data.Total this.totalPage = res.data.Data.Total
this.$refs.dataTable.reloadData(this.tableData) this.$refs.dataTable.reloadData(this.tableData)
...@@ -1202,7 +1200,7 @@ module.exports[value.name] = { ...@@ -1202,7 +1200,7 @@ module.exports[value.name] = {
} else { } else {
} }
if(this.currentDB.JoinTableId == data.JoinTableId){ if (this.currentDB.JoinTableId == data.JoinTableId) {
this.tableLoading = false this.tableLoading = false
} }
}).catch(err => { }).catch(err => {
...@@ -1210,11 +1208,11 @@ module.exports[value.name] = { ...@@ -1210,11 +1208,11 @@ module.exports[value.name] = {
}) })
}) })
}, },
changeUnit () { changeUnit() {
this.choosedUnitPopover = false this.choosedUnitPopover = false
this.$refs.dataTable.reloadData(this.tableData) this.$refs.dataTable.reloadData(this.tableData)
}, },
changeDecimal () { changeDecimal() {
this.$refs.dataTable.reloadData(this.tableData) this.$refs.dataTable.reloadData(this.tableData)
}, },
unitFormatter(scop, item) { unitFormatter(scop, item) {
...@@ -1271,7 +1269,7 @@ module.exports[value.name] = { ...@@ -1271,7 +1269,7 @@ module.exports[value.name] = {
this.tableHeaders = [] this.tableHeaders = []
this.tableData = [] this.tableData = []
this.sameFields = [] this.sameFields = []
setTimeout(()=>{ setTimeout(() => {
this.currentPage = 1 this.currentPage = 1
this.reportDateCondition = [] this.reportDateCondition = []
this.selectedCompanyData = [] this.selectedCompanyData = []
...@@ -1281,7 +1279,7 @@ module.exports[value.name] = { ...@@ -1281,7 +1279,7 @@ module.exports[value.name] = {
this.getTableHeader(data.JoinTableId).then(res => { this.getTableHeader(data.JoinTableId).then(res => {
this.handleCurrentChange(1) this.handleCurrentChange(1)
}) })
},0) }, 0)
}, },
searchHeader() { searchHeader() {
this.usedSearchInput = this.headerSearchInput this.usedSearchInput = this.headerSearchInput
...@@ -1645,7 +1643,7 @@ module.exports[value.name] = { ...@@ -1645,7 +1643,7 @@ module.exports[value.name] = {
var dateArr = [], targetArr = [], directionArr = [], selectionArr = [] var dateArr = [], targetArr = [], directionArr = [], selectionArr = []
this.tableHeaders.forEach(item => { this.tableHeaders.forEach(item => {
if(item.checked){ if (item.checked) {
if (item.isActiveDate) { if (item.isActiveDate) {
dateArr.push(item) dateArr.push(item)
} }
...@@ -2158,7 +2156,7 @@ module.exports[value.name] = { ...@@ -2158,7 +2156,7 @@ module.exports[value.name] = {
}, },
setSort(item, direction) { setSort(item, direction) {
item.sortDirection == direction?item.sortDirection = 0:item.sortDirection = direction item.sortDirection == direction ? item.sortDirection = 0 : item.sortDirection = direction
this.handleCurrentChange(1) this.handleCurrentChange(1)
}, },
emptyFilterDate() { emptyFilterDate() {
...@@ -2180,4 +2178,5 @@ module.exports[value.name] = { ...@@ -2180,4 +2178,5 @@ module.exports[value.name] = {
// this.handleCurrentChange(1) // this.handleCurrentChange(1)
} }
} }
}
} }
src/views/main_views/szxData/routers/router.js
View file @ 2813d7d8
const { app } = require('electron').remote class routers {
const path = app.getAppPath() constructor() {}
const { main } = require(path + '/src/views/main_views/szxData/routers/main/main.js') getRouters(component) {
return [
const routes = [ { path: '/', component: component }
{ path: '/', component: main } ]
] }
module.exports = {
routes: routes
} }
src/views/main_views/szxData/szxData.html
View file @ 2813d7d8
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
...@@ -9,40 +10,60 @@ ...@@ -9,40 +10,60 @@
<link rel="stylesheet" href="./szxData.css"> <link rel="stylesheet" href="./szxData.css">
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<router-view></router-view> <router-view></router-view>
</div> </div>
</body> </body>
<script src="../../../static/vue/vue.min.js"></script> <script>
<script src="../../../static/element/index.js"></script>
<script src="../../../static/vue-router/vue-router.js"></script>
<script src='../../../static/xlsx/xlsx.full.min.js'></script>
<script src="../../../static/plTable/index.js"></script>
<script>
const { app } = require('electron').remote const { app } = require('electron').remote
const path = app.getAppPath() const { ipcRenderer } = require('electron')
const { routes } = require(path + '/src/views/main_views/szxData/routers/router.js') window.global.urls = require(app.getAppPath() + '/build_config/url')
const router = new VueRouter({ routes }) </script>
const http = require(path + '/src/assist/axios.js') <script src="../../../static/vue/vue.min.js"></script>
<script src="../../../static/element/index.js"></script>
<script src="../../../static/vue-router/vue-router.js"></script>
<script src='../../../static/xlsx/xlsx.full.min.js'></script>
<script src="../../../static/plTable/index.js"></script>
<script src="../../../assist/loadVue.js"></script>
<script src="./routers/main/main.js"></script>
<script src="./routers/router.js"></script>
<script src="../../../assist/axios.js"></script>
<script>
var http = newHttp()
var info = JSON.parse(localStorage.getItem('userInfo')) var info = JSON.parse(localStorage.getItem('userInfo'))
const { splitPane } = require('vue-splitpane') const { splitPane } = require('vue-splitpane')
Vue.component('split-pane', splitPane) Vue.component('split-pane', splitPane)
async function init() {
var component = await getMain()
var routes = new routers().getRouters(component)
var router = new VueRouter({ routes })
new Vue({ new Vue({
router, router,
el: '#app', el: '#app',
data: function() { data: function () {
return { return {
} }
}, },
mounted () { mounted() {
}, },
methods: { methods: {
} }
}) })
</script> }
init()
</script>
</html> </html>
\ No newline at end of file
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