Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ncsoftkeys

Browse Source
This commit is contained in:
Paolo Possanzini
2018-03-22 16:56:59 +01:00
parent 33b16fd7ec 75aae82f85
commit 1ea10caa18
13 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Config/Config/ncSoftKeyConfig.xml
+28 -1
View File
@@ -3,114 +3,141 @@
<auto>
<active>true</active>
<visualizedName>Auto</visualizedName>
<readOnly>false</readOnly>
</auto>
<edit>
<active>true</active>
<visualizedName>Edit</visualizedName>
<readOnly>false</readOnly>
</edit>
<mdi>
<active>true</active>
<visualizedName>Mdi</visualizedName>
<readOnly>false</readOnly>
</mdi>
<dnc>
<active>true</active>
<visualizedName>Dnc</visualizedName>
<readOnly>false</readOnly>
</dnc>
<ref>
<active>true</active>
<visualizedName>Ref</visualizedName>
<readOnly>false</readOnly>
</ref>
<jog>
<active>true</active>
<visualizedName>Jog</visualizedName>
<readOnly>false</readOnly>
</jog>
<jogInc>
<active>true</active>
<visualizedName>Jog Inc</visualizedName>
<readOnly>false</readOnly>
</jogInc>
<restart>
<active>true</active>
<visualizedName>Restart</visualizedName>
<readOnly>false</readOnly>
</restart>
<teach>
<active>true</active>
<visualizedName>Teach</visualizedName>
<readOnly>false</readOnly>
</teach>
<retract>
<active>true</active>
<visualizedName>Restract</visualizedName>
<readOnly>false</readOnly>
</retract>
<wcsMcs>
<active>true</active>
<visualizedName>Wcs Mcs</visualizedName>
<readOnly>false</readOnly>
</wcsMcs>
<handle>
<active>true</active>
<visualizedName>Handle</visualizedName>
<readOnly>true</readOnly>
</handle>
<reset>
<active>true</active>
<visualizedName>Reset</visualizedName>
<readOnly>false</readOnly>
</reset>
<!-- Sub Menu -->
<blk>
<active>true</active>
<visualizedName>Blk/Blk</visualizedName>
<readOnly>false</readOnly>
</blk>
<blkDel>
<active>true</active>
<visualizedName>Blk Del</visualizedName>
<readOnly>false</readOnly>
</blkDel>
<opStop>
<active>true</active>
<visualizedName>OpStop</visualizedName>
<readOnly>false</readOnly>
</opStop>
<dryRun>
<active>true</active>
<visualizedName>DryRun</visualizedName>
<readOnly>false</readOnly>
</dryRun>
<prgTest>
<active>true</active>
<visualizedName>PrgTest</visualizedName>
<readOnly>false</readOnly>
</prgTest>
<manualHandleInterrupt>
<active>true</active>
<visualizedName>Manual Handle Interrupt</visualizedName>
<readOnly>false</readOnly>
</manualHandleInterrupt>
<teachIn>
<active>true</active>
<visualizedName>Teach In</visualizedName>
<readOnly>false</readOnly>
</teachIn>
<incPlane>
<active>true</active>
<visualizedName>Inc Plane</visualizedName>
<visualizedName>Inc Plane</visualizedName><readOnly>false</readOnly>
</incPlane>
<plus>
<active>true</active>
<visualizedName>+</visualizedName>
<readOnly>false</readOnly>
</plus>
<minus>
<active>true</active>
<visualizedName>-</visualizedName>
<readOnly>false</readOnly>
</minus>
<rapid>
<active>true</active>
<visualizedName>Rapid</visualizedName>
<readOnly>false</readOnly>
</rapid>
<xOne>
<active>true</active>
<visualizedName>x1</visualizedName>
<readOnly>false</readOnly>
</xOne>
<xTen>
<active>true</active>
<visualizedName>x10</visualizedName>
<readOnly>false</readOnly>
</xTen>
<xHundred>
<active>true</active>
<visualizedName>x10</visualizedName>
<readOnly>false</readOnly>
</xHundred>
<xThousand>
<active>true</active>
<visualizedName>x10</visualizedName>
<readOnly>false</readOnly>
</xThousand>
</ncSoftKeys>
Step.Config/Config/ncSoftKeyConfigValidator.xsd
+2 -1
View File
@@ -8,7 +8,8 @@
<xs:complexType name="ncSoftKeyType">
<xs:all>
<xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
<xs:element name="visualizedName" type="xs:string"></xs:element>
<xs:element name="visualizedName" type="xs:string" minOccurs="1" maxOccurs="1"></xs:element>
<xs:element name="readOnly" type="xs:boolean" minOccurs="1" maxOccurs="1"></xs:element>
</xs:all>
</xs:complexType>
Step.Config/Config/serverConfig.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<ncConfig>
<ncVendor>DEMO</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
<showNcHMI>true</showNcHMI>
<ncIpAddress>192.168.157.2</ncIpAddress>
<ncIpAddress>localhost</ncIpAddress>
<ncPort>8080</ncPort>
<machineModel>Ares 37 OF</machineModel>
</ncConfig>
Step.Config/ServerConfigController.cs
+2 -1
View File
@@ -221,7 +221,8 @@ namespace Step.Config
Id = GetPlcIdFromNcSoftKey(x.Name.ToString()),
Name = x.Name.ToString(),
VisualizedName = x.Element("visualizedName").Value,
IsActive = Convert.ToBoolean(x.Element("active").Value)
IsActive = Convert.ToBoolean(x.Element("active").Value),
IsReadOnly = Convert.ToBoolean(x.Element("readOnly").Value)
})
.ToList();
}
Step.Model/ConfigModels/NcSoftKeysModel.cs
+1
View File
@@ -4,6 +4,7 @@
{
public int Id;
public bool IsActive;
public bool IsReadOnly;
public string Name;
public string VisualizedName;
}
Step/Controllers/WebApi/ConfigurationController.cs
+1 -1
View File
@@ -51,7 +51,7 @@ namespace Step.Controllers.WebApi
}
[Route("softKeys"), HttpGet]
public IHttpActionResult GetSoftKeysConfig()
public IHttpActionResult GetUserSoftKeysConfig()
{
Dictionary<int, List<DTOUserSoftKeyConfigModel>> output = new Dictionary<int, List<DTOUserSoftKeyConfigModel>>();
foreach (var softKey in SoftKeysConfig)
Step/Listeners/SignalR/SignalRListener.cs
+1 -1
View File
@@ -213,7 +213,7 @@ namespace Step.Listeners.SignalR
// Send user softKeys
context.Clients.Group("ncData").userSoftKeys(LastUserSoftKeysData);
// Send heads data
context.Clients.Group("ncData").heads(LastHeadsData);
context.Clients.Group("ncData").headsData(LastHeadsData);
// Send axesNames data
context.Clients.Group("ncData").axesNames(LastAxesNamesData);
Step/wwwroot/dist/1.build.js
Vendored
+8
View File
@@ -18,7 +18,11 @@ eval("// style-loader: Adds some css to the DOM by adding a <style> tag\n\n// lo
/***/ 590:
/***/ (function(module, exports, __webpack_require__) {
<<<<<<< HEAD
eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\n// module\nexports.push([module.i, \"\\n.test-empty{\\n display: flex;\\n align-items: center;\\n justify-content: center;\\n width: 100%;\\n height: 100%;\\n}\\n\", \"\", {\"version\":3,\"sources\":[\"C:/Work/SCM/CMS/Step/Step/wwwroot/src/components/src/components/test-empty.vue?611143b8\"],\"names\":[],\"mappings\":\";AAaA;EACA,cAAA;EACA,oBAAA;EACA,wBAAA;EACA,YAAA;EACA,aAAA;CACA\",\"file\":\"test-empty.vue\",\"sourcesContent\":[\"<template>\\n <div class=\\\"test-empty\\\">\\n <keypad></keypad>\\n </div>\\n</template>\\n<script>\\nimport { Keypad } from \\\"src/modules/base-components\\\";\\n\\nexport default {\\n components: { keypad: Keypad }\\n};\\n</script>\\n<style>\\n .test-empty{\\n display: flex;\\n align-items: center;\\n justify-content: center;\\n width: 100%;\\n height: 100%;\\n }\\n</style>\\n\\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkwLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvdGVzdC1lbXB0eS52dWU/OThmZCJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuLnRlc3QtZW1wdHl7XFxuICBkaXNwbGF5OiBmbGV4O1xcbiAgYWxpZ24taXRlbXM6IGNlbnRlcjtcXG4gIGp1c3RpZnktY29udGVudDogY2VudGVyO1xcbiAgd2lkdGg6IDEwMCU7XFxuICBoZWlnaHQ6IDEwMCU7XFxufVxcblwiLCBcIlwiLCB7XCJ2ZXJzaW9uXCI6MyxcInNvdXJjZXNcIjpbXCJDOi9Xb3JrL1NDTS9DTVMvU3RlcC9TdGVwL3d3d3Jvb3Qvc3JjL2NvbXBvbmVudHMvc3JjL2NvbXBvbmVudHMvdGVzdC1lbXB0eS52dWU/NjExMTQzYjhcIl0sXCJuYW1lc1wiOltdLFwibWFwcGluZ3NcIjpcIjtBQWFBO0VBQ0EsY0FBQTtFQUNBLG9CQUFBO0VBQ0Esd0JBQUE7RUFDQSxZQUFBO0VBQ0EsYUFBQTtDQUNBXCIsXCJmaWxlXCI6XCJ0ZXN0LWVtcHR5LnZ1ZVwiLFwic291cmNlc0NvbnRlbnRcIjpbXCI8dGVtcGxhdGU+XFxuICA8ZGl2IGNsYXNzPVxcXCJ0ZXN0LWVtcHR5XFxcIj5cXG4gICAgPGtleXBhZD48L2tleXBhZD5cXG4gIDwvZGl2PlxcbjwvdGVtcGxhdGU+XFxuPHNjcmlwdD5cXG5pbXBvcnQgeyBLZXlwYWQgfSBmcm9tIFxcXCJzcmMvbW9kdWxlcy9iYXNlLWNvbXBvbmVudHNcXFwiO1xcblxcbmV4cG9ydCBkZWZhdWx0IHtcXG4gIGNvbXBvbmVudHM6IHsga2V5cGFkOiBLZXlwYWQgfVxcbn07XFxuPC9zY3JpcHQ+XFxuPHN0eWxlPlxcbiAgLnRlc3QtZW1wdHl7XFxuICAgIGRpc3BsYXk6IGZsZXg7XFxuICAgIGFsaWduLWl0ZW1zOiBjZW50ZXI7XFxuICAgIGp1c3RpZnktY29udGVudDogY2VudGVyO1xcbiAgICB3aWR0aDogMTAwJTtcXG4gICAgaGVpZ2h0OiAxMDAlO1xcbiAgfVxcbjwvc3R5bGU+XFxuXFxuXCJdLFwic291cmNlUm9vdFwiOlwiXCJ9XSk7XG5cbi8vIGV4cG9ydHNcblxuXG5cbi8vLy8vLy8vLy8vLy8vLy8vL1xuLy8gV0VCUEFDSyBGT09URVJcbi8vIC4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXI/c291cmNlTWFwIS4vbm9kZV9tb2R1bGVzL3Z1ZS1sb2FkZXIvbGliL3N0eWxlLWNvbXBpbGVyP3tcInZ1ZVwiOnRydWUsXCJpZFwiOlwiZGF0YS12LTBhOGVjNzQyXCIsXCJzY29wZWRcIjpmYWxzZSxcImhhc0lubGluZUNvbmZpZ1wiOmZhbHNlfSEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9zZWxlY3Rvci5qcz90eXBlPXN0eWxlcyZpbmRleD0wJmJ1c3RDYWNoZSEuL3NyYy9jb21wb25lbnRzL3Rlc3QtZW1wdHkudnVlXG4vLyBtb2R1bGUgaWQgPSA1OTBcbi8vIG1vZHVsZSBjaHVua3MgPSAxIl0sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///590\n");
=======
eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\n// module\nexports.push([module.i, \"\\n.test-empty{\\n display: flex;\\n align-items: center;\\n justify-content: center;\\n width: 100%;\\n height: 100%;\\n}\\n\", \"\", {\"version\":3,\"sources\":[\"C:/Workspace/CMS_STEP/Step/wwwroot/src/components/src/components/test-empty.vue?796c190c\"],\"names\":[],\"mappings\":\";AAaA;EACA,cAAA;EACA,oBAAA;EACA,wBAAA;EACA,YAAA;EACA,aAAA;CACA\",\"file\":\"test-empty.vue\",\"sourcesContent\":[\"<template>\\r\\n <div class=\\\"test-empty\\\">\\r\\n <keypad></keypad>\\r\\n </div>\\r\\n</template>\\r\\n<script>\\r\\nimport { Keypad } from \\\"src/modules/base-components\\\";\\r\\n\\r\\nexport default {\\r\\n components: { keypad: Keypad }\\r\\n};\\r\\n</script>\\r\\n<style>\\r\\n .test-empty{\\r\\n display: flex;\\r\\n align-items: center;\\r\\n justify-content: center;\\r\\n width: 100%;\\r\\n height: 100%;\\r\\n }\\r\\n</style>\\r\\n\\r\\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkwLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvdGVzdC1lbXB0eS52dWU/OThmZCJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuLnRlc3QtZW1wdHl7XFxuICBkaXNwbGF5OiBmbGV4O1xcbiAgYWxpZ24taXRlbXM6IGNlbnRlcjtcXG4gIGp1c3RpZnktY29udGVudDogY2VudGVyO1xcbiAgd2lkdGg6IDEwMCU7XFxuICBoZWlnaHQ6IDEwMCU7XFxufVxcblwiLCBcIlwiLCB7XCJ2ZXJzaW9uXCI6MyxcInNvdXJjZXNcIjpbXCJDOi9Xb3Jrc3BhY2UvQ01TX1NURVAvU3RlcC93d3dyb290L3NyYy9jb21wb25lbnRzL3NyYy9jb21wb25lbnRzL3Rlc3QtZW1wdHkudnVlPzc5NmMxOTBjXCJdLFwibmFtZXNcIjpbXSxcIm1hcHBpbmdzXCI6XCI7QUFhQTtFQUNBLGNBQUE7RUFDQSxvQkFBQTtFQUNBLHdCQUFBO0VBQ0EsWUFBQTtFQUNBLGFBQUE7Q0FDQVwiLFwiZmlsZVwiOlwidGVzdC1lbXB0eS52dWVcIixcInNvdXJjZXNDb250ZW50XCI6W1wiPHRlbXBsYXRlPlxcclxcbiAgPGRpdiBjbGFzcz1cXFwidGVzdC1lbXB0eVxcXCI+XFxyXFxuICAgIDxrZXlwYWQ+PC9rZXlwYWQ+XFxyXFxuICA8L2Rpdj5cXHJcXG48L3RlbXBsYXRlPlxcclxcbjxzY3JpcHQ+XFxyXFxuaW1wb3J0IHsgS2V5cGFkIH0gZnJvbSBcXFwic3JjL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXFxcIjtcXHJcXG5cXHJcXG5leHBvcnQgZGVmYXVsdCB7XFxyXFxuICBjb21wb25lbnRzOiB7IGtleXBhZDogS2V5cGFkIH1cXHJcXG59O1xcclxcbjwvc2NyaXB0PlxcclxcbjxzdHlsZT5cXHJcXG4gIC50ZXN0LWVtcHR5e1xcclxcbiAgICBkaXNwbGF5OiBmbGV4O1xcclxcbiAgICBhbGlnbi1pdGVtczogY2VudGVyO1xcclxcbiAgICBqdXN0aWZ5LWNvbnRlbnQ6IGNlbnRlcjtcXHJcXG4gICAgd2lkdGg6IDEwMCU7XFxyXFxuICAgIGhlaWdodDogMTAwJTtcXHJcXG4gIH1cXHJcXG48L3N0eWxlPlxcclxcblxcclxcblwiXSxcInNvdXJjZVJvb3RcIjpcIlwifV0pO1xuXG4vLyBleHBvcnRzXG5cblxuXG4vLy8vLy8vLy8vLy8vLy8vLy9cbi8vIFdFQlBBQ0sgRk9PVEVSXG4vLyAuL25vZGVfbW9kdWxlcy9jc3MtbG9hZGVyP3NvdXJjZU1hcCEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9zdHlsZS1jb21waWxlcj97XCJ2dWVcIjp0cnVlLFwiaWRcIjpcImRhdGEtdi0wYThlYzc0MlwiLFwic2NvcGVkXCI6ZmFsc2UsXCJoYXNJbmxpbmVDb25maWdcIjpmYWxzZX0hLi9ub2RlX21vZHVsZXMvdnVlLWxvYWRlci9saWIvc2VsZWN0b3IuanM/dHlwZT1zdHlsZXMmaW5kZXg9MCZidXN0Q2FjaGUhLi9zcmMvY29tcG9uZW50cy90ZXN0LWVtcHR5LnZ1ZVxuLy8gbW9kdWxlIGlkID0gNTkwXG4vLyBtb2R1bGUgY2h1bmtzID0gMSJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTsiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///590\n");
>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b
/***/ }),
@@ -26,7 +30,11 @@ eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\
/***/ (function(module, exports, __webpack_require__) {
"use strict";
<<<<<<< HEAD
eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n components: { keypad: _baseComponents.Keypad }\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkxLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtZW1wdHkudnVlP2M2ZjIiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxuICA8ZGl2IGNsYXNzPVwidGVzdC1lbXB0eVwiPlxuICAgIDxrZXlwYWQ+PC9rZXlwYWQ+XG4gIDwvZGl2PlxuPC90ZW1wbGF0ZT5cbjxzY3JpcHQ+XG5pbXBvcnQgeyBLZXlwYWQgfSBmcm9tIFwic3JjL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IHtcbiAgY29tcG9uZW50czogeyBrZXlwYWQ6IEtleXBhZCB9XG59O1xuPC9zY3JpcHQ+XG48c3R5bGU+XG4gIC50ZXN0LWVtcHR5e1xuICAgIGRpc3BsYXk6IGZsZXg7XG4gICAgYWxpZ24taXRlbXM6IGNlbnRlcjtcbiAgICBqdXN0aWZ5LWNvbnRlbnQ6IGNlbnRlcjtcbiAgICB3aWR0aDogMTAwJTtcbiAgICBoZWlnaHQ6IDEwMCU7XG4gIH1cbjwvc3R5bGU+XG5cblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyB0ZXN0LWVtcHR5LnZ1ZT82MTExNDNiOCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBTUE7QUFDQTs7QUFHQTtBQURBOzs7O0EiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///591\n");
=======
eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n components: { keypad: _baseComponents.Keypad }\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkxLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtZW1wdHkudnVlP2FlNGQiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxyXG4gIDxkaXYgY2xhc3M9XCJ0ZXN0LWVtcHR5XCI+XHJcbiAgICA8a2V5cGFkPjwva2V5cGFkPlxyXG4gIDwvZGl2PlxyXG48L3RlbXBsYXRlPlxyXG48c2NyaXB0PlxyXG5pbXBvcnQgeyBLZXlwYWQgfSBmcm9tIFwic3JjL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XHJcblxyXG5leHBvcnQgZGVmYXVsdCB7XHJcbiAgY29tcG9uZW50czogeyBrZXlwYWQ6IEtleXBhZCB9XHJcbn07XHJcbjwvc2NyaXB0PlxyXG48c3R5bGU+XHJcbiAgLnRlc3QtZW1wdHl7XHJcbiAgICBkaXNwbGF5OiBmbGV4O1xyXG4gICAgYWxpZ24taXRlbXM6IGNlbnRlcjtcclxuICAgIGp1c3RpZnktY29udGVudDogY2VudGVyO1xyXG4gICAgd2lkdGg6IDEwMCU7XHJcbiAgICBoZWlnaHQ6IDEwMCU7XHJcbiAgfVxyXG48L3N0eWxlPlxyXG5cclxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHRlc3QtZW1wdHkudnVlPzc5NmMxOTBjIl0sIm1hcHBpbmdzIjoiOzs7Ozs7QUFNQTtBQUNBOztBQUdBO0FBREE7Ozs7QSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///591\n");
>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b
/***/ }),
Step/wwwroot/dist/2.build.js
Vendored
+8
View File
@@ -18,7 +18,11 @@ eval("// style-loader: Adds some css to the DOM by adding a <style> tag\n\n// lo
/***/ 584:
/***/ (function(module, exports, __webpack_require__) {
<<<<<<< HEAD
eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\n// module\nexports.push([module.i, \"\\nh1[data-v-fed36922],\\nh2[data-v-fed36922] {\\n font-weight: normal;\\n}\\nul[data-v-fed36922] {\\n list-style-type: none;\\n padding: 0;\\n}\\nli[data-v-fed36922] {\\n display: inline-block;\\n margin: 0 10px;\\n}\\na[data-v-fed36922] {\\n color: #42b983;\\n}\\n\", \"\", {\"version\":3,\"sources\":[\"C:/Work/SCM/CMS/Step/Step/wwwroot/src/components/src/components/Home.vue?25b1d7e4\"],\"names\":[],\"mappings\":\";AAsBA;;EAEA,oBAAA;CACA;AACA;EACA,sBAAA;EACA,WAAA;CACA;AACA;EACA,sBAAA;EACA,eAAA;CACA;AACA;EACA,eAAA;CACA\",\"file\":\"Home.vue\",\"sourcesContent\":[\"<template>\\n <div class=\\\"hello\\\">\\n\\n </div>\\n</template>\\n\\n<script>\\n\\n\\nexport default {\\n name: \\\"HelloWorld\\\",\\n components: { },\\n data() {\\n return {\\n msg: \\\"Welcome to Your Vue.js App\\\"\\n };\\n }\\n};\\n</script>\\n\\n<!-- Add \\\"scoped\\\" attribute to limit CSS to this component only -->\\n<style scoped>\\nh1,\\nh2 {\\n font-weight: normal;\\n}\\nul {\\n list-style-type: none;\\n padding: 0;\\n}\\nli {\\n display: inline-block;\\n margin: 0 10px;\\n}\\na {\\n color: #42b983;\\n}\\n</style>\\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg0LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvSG9tZS52dWU/YTAzYyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuaDFbZGF0YS12LWZlZDM2OTIyXSxcXG5oMltkYXRhLXYtZmVkMzY5MjJdIHtcXG4gIGZvbnQtd2VpZ2h0OiBub3JtYWw7XFxufVxcbnVsW2RhdGEtdi1mZWQzNjkyMl0ge1xcbiAgbGlzdC1zdHlsZS10eXBlOiBub25lO1xcbiAgcGFkZGluZzogMDtcXG59XFxubGlbZGF0YS12LWZlZDM2OTIyXSB7XFxuICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7XFxuICBtYXJnaW46IDAgMTBweDtcXG59XFxuYVtkYXRhLXYtZmVkMzY5MjJdIHtcXG4gIGNvbG9yOiAjNDJiOTgzO1xcbn1cXG5cIiwgXCJcIiwge1widmVyc2lvblwiOjMsXCJzb3VyY2VzXCI6W1wiQzovV29yay9TQ00vQ01TL1N0ZXAvU3RlcC93d3dyb290L3NyYy9jb21wb25lbnRzL3NyYy9jb21wb25lbnRzL0hvbWUudnVlPzI1YjFkN2U0XCJdLFwibmFtZXNcIjpbXSxcIm1hcHBpbmdzXCI6XCI7QUFzQkE7O0VBRUEsb0JBQUE7Q0FDQTtBQUNBO0VBQ0Esc0JBQUE7RUFDQSxXQUFBO0NBQ0E7QUFDQTtFQUNBLHNCQUFBO0VBQ0EsZUFBQTtDQUNBO0FBQ0E7RUFDQSxlQUFBO0NBQ0FcIixcImZpbGVcIjpcIkhvbWUudnVlXCIsXCJzb3VyY2VzQ29udGVudFwiOltcIjx0ZW1wbGF0ZT5cXG4gIDxkaXYgY2xhc3M9XFxcImhlbGxvXFxcIj5cXG5cXG4gIDwvZGl2PlxcbjwvdGVtcGxhdGU+XFxuXFxuPHNjcmlwdD5cXG5cXG5cXG5leHBvcnQgZGVmYXVsdCB7XFxuICBuYW1lOiBcXFwiSGVsbG9Xb3JsZFxcXCIsXFxuICBjb21wb25lbnRzOiB7ICB9LFxcbiAgZGF0YSgpIHtcXG4gICAgcmV0dXJuIHtcXG4gICAgICBtc2c6IFxcXCJXZWxjb21lIHRvIFlvdXIgVnVlLmpzIEFwcFxcXCJcXG4gICAgfTtcXG4gIH1cXG59O1xcbjwvc2NyaXB0PlxcblxcbjwhLS0gQWRkIFxcXCJzY29wZWRcXFwiIGF0dHJpYnV0ZSB0byBsaW1pdCBDU1MgdG8gdGhpcyBjb21wb25lbnQgb25seSAtLT5cXG48c3R5bGUgc2NvcGVkPlxcbmgxLFxcbmgyIHtcXG4gIGZvbnQtd2VpZ2h0OiBub3JtYWw7XFxufVxcbnVsIHtcXG4gIGxpc3Qtc3R5bGUtdHlwZTogbm9uZTtcXG4gIHBhZGRpbmc6IDA7XFxufVxcbmxpIHtcXG4gIGRpc3BsYXk6IGlubGluZS1ibG9jaztcXG4gIG1hcmdpbjogMCAxMHB4O1xcbn1cXG5hIHtcXG4gIGNvbG9yOiAjNDJiOTgzO1xcbn1cXG48L3N0eWxlPlxcblwiXSxcInNvdXJjZVJvb3RcIjpcIlwifV0pO1xuXG4vLyBleHBvcnRzXG5cblxuXG4vLy8vLy8vLy8vLy8vLy8vLy9cbi8vIFdFQlBBQ0sgRk9PVEVSXG4vLyAuL25vZGVfbW9kdWxlcy9jc3MtbG9hZGVyP3NvdXJjZU1hcCEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9zdHlsZS1jb21waWxlcj97XCJ2dWVcIjp0cnVlLFwiaWRcIjpcImRhdGEtdi1mZWQzNjkyMlwiLFwic2NvcGVkXCI6dHJ1ZSxcImhhc0lubGluZUNvbmZpZ1wiOmZhbHNlfSEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9zZWxlY3Rvci5qcz90eXBlPXN0eWxlcyZpbmRleD0wJmJ1c3RDYWNoZSEuL3NyYy9jb21wb25lbnRzL0hvbWUudnVlXG4vLyBtb2R1bGUgaWQgPSA1ODRcbi8vIG1vZHVsZSBjaHVua3MgPSAyIl0sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///584\n");
=======
eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\n// module\nexports.push([module.i, \"\\nh1[data-v-fed36922],\\r\\nh2[data-v-fed36922] {\\r\\n font-weight: normal;\\n}\\nul[data-v-fed36922] {\\r\\n list-style-type: none;\\r\\n padding: 0;\\n}\\nli[data-v-fed36922] {\\r\\n display: inline-block;\\r\\n margin: 0 10px;\\n}\\na[data-v-fed36922] {\\r\\n color: #42b983;\\n}\\r\\n\", \"\", {\"version\":3,\"sources\":[\"C:/Workspace/CMS_STEP/Step/wwwroot/src/components/src/components/Home.vue?7ecdb9dc\"],\"names\":[],\"mappings\":\";AAsBA;;EAEA,oBAAA;CACA;AACA;EACA,sBAAA;EACA,WAAA;CACA;AACA;EACA,sBAAA;EACA,eAAA;CACA;AACA;EACA,eAAA;CACA\",\"file\":\"Home.vue\",\"sourcesContent\":[\"<template>\\r\\n <div class=\\\"hello\\\">\\r\\n\\r\\n </div>\\r\\n</template>\\r\\n\\r\\n<script>\\r\\n\\r\\n\\r\\nexport default {\\r\\n name: \\\"HelloWorld\\\",\\r\\n components: { },\\r\\n data() {\\r\\n return {\\r\\n msg: \\\"Welcome to Your Vue.js App\\\"\\r\\n };\\r\\n }\\r\\n};\\r\\n</script>\\r\\n\\r\\n<!-- Add \\\"scoped\\\" attribute to limit CSS to this component only -->\\r\\n<style scoped>\\r\\nh1,\\r\\nh2 {\\r\\n font-weight: normal;\\r\\n}\\r\\nul {\\r\\n list-style-type: none;\\r\\n padding: 0;\\r\\n}\\r\\nli {\\r\\n display: inline-block;\\r\\n margin: 0 10px;\\r\\n}\\r\\na {\\r\\n color: #42b983;\\r\\n}\\r\\n</style>\\r\\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg0LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvSG9tZS52dWU/YTAzYyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuaDFbZGF0YS12LWZlZDM2OTIyXSxcXHJcXG5oMltkYXRhLXYtZmVkMzY5MjJdIHtcXHJcXG4gIGZvbnQtd2VpZ2h0OiBub3JtYWw7XFxufVxcbnVsW2RhdGEtdi1mZWQzNjkyMl0ge1xcclxcbiAgbGlzdC1zdHlsZS10eXBlOiBub25lO1xcclxcbiAgcGFkZGluZzogMDtcXG59XFxubGlbZGF0YS12LWZlZDM2OTIyXSB7XFxyXFxuICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7XFxyXFxuICBtYXJnaW46IDAgMTBweDtcXG59XFxuYVtkYXRhLXYtZmVkMzY5MjJdIHtcXHJcXG4gIGNvbG9yOiAjNDJiOTgzO1xcbn1cXHJcXG5cIiwgXCJcIiwge1widmVyc2lvblwiOjMsXCJzb3VyY2VzXCI6W1wiQzovV29ya3NwYWNlL0NNU19TVEVQL1N0ZXAvd3d3cm9vdC9zcmMvY29tcG9uZW50cy9zcmMvY29tcG9uZW50cy9Ib21lLnZ1ZT83ZWNkYjlkY1wiXSxcIm5hbWVzXCI6W10sXCJtYXBwaW5nc1wiOlwiO0FBc0JBOztFQUVBLG9CQUFBO0NBQ0E7QUFDQTtFQUNBLHNCQUFBO0VBQ0EsV0FBQTtDQUNBO0FBQ0E7RUFDQSxzQkFBQTtFQUNBLGVBQUE7Q0FDQTtBQUNBO0VBQ0EsZUFBQTtDQUNBXCIsXCJmaWxlXCI6XCJIb21lLnZ1ZVwiLFwic291cmNlc0NvbnRlbnRcIjpbXCI8dGVtcGxhdGU+XFxyXFxuICA8ZGl2IGNsYXNzPVxcXCJoZWxsb1xcXCI+XFxyXFxuXFxyXFxuICA8L2Rpdj5cXHJcXG48L3RlbXBsYXRlPlxcclxcblxcclxcbjxzY3JpcHQ+XFxyXFxuXFxyXFxuXFxyXFxuZXhwb3J0IGRlZmF1bHQge1xcclxcbiAgbmFtZTogXFxcIkhlbGxvV29ybGRcXFwiLFxcclxcbiAgY29tcG9uZW50czogeyAgfSxcXHJcXG4gIGRhdGEoKSB7XFxyXFxuICAgIHJldHVybiB7XFxyXFxuICAgICAgbXNnOiBcXFwiV2VsY29tZSB0byBZb3VyIFZ1ZS5qcyBBcHBcXFwiXFxyXFxuICAgIH07XFxyXFxuICB9XFxyXFxufTtcXHJcXG48L3NjcmlwdD5cXHJcXG5cXHJcXG48IS0tIEFkZCBcXFwic2NvcGVkXFxcIiBhdHRyaWJ1dGUgdG8gbGltaXQgQ1NTIHRvIHRoaXMgY29tcG9uZW50IG9ubHkgLS0+XFxyXFxuPHN0eWxlIHNjb3BlZD5cXHJcXG5oMSxcXHJcXG5oMiB7XFxyXFxuICBmb250LXdlaWdodDogbm9ybWFsO1xcclxcbn1cXHJcXG51bCB7XFxyXFxuICBsaXN0LXN0eWxlLXR5cGU6IG5vbmU7XFxyXFxuICBwYWRkaW5nOiAwO1xcclxcbn1cXHJcXG5saSB7XFxyXFxuICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7XFxyXFxuICBtYXJnaW46IDAgMTBweDtcXHJcXG59XFxyXFxuYSB7XFxyXFxuICBjb2xvcjogIzQyYjk4MztcXHJcXG59XFxyXFxuPC9zdHlsZT5cXHJcXG5cIl0sXCJzb3VyY2VSb290XCI6XCJcIn1dKTtcblxuLy8gZXhwb3J0c1xuXG5cblxuLy8vLy8vLy8vLy8vLy8vLy8vXG4vLyBXRUJQQUNLIEZPT1RFUlxuLy8gLi9ub2RlX21vZHVsZXMvY3NzLWxvYWRlcj9zb3VyY2VNYXAhLi9ub2RlX21vZHVsZXMvdnVlLWxvYWRlci9saWIvc3R5bGUtY29tcGlsZXI/e1widnVlXCI6dHJ1ZSxcImlkXCI6XCJkYXRhLXYtZmVkMzY5MjJcIixcInNjb3BlZFwiOnRydWUsXCJoYXNJbmxpbmVDb25maWdcIjpmYWxzZX0hLi9ub2RlX21vZHVsZXMvdnVlLWxvYWRlci9saWIvc2VsZWN0b3IuanM/dHlwZT1zdHlsZXMmaW5kZXg9MCZidXN0Q2FjaGUhLi9zcmMvY29tcG9uZW50cy9Ib21lLnZ1ZVxuLy8gbW9kdWxlIGlkID0gNTg0XG4vLyBtb2R1bGUgY2h1bmtzID0gMiJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTsiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///584\n");
>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b
/***/ }),
@@ -26,7 +30,11 @@ eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\
/***/ (function(module, exports, __webpack_require__) {
"use strict";
<<<<<<< HEAD
eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n//\n//\n//\n//\n//\n//\n\n\nexports.default = {\n name: \"HelloWorld\",\n components: {},\n data: function data() {\n return {\n msg: \"Welcome to Your Vue.js App\"\n };\n }\n};//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg1LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL0hvbWUudnVlP2YwZmMiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxuICA8ZGl2IGNsYXNzPVwiaGVsbG9cIj5cblxuICA8L2Rpdj5cbjwvdGVtcGxhdGU+XG5cbjxzY3JpcHQ+XG5cblxuZXhwb3J0IGRlZmF1bHQge1xuICBuYW1lOiBcIkhlbGxvV29ybGRcIixcbiAgY29tcG9uZW50czogeyAgfSxcbiAgZGF0YSgpIHtcbiAgICByZXR1cm4ge1xuICAgICAgbXNnOiBcIldlbGNvbWUgdG8gWW91ciBWdWUuanMgQXBwXCJcbiAgICB9O1xuICB9XG59O1xuPC9zY3JpcHQ+XG5cbjwhLS0gQWRkIFwic2NvcGVkXCIgYXR0cmlidXRlIHRvIGxpbWl0IENTUyB0byB0aGlzIGNvbXBvbmVudCBvbmx5IC0tPlxuPHN0eWxlIHNjb3BlZD5cbmgxLFxuaDIge1xuICBmb250LXdlaWdodDogbm9ybWFsO1xufVxudWwge1xuICBsaXN0LXN0eWxlLXR5cGU6IG5vbmU7XG4gIHBhZGRpbmc6IDA7XG59XG5saSB7XG4gIGRpc3BsYXk6IGlubGluZS1ibG9jaztcbiAgbWFyZ2luOiAwIDEwcHg7XG59XG5hIHtcbiAgY29sb3I6ICM0MmI5ODM7XG59XG48L3N0eWxlPlxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIEhvbWUudnVlPzI1YjFkN2U0Il0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBU0E7QUFDQTtBQUNBOztBQUFBO0FBQ0E7QUFDQTs7QUFFQTtBQURBO0FBR0E7QUFQQSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///585\n");
=======
eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n//\n//\n//\n//\n//\n//\n\n\nexports.default = {\n name: \"HelloWorld\",\n components: {},\n data: function data() {\n return {\n msg: \"Welcome to Your Vue.js App\"\n };\n }\n};//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg1LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL0hvbWUudnVlPzQ0ZTQiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxyXG4gIDxkaXYgY2xhc3M9XCJoZWxsb1wiPlxyXG5cclxuICA8L2Rpdj5cclxuPC90ZW1wbGF0ZT5cclxuXHJcbjxzY3JpcHQ+XHJcblxyXG5cclxuZXhwb3J0IGRlZmF1bHQge1xyXG4gIG5hbWU6IFwiSGVsbG9Xb3JsZFwiLFxyXG4gIGNvbXBvbmVudHM6IHsgIH0sXHJcbiAgZGF0YSgpIHtcclxuICAgIHJldHVybiB7XHJcbiAgICAgIG1zZzogXCJXZWxjb21lIHRvIFlvdXIgVnVlLmpzIEFwcFwiXHJcbiAgICB9O1xyXG4gIH1cclxufTtcclxuPC9zY3JpcHQ+XHJcblxyXG48IS0tIEFkZCBcInNjb3BlZFwiIGF0dHJpYnV0ZSB0byBsaW1pdCBDU1MgdG8gdGhpcyBjb21wb25lbnQgb25seSAtLT5cclxuPHN0eWxlIHNjb3BlZD5cclxuaDEsXHJcbmgyIHtcclxuICBmb250LXdlaWdodDogbm9ybWFsO1xyXG59XHJcbnVsIHtcclxuICBsaXN0LXN0eWxlLXR5cGU6IG5vbmU7XHJcbiAgcGFkZGluZzogMDtcclxufVxyXG5saSB7XHJcbiAgZGlzcGxheTogaW5saW5lLWJsb2NrO1xyXG4gIG1hcmdpbjogMCAxMHB4O1xyXG59XHJcbmEge1xyXG4gIGNvbG9yOiAjNDJiOTgzO1xyXG59XHJcbjwvc3R5bGU+XHJcblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyBIb21lLnZ1ZT83ZWNkYjlkYyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQVNBO0FBQ0E7QUFDQTs7QUFBQTtBQUNBO0FBQ0E7O0FBRUE7QUFEQTtBQUdBO0FBUEEiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///585\n");
>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b
/***/ }),
Step/wwwroot/dist/3.build.js
Vendored
+4
View File
@@ -12,7 +12,11 @@ eval("Object.defineProperty(__webpack_exports__, \"__esModule\", { value: true }
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
<<<<<<< HEAD
eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_vue__ = __webpack_require__(10);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component__ = __webpack_require__(36);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_vue_class_component__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__store__ = __webpack_require__(19);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__store___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__store__);\nvar __extends = (this && this.__extends) || (function () {\r\n var extendStatics = Object.setPrototypeOf ||\r\n ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\r\n function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\r\n return function (d, b) {\r\n extendStatics(d, b);\r\n function __() { this.constructor = d; }\r\n d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\r\n };\r\n})();\r\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\r\n var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\r\n if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\r\n else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\r\n return c > 3 && r && Object.defineProperty(target, key, r), r;\r\n};\r\n\r\n\r\n\r\nvar TestStatus = /** @class */ (function (_super) {\r\n __extends(TestStatus, _super);\r\n function TestStatus() {\r\n return _super !== null && _super.apply(this, arguments) || this;\r\n }\r\n TestStatus.prototype.addProcess = function () {\r\n // processModelActions.addProcess(this.$store, {});\r\n };\r\n TestStatus.prototype.removeProcess = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"processModelActions\"].removeAllProcess(this.$store);\r\n };\r\n TestStatus.prototype.removeAlarms = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"alarmsModelActions\"].removeAllAlarms(this.$store);\r\n };\r\n TestStatus.prototype.addService = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"alarmsModelActions\"].addServiceAlarm(this.$store, { message: \"Lorem Ipsum dolor sit amen ... \", dateTime: new Date() });\r\n };\r\n TestStatus = __decorate([\r\n __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default()({})\r\n ], TestStatus);\r\n return TestStatus;\r\n}(__WEBPACK_IMPORTED_MODULE_0_vue__[\"default\"]));\r\n/* harmony default export */ __webpack_exports__[\"a\"] = (TestStatus);\r\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkzLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvdGVzdC1zdGF0dXMudHM/YzBhNiJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgVnVlIGZyb20gXCJ2dWVcIjtcbmltcG9ydCBDb21wb25lbnQgZnJvbSBcInZ1ZS1jbGFzcy1jb21wb25lbnRcIjtcblxuaW1wb3J0IHtcbiAgbWFjaGluZVN0YXR1c0FjdGlvbnMsXG4gIE1hY2hpbmVTdGF0dXNNb2RlbCxcbiAgYWxhcm1zTW9kZWxBY3Rpb25zLFxuICBwcm9jZXNzTW9kZWxBY3Rpb25zXG59IGZyb20gXCIuLi9zdG9yZVwiO1xuXG5AQ29tcG9uZW50KHt9KVxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgVGVzdFN0YXR1cyBleHRlbmRzIFZ1ZSB7XG5cblxuICBhZGRQcm9jZXNzKCkge1xuICAgIC8vIHByb2Nlc3NNb2RlbEFjdGlvbnMuYWRkUHJvY2Vzcyh0aGlzLiRzdG9yZSwge30pO1xuICB9XG4gIHJlbW92ZVByb2Nlc3MoKSB7XG4gICAgcHJvY2Vzc01vZGVsQWN0aW9ucy5yZW1vdmVBbGxQcm9jZXNzKHRoaXMuJHN0b3JlKTtcbiAgfVxuXG4gIHJlbW92ZUFsYXJtcygpIHtcbiAgICBhbGFybXNNb2RlbEFjdGlvbnMucmVtb3ZlQWxsQWxhcm1zKHRoaXMuJHN0b3JlKTtcbiAgfVxuICBhZGRTZXJ2aWNlKCkge1xuICAgIGFsYXJtc01vZGVsQWN0aW9ucy5hZGRTZXJ2aWNlQWxhcm0odGhpcy4kc3RvcmUsIHsgIG1lc3NhZ2U6IFwiTG9yZW0gSXBzdW0gZG9sb3Igc2l0IGFtZW4gLi4uIFwiLCBkYXRlVGltZTogbmV3IERhdGUoKX0gYXMgYW55KTtcbiAgfVxufVxuXG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvY29tcG9uZW50cy90ZXN0LXN0YXR1cy50cyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFDQTtBQUVBO0FBUUE7QUFBQTtBQUFBOztBQWdCQTtBQWJBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQWZBO0FBREE7QUFDQTtBQWdCQTtBQUFBO0FBaEJBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///593\n");
=======
eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_vue__ = __webpack_require__(10);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component__ = __webpack_require__(36);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_vue_class_component__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__store__ = __webpack_require__(19);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__store___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__store__);\nvar __extends = (this && this.__extends) || (function () {\r\n var extendStatics = Object.setPrototypeOf ||\r\n ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\r\n function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\r\n return function (d, b) {\r\n extendStatics(d, b);\r\n function __() { this.constructor = d; }\r\n d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\r\n };\r\n})();\r\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\r\n var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\r\n if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\r\n else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\r\n return c > 3 && r && Object.defineProperty(target, key, r), r;\r\n};\r\n\r\n\r\n\r\nvar TestStatus = /** @class */ (function (_super) {\r\n __extends(TestStatus, _super);\r\n function TestStatus() {\r\n return _super !== null && _super.apply(this, arguments) || this;\r\n }\r\n TestStatus.prototype.addProcess = function () {\r\n // processModelActions.addProcess(this.$store, {});\r\n };\r\n TestStatus.prototype.removeProcess = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"processModelActions\"].removeAllProcess(this.$store);\r\n };\r\n TestStatus.prototype.removeAlarms = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"alarmsModelActions\"].removeAllAlarms(this.$store);\r\n };\r\n TestStatus.prototype.addService = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"alarmsModelActions\"].addServiceAlarm(this.$store, { message: \"Lorem Ipsum dolor sit amen ... \", dateTime: new Date() });\r\n };\r\n TestStatus = __decorate([\r\n __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default()({})\r\n ], TestStatus);\r\n return TestStatus;\r\n}(__WEBPACK_IMPORTED_MODULE_0_vue__[\"default\"]));\r\n/* harmony default export */ __webpack_exports__[\"a\"] = (TestStatus);\r\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkzLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvdGVzdC1zdGF0dXMudHM/YzBhNiJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgVnVlIGZyb20gXCJ2dWVcIjtcclxuaW1wb3J0IENvbXBvbmVudCBmcm9tIFwidnVlLWNsYXNzLWNvbXBvbmVudFwiO1xyXG5cclxuaW1wb3J0IHtcclxuICBtYWNoaW5lU3RhdHVzQWN0aW9ucyxcclxuICBNYWNoaW5lU3RhdHVzTW9kZWwsXHJcbiAgYWxhcm1zTW9kZWxBY3Rpb25zLFxyXG4gIHByb2Nlc3NNb2RlbEFjdGlvbnNcclxufSBmcm9tIFwiLi4vc3RvcmVcIjtcclxuXHJcbkBDb21wb25lbnQoe30pXHJcbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFRlc3RTdGF0dXMgZXh0ZW5kcyBWdWUge1xyXG5cclxuXHJcbiAgYWRkUHJvY2VzcygpIHtcclxuICAgIC8vIHByb2Nlc3NNb2RlbEFjdGlvbnMuYWRkUHJvY2Vzcyh0aGlzLiRzdG9yZSwge30pO1xyXG4gIH1cclxuICByZW1vdmVQcm9jZXNzKCkge1xyXG4gICAgcHJvY2Vzc01vZGVsQWN0aW9ucy5yZW1vdmVBbGxQcm9jZXNzKHRoaXMuJHN0b3JlKTtcclxuICB9XHJcblxyXG4gIHJlbW92ZUFsYXJtcygpIHtcclxuICAgIGFsYXJtc01vZGVsQWN0aW9ucy5yZW1vdmVBbGxBbGFybXModGhpcy4kc3RvcmUpO1xyXG4gIH1cclxuICBhZGRTZXJ2aWNlKCkge1xyXG4gICAgYWxhcm1zTW9kZWxBY3Rpb25zLmFkZFNlcnZpY2VBbGFybSh0aGlzLiRzdG9yZSwgeyAgbWVzc2FnZTogXCJMb3JlbSBJcHN1bSBkb2xvciBzaXQgYW1lbiAuLi4gXCIsIGRhdGVUaW1lOiBuZXcgRGF0ZSgpfSBhcyBhbnkpO1xyXG4gIH1cclxufVxyXG5cclxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIC4vc3JjL2NvbXBvbmVudHMvdGVzdC1zdGF0dXMudHMiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQ0E7QUFFQTtBQVFBO0FBQUE7QUFBQTs7QUFnQkE7QUFiQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFmQTtBQURBO0FBQ0E7QUFnQkE7QUFBQTtBQWhCQTsiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///593\n");
>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b
/***/ }),
Step/wwwroot/dist/4.build.js
Vendored
+4
View File
@@ -12,7 +12,11 @@ eval("Object.defineProperty(__webpack_exports__, \"__esModule\", { value: true }
/***/ (function(module, exports, __webpack_require__) {
"use strict";
<<<<<<< HEAD
eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n components: { loader: _baseComponents.Loader }\n\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg3LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtbG9hZGVyLnZ1ZT8yOGU1Il0sInNvdXJjZXNDb250ZW50IjpbIjx0ZW1wbGF0ZT5cbiAgPGRpdj5cbiAgICA8bG9hZGVyIHRpdGxlPVwiQXR0ZW5kZXJlIHByZWdvXCIgbWVzc2FnZT1cIkF6emVyYW1lbnRvIGFzc2kgLi4uLlwiIDpwZXJjZW50PVwiNTBcIiA6aXNWaXNpYmxlPVwidHJ1ZVwiPjwvbG9hZGVyPlxuICA8L2Rpdj5cbjwvdGVtcGxhdGU+XG48c2NyaXB0PlxuaW1wb3J0IHsgTG9hZGVyIH0gZnJvbSBcIi4uL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XG5leHBvcnQgZGVmYXVsdCB7XG4gIGNvbXBvbmVudHM6eyBsb2FkZXI6IExvYWRlcn1cblxufVxuPC9zY3JpcHQ+XG5cblxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHRlc3QtbG9hZGVyLnZ1ZT82ZDdhNjYwNiJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBTUE7QUFDQTs7QUFHQTtBQUNBO0FBSEE7Ozs7QSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///587\n");
=======
eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n components: { loader: _baseComponents.Loader }\n\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg3LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtbG9hZGVyLnZ1ZT8xY2RhIl0sInNvdXJjZXNDb250ZW50IjpbIjx0ZW1wbGF0ZT5cclxuICA8ZGl2PlxyXG4gICAgPGxvYWRlciB0aXRsZT1cIkF0dGVuZGVyZSBwcmVnb1wiIG1lc3NhZ2U9XCJBenplcmFtZW50byBhc3NpIC4uLi5cIiA6cGVyY2VudD1cIjUwXCIgOmlzVmlzaWJsZT1cInRydWVcIj48L2xvYWRlcj5cclxuICA8L2Rpdj5cclxuPC90ZW1wbGF0ZT5cclxuPHNjcmlwdD5cclxuaW1wb3J0IHsgTG9hZGVyIH0gZnJvbSBcIi4uL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XHJcbmV4cG9ydCBkZWZhdWx0IHtcclxuICBjb21wb25lbnRzOnsgbG9hZGVyOiBMb2FkZXJ9XHJcblxyXG59XHJcbjwvc2NyaXB0PlxyXG5cclxuXHJcblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyB0ZXN0LWxvYWRlci52dWU/MjQ1ZGQ1MjMiXSwibWFwcGluZ3MiOiI7Ozs7OztBQU1BO0FBQ0E7O0FBR0E7QUFDQTtBQUhBOzs7O0EiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///587\n");
>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b
/***/ }),
Step/wwwroot/dist/build.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Step/wwwroot/src/services/hub.ts
+1 -1
View File
@@ -58,7 +58,7 @@ export class Hub {
this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged;
this._hub.client.ncSoftKeys = Hub.userSoftKeyChanged;
this._hub.client.heads = Hub.headsDataChanged;
this._hub.client.headsData = Hub.headsDataChanged;
this._hub.client.logout = this.logout;