Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx

src/views/sampleDatabase/fault/index.vue

@@ -109,7 +109,7 @@
             :on-success="onSuccess"
             :on-error="onError"
             :before-upload="beforeUpload"
-            action="http://192.168.1.18:9002/case/upload/file"
+            action="http://192.168.10.5:9002/case/upload/file"
             accept=".xls,.xlsx"
           >
             <button class="btn" @click="importFile">
@@ -417,8 +417,8 @@ export default {
       gzCgdData: [], //传感点参数
       category: "0", //模型分类
       categorys: [
-        { label: "检修样本", value: "0" },
-        { label: "DBSCAN样本", value: "1" },
+        { label: "故障样本", value: "0" },
+        { label: "DBSCAN样本", value: "3" },
       ],
       st: "",
       widgetArr: [],
@@ -527,7 +527,7 @@ export default {
             is_light: false,
             width: "200px",
             template: () => {
-              return "<el-button type='text' style='cursor: pointer;' value='config' data-callback='onClickOption'>传感点</el-button><el-button type='text' style='cursor: pointer;margin:0 10px;' value='config' data-callback='edit'>编辑</el-button><el-button type='text' style='cursor: pointer;' value='config' data-callback='delete'>删除</el-button>";
+              return "<el-button type='text' style='cursor: pointer;' value='config' data-callback='onClickOption'>传感点</el-button><el-button type='text' style='margin:0 10px;cursor: pointer;' value='config' data-callback='delete'>删除</el-button>";
             },
             click(e, row) {
               const fnName = e.target.getAttribute("data-callback");
@@ -588,7 +588,7 @@ export default {
 
       await that.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.1.18:9002/",
+        baseURL: "http://192.168.10.5: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.1.18:9002/",
+        baseURL: "http://192.168.10.5: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.1.18:9002/",
+          baseURL: "http://192.168.10.5: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.1.18:9002/",
+        baseURL: "http://192.168.10.5: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.1.18:9002/",
+              baseURL: "http://192.168.10.5: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.1.18:9002/case/fault/${
+            url: `http://192.168.10.5:9002/case/fault/${
               that.addDialogTitle === "新增" ? "insert" : "edit"
             }`,
             data: that.addDialogTitle === "新增" ? [data] : data,
@@ -1005,7 +1005,7 @@ export default {
     },
     downloadTemplate() {
       window.open(
-        "http://192.168.1.18:9002/case/download/template?template=fault"
+        "http://192.168.10.5:9002/case/download/template?template=fault"
       );
     },
   },

src/views/sampleDatabase/fault/point.vue

@@ -59,8 +59,7 @@
         :list="Powertrend"
         :yAxises="PowertrendYAxises"
         :showLegend="true"
-        :markLineData="markLineData"
-      />
+        :markLineData="markLineData"/>
     </el-col>
   </el-row>
 </template>
@@ -116,15 +115,7 @@ export default {
         {
           value: "1800",
           label: "三十分钟",
-        },
-        {
-          value: "3600",
-          label: "一小时",
-        },
-        {
-          value: "86400",
-          label: "一天",
-        },
+        }
       ],
       time: [that.st - 3600 * 1000 * 24, that.st + 1000 * 10 * 60],
       point: [],

src/views/sampleDatabase/warning/index.vue

@@ -180,11 +180,7 @@ export default {
         {
           value: "3600",
           label: "一小时",
-        },
-        {
-          value: "86400",
-          label: "一天",
-        },
+        }
       ],
       yssjDialog: false,
       yssjData: {},