合并冲突

src/views/MalfunctionWarning/components/superviseDataClassify.vue

@@ -245,6 +245,8 @@ export default {
         },
       ],
       timeList: [
+        { label: "0.1小时", value: 0.1 },
+        { label: "0.5小时", value: 0.5 },
         { label: "1小时", value: 1 },
         { label: "1.5小时", value: 1.5 },
         { label: "2小时", value: 2 },
@@ -345,7 +347,8 @@ export default {
         }
         let datas = {};
         datas.startTs =
-          new Date(item.starttime).getTime() - this.intervalValue * 3600000 / 6;
+          new Date(item.starttime).getTime() -
+          (this.intervalValue * 3600000) / 6;
         datas.endTs = new Date(item.starttime).getTime();
         datas.thingId = item.windturbineid;
         datas.modelId = model;
@@ -365,11 +368,9 @@ export default {
       params.algorithm = algorithm;
       params.dataInfos = dataInfos;
 
-      console.log(123123, params);
-
       axios({
         method: "post",
-        url: "http://10.155.32.14:9090/api/supervised/execute",
+        url: "http://10.155.32.14:9002/api/supervised/execute",
         // url: "http://192.168.10.21:8080/api/supervised/execute",
         data: params,
         header: {

src/views/MalfunctionWarning/diagnose.vue

@@ -268,7 +268,7 @@
 				let that = this;
 				that.API.requestData({ //风机
 					method: "GET",
-					baseURL: "http://10.155.32.14:9090/",
+					baseURL: "http://10.155.32.14:9002/",
 					subUrl: "api/gearbox-diagnosis/history",
 					success(res) {
 						let cc = [],
@@ -290,7 +290,7 @@
 				let that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL: "http://10.155.32.14:9090/",
+					baseURL: "http://10.155.32.14:9002/",
 					subUrl: "api/gearbox-diagnosis/history/remove",
 					data: {
 						names: val,

src/views/MalfunctionWarning/supervised.vue

@@ -369,7 +369,7 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.1.18:9002/know/fault/type/all",
+        subUrl: "http://10.155.32.14:9002/know/fault/type/all",
         success(res) {
           if (res) {
             that.faultLists = res.data;
@@ -382,7 +382,7 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        baseURL: "http://10.155.32.14:9090/",
+        baseURL: "http://10.155.32.14:9002/",
         subUrl: "api/coordinate/algorithm",
         data: {
           type: 1,
@@ -433,7 +433,7 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.1.18:9002/case/fault/list",
+        subUrl: "http://10.155.32.14:9002/case/fault/list",
         data: {
           station: this.selectValue,
           model: this.selectMoudle,
@@ -479,7 +479,7 @@ export default {
       that.resultList = [];
       this.API.requestData({
         method: "GET",
-        baseURL: "http://10.155.32.14:9090/",
+        baseURL: "http://10.155.32.14:9002/",
         subUrl: "api/supervised/",
         success(res) {
           if (res.value.length > 0) {
@@ -500,7 +500,7 @@ export default {
       });
       this.API.requestData({
         method: "GET",
-        baseURL: "http://10.155.32.14:9090/",
+        baseURL: "http://10.155.32.14:9002/",
         subUrl: "api/supervised/progress",
         success(res) {
           that.showTraining = true;

src/views/sampleDatabase/fault/index.vue

@@ -109,7 +109,7 @@
             :on-success="onSuccess"
             :on-error="onError"
             :before-upload="beforeUpload"
-            action="http://192.168.10.5:9002/case/upload/file"
+            action="http://192.168.1.18:9002/case/upload/file"
             accept=".xls,.xlsx"
           >
             <button class="btn" @click="importFile">
@@ -588,7 +588,7 @@ export default {
 
       await that.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.5:9002/",
+        baseURL: "http://192.168.1.18:9002/",
         subUrl: "/know/fault/type/all",
         success(res) {
           let widgetArr = [],
@@ -607,7 +607,7 @@ export default {
 
       await that.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.5:9002/",
+        baseURL: "http://192.168.1.18:9002/",
         subUrl: "basic/station/all",
         success(res) {
           that.ChangZhan = res.data;
@@ -643,7 +643,7 @@ export default {
         //传感点
         that.API.requestData({
           method: "GET",
-          baseURL: "http://192.168.10.5:9002/",
+          baseURL: "http://192.168.1.18:9002/",
           subUrl: "point/list",
           data: {
             wtId: row.wtId,
@@ -741,7 +741,7 @@ export default {
       that.API.requestData({
         showLoading: true,
         method: "GET",
-        baseURL: "http://192.168.10.5:9002/",
+        baseURL: "http://192.168.1.18:9002/",
         subUrl: "case/fault/list",
         data: {
           widget: widget ? widget : that.widget,
@@ -826,7 +826,7 @@ export default {
           if (action === "confirm") {
             that.API.requestData({
               method: "GET",
-              baseURL: "http://192.168.10.5:9002/",
+              baseURL: "http://192.168.1.18:9002/",
               subUrl: "case/fault/delete",
               data: {
                 id: row.id,
@@ -942,7 +942,7 @@ export default {
           data.time && delete data.time;
           axios({
             method: "post",
-            url: `http://192.168.10.5:9002/case/fault/${
+            url: `http://192.168.1.18:9002/case/fault/${
               that.addDialogTitle === "新增" ? "insert" : "edit"
             }`,
             data: that.addDialogTitle === "新增" ? [data] : data,
@@ -1005,7 +1005,7 @@ export default {
     },
     downloadTemplate() {
       window.open(
-        "http://192.168.10.5:9002/case/download/template?template=fault"
+        "http://192.168.1.18:9002/case/download/template?template=fault"
       );
     },
   },

src/views/sampleDatabase/knowledgeBase/index.vue

@@ -18,7 +18,7 @@
                 v-for="item in faultList"
                 :key="item.code"
                 :value="item.code"
-                :label="item.widget"
+                :label="item.name"
               />
             </el-select>
           </div>
@@ -87,6 +87,20 @@
             width="200"
             align="center"
           ></el-table-column>
+          <el-table-column align="center">
+            <template #default="scope">
+            <el-button
+              size="small"
+              type="text"
+              @click="handleEdit(scope.$index, scope.row)"
+            >编辑</el-button>
+            <el-button
+              size="small"
+              type="text"
+              @click="handleDelete(scope.$index, scope.row)"
+            >删除</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </el-col>
     </el-row>
@@ -110,7 +124,7 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.1.18:9002/know/fault/fix/widget",
+        subUrl: "http://192.168.10.5:9002/know/fault/type/all",
         success(res) {
           if (res) {
             that.faultList = res?.data;
@@ -124,7 +138,7 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.1.18:9002/know/fault/fix/all",
+        subUrl: "http://192.168.10.5:9002/know/fault/fix/all",
         data:{
           faultCode: that.faultmodel
         },

src/views/sampleDatabase/totalCurve/dataDispose.vue

@@ -334,7 +334,7 @@ export default {
       const that = this;
       axios({
         method: "post",
-        url: "http://192.168.10.5:9002/scatter/preprocess",
+        url: "http://192.168.1.18:9002/scatter/preprocess",
         data,
         header: {
           "Content-Type": "application/json",
@@ -354,7 +354,7 @@ export default {
       const that = this;
       that.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.5:9002/",
+        baseURL: "http://192.168.1.18:9002/",
         subUrl: "powercurve/tree",
         success(res) {
           that.treeData = that.addLabelToTreeData(res.data);
@@ -434,7 +434,7 @@ export default {
       const that = this;
       that.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.5:9002/",
+        baseURL: "http://192.168.1.18:9002/",
         subUrl: "powercurve/list",
         showLoading: true,
         data: {