Merge branch 'ssotest' of https://git.steerinfo.com/XTEMS/xt-ems-front into ssotest

cors.js

@@ -123,7 +123,10 @@ module.exports = {
   },
   //devModules: ['index','workFlow','ApiManage','apollo','authManage','configManager','devops','dingtalk','serviceManager','microService','monitor','systemConfig','metaData','multEntry','demo']
   //  devModules: ['all'] // 不建议使用，运行速度太慢，发布构建会失败
-    devModules: ['dingtalk','dingtalkMobileEnd','formGenerator','gatewayCfg','index','logAudit','metaData','workFlow','preview','serviceManager',
-    'systemConfig','multEntry','microService','basicInformation','energyAnalysis','energyBalance','energyOperationSupport',
-    'energyPerformance','energyPlan','energyQuality','energyScheduling','systemInterface']
+    // devModules: ['dingtalk','dingtalkMobileEnd','formGenerator','gatewayCfg','index','logAudit','metaData','workFlow','preview','serviceManager',
+    // 'systemConfig','multEntry','microService','basicInformation','energyAnalysis','energyBalance','energyOperationSupport',
+    // 'energyPerformance','energyPlan','energyQuality','energyScheduling','systemInterface'],
+     // 用于构建
+    devModules: ['index','metaData','systemConfig','multEntry',
+    'basicInformation','energyAnalysis','energyBalance','energyOperationSupport','energyPerformance','energyPlan','energyQuality','energyScheduling','systemInterface']
 }

package.json

@@ -15,7 +15,7 @@
     "testc": "cross-env NODE_ENV=test nyc mocha-webpack --webpack-config node_modules/icore-icp/build/webpack.test.conf.js --require node_modules/icore-icp/test/setup.js node_modules/icore-icp/test/**/*.spec.js"
   },
   "dependencies": {
-    "icore-icp": "^1.2.2-at.1.7"
+    "icore-icp": "1.2.2-at.1.7"
   },
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.24",

src/views/basicInformation/components/measurementPlace.vue

@@ -487,6 +487,13 @@
                         label="对应数据列"
                         width="90px"
                         :show-overflow-tooltip="true"
+                    ></el-table-column>
+                    <el-table-column
+                        sortable
+                        prop="transfer"
+                        label="转供工序"
+                        width="90px"
+                        :show-overflow-tooltip="true"
                     ></el-table-column>
                     <el-table-column
                         class-name="gn-TableDownloadExcel-none"
@@ -1950,7 +1957,8 @@ export default {
                 isschedule: that.dialog.editorBox.form.data.isschedule,
                 costid: that.dialog.editorBox.form.data.costid,
                 sourceType: that.dialog.editorBox.form.data.sourceType,
-                mintimegranid: that.dialog.editorBox.form.data.mintimegranid,
+                mintimegranid: that.dialog.editorBox.form.data.mintimegranid,
+                transfer: that.dialog.editorBox.form.data.transfer,
                 // 基础
                 defaultvalue: that.dialog.editorBox.form1.data.defaultvalue,
                 digits: that.dialog.editorBox.form1.data.digits,
@@ -1959,8 +1967,7 @@ export default {
                 parentid: that.dialog.editorBox.form1.data.parentid,
                 recTime: that.dialog.editorBox.form1.data.recTime,
                 useflag: that.dialog.editorBox.form1.data.useflag,
-                status: that.dialog.editorBox.form1.data.status,
-                transfer: that.dialog.editorBox.form1.data.transfer,
+                status: that.dialog.editorBox.form1.data.status,
                 // 扩展
                 tagid: that.dialog.editorBox.form1.data.tagid,
                 tagname: that.dialog.editorBox.form1.data.tagname,
@@ -2072,7 +2079,8 @@ export default {
                 propertyid: row.propertyid,
                 unitid: row.unitid,
                 isschedule: row.isschedule,
-                sourceType: row.sourceType,
+                sourceType: row.sourceType,
+                transfer: row.transfer,
                 useflag: useflag,
                 mintimegranid: row.mintimegranid
             };

src/views/energyBalance/components/balanceSheetData.vue

@@ -586,7 +586,7 @@
 
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
-import timegranDate from '@/components/zg/timegranDate.vue'
+import timegranDate from '~/components/zg/timegranDate.vue'
 import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'balanceSheetData',

src/views/energyPlan/components/supplyAndDemand/planProjectRoundGx.vue

@@ -784,8 +784,8 @@
 
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js';
-import timegranDate from '@/components/zg/timegranDate.vue';
-import formulaEditor from '@/components/zg/formulaEditor.vue';
+import timegranDate from '~/components/zg/timegranDate.vue';
+import formulaEditor from '~/components/zg/formulaEditor.vue';
 import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'balanceSheetData',

src/views/energyQuality/components/power/powerMonitoringDayData.vue

@@ -308,7 +308,7 @@
     </div>
 </template>
 <script>
-import timegranDate from '@/components/zg/timegranDate.vue'
+import timegranDate from '~/components/zg/timegranDate.vue'
 export default {
     name: 'powerMonitoringDayData',
      components: {

src/views/energyScheduling/components/investAndProduce/investAndProduceManage.vue

@@ -319,7 +319,7 @@
 
 <script>
 import { zCheckNumber1, checkInteger } from '~/utils/validator.js'
-import timegranDate from '@/components/zg/timegranDate.vue'
+import timegranDate from '~/components/zg/timegranDate.vue'
 import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'measuringManualEntry',

src/views/energyScheduling/components/investAndProduce/productMaterialsInOut.vue

@@ -386,7 +386,7 @@
 
 <script>
 import { zCheckNumber1, checkInteger } from '~/utils/validator.js'
-import timegranDate from '@/components/zg/timegranDate.vue'
+import timegranDate from '~/components/zg/timegranDate.vue'
 import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'measuringManualEntry',

src/views/energyScheduling/components/investAndProduce/productMaterialsInput.vue

@@ -376,7 +376,7 @@
 
 <script>
 import { zCheckNumber1, checkInteger } from '~/utils/validator.js'
-import timegranDate from '@/components/zg/timegranDate.vue'
+import timegranDate from '~/components/zg/timegranDate.vue'
 import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'measuringManualEntry',

src/views/energyScheduling/components/measuringLocationData/AbnormalDataMaintenance.vue

@@ -293,7 +293,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
-import timegranDate from '@/components/zg/timegranDate.vue'
+import timegranDate from '~/components/zg/timegranDate.vue'
 import { formatDate, XtcommonSummaries } from '@/utils/util.js';
 export default {
     name: 'AbnormalDataMaintenance',

src/views/energyScheduling/components/measuringLocationData/manualmeasuringLocationEntry.vue

@@ -666,7 +666,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
-import timegranDate from '@/components/zg/timegranDate.vue'
+import timegranDate from '~/components/zg/timegranDate.vue'
 import { formatDate, XtcommonSummaries } from '@/utils/util.js';
 export default {
     name: 'manmalmeasuringLocationAdd',

src/views/energyScheduling/components/measuringLocationData/measurementStandard.vue

@@ -1061,7 +1061,7 @@
 </template>
 
 <script>
-import formulaEditor from '@/components/zg/formulaEditor.vue'
+import formulaEditor from '~/components/zg/formulaEditor.vue'
 import { zCheckNumber2 } from '~/utils/validator.js'
 import { formatDate } from '@/utils/util.js';
 export default {

src/views/energyScheduling/components/measuringLocationData/measuringLocationEntry.vue

@@ -810,7 +810,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
-import timegranDate from '@/components/zg/timegranDate.vue'
+import timegranDate from '~/components/zg/timegranDate.vue'
 import { formatDate, XtcommonSummaries } from '@/utils/util.js';
 export default {
     name: 'measuringLocationAdd',
@@ -1382,7 +1382,7 @@ export default {
                 this.$message.error('至少要选择一条数据');
             }
         },
-        // 批量重新计算（由小时表数据计算而来）
+        // 批量重新计算（由小时表数据计算而来），这里是个假的，因为propertyid在行内显示的是文字，暂时不动
         but_re_compute () {
             let that = this;
             if (that.multipleSelection.length > 0) {

src/views/energyScheduling/components/meterManage/measuringManualEntry.vue

@@ -371,7 +371,7 @@
 
 <script>
 import { zCheckNumber1, checkInteger } from '~/utils/validator.js'
-import timegranDate from '@/components/zg/timegranDate.vue'
+import timegranDate from '~/components/zg/timegranDate.vue'
 import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'measuringManualEntry',