Merge branch 'dev' of https://cloud.wodcloud.com/git/smart-operation/so-manage-ui into dev

src/components/login-by-account.vue

@@ -120,9 +120,7 @@ const login = () => {
         ElMessage.error(data.data);
       }
     })
-    .catch((error) => {
-      console.log(error);
-    });
+    .catch((error) => {});
 };
 const getUserInfo = () => {
   return axios.get(`/v1/api/user/getUserInfo`);

src/page/main/authority/organization/directory-form.vue

@@ -77,7 +77,7 @@ const treeProps = {
   disabled: "disabled",
 };
 const getOrgTree = () => {
-  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+  axios.get(`/v1/api/org/tree`).then((res) => {
     if (res.data.code == 200) {
       const orgDataTemp = res.data.data || [];
       orgDataTemp.shift();

src/page/main/authority/organization/org-detail/index.vue

@@ -149,7 +149,7 @@ const formatFile = (url) => {
 
 const getDetail = () => {
   axios
-    .get(`/apaas/system/v5/org/detail?organization_id=${route.query.id}&key_word=&state=&limit=&page=&data_type=1`)
+    .get(`/v1/api/org/detail?organization_id=${route.query.id}&key_word=&state=&limit=&page=&data_type=1`)
     .then((res) => {
       if (res.data.code == 200) {
         const detail = res.data.data.org_info;

src/page/main/authority/organization/org-form.vue

@@ -22,16 +22,6 @@
     <el-form-item label="组织介绍" prop="description">
       <el-input type="textarea" :rows="3" v-model="orgForm.description" maxlength="300" show-word-limit />
     </el-form-item>
-    <el-form-item label="组织附件" prop="logo">
-      <bg-upload
-        v-model="orgForm.attachment"
-        customTips
-        :limit="3"
-        :fileTypes="['zip', 'rar', 'doc', 'docx', 'xlsx', 'xls', 'png', 'jpg']"
-        :otherInfo="'最多可上传三个附件，可上传zip，rar，doc，docx，xlsx，xls，png，jpg，可上传营业执照和相关协议文件等'">
-        <span>将文件拖到此处，或 点击上传</span>
-      </bg-upload>
-    </el-form-item>
   </el-form>
 </template>
 
@@ -51,7 +41,6 @@ const orgForm = reactive({
   name: "",
   organization_code: "",
   description: "",
-  attachment: [],
 });
 
 const checkCode = (rule, value, callback) => {
@@ -115,7 +104,7 @@ const treeProps = {
   disabled: "disabled",
 };
 const getOrgTree = () => {
-  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+  axios.get(`/v1/api/org/tree`).then((res) => {
     if (res.data.code == 200) {
       const orgDataTemp = res.data.data || [];
       orgDataTemp.shift();

src/page/main/authority/organization/org-user/org-account-form.vue

@@ -198,7 +198,7 @@ const treeProps = {
   value: "organization_id",
 };
 const getOrgTree = () => {
-  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+  axios.get(`/v1/api/org/tree`).then((res) => {
     if (res.data.code == 200) {
       orgData.value = res.data.data || [];
     } else {

src/page/main/authority/organization/platform-user/index.vue

@@ -211,7 +211,7 @@ const cancel = () => {
 };
 
 const getOrgTree = () => {
-  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+  axios.get(`/v1/api/org/tree`).then((res) => {
     if (res.data.code == 200) {
       orgId.value = res.data.data[0].organization_id;
     } else {

src/page/main/authority/organization/tree.vue

@@ -20,10 +20,7 @@
           @click.stop="showAction($event, data, node)">
           <bg-icon class="tree-more" icon="#bg-ic-s-more"></bg-icon>
         </span>
-        <span
-          v-else
-          class="tree-action-box"
-          @click.stop="showAction($event, data, node)">
+        <span v-else class="tree-action-box" @click.stop="showAction($event, data, node)">
           <bg-icon class="tree-more" icon="#bg-ic-s-more"></bg-icon>
         </span>
       </div>
@@ -141,8 +138,8 @@
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, computed, onBeforeMount, onBeforeUnmount, watch, nextTick } from "vue";
-import { useRoute, useRouter } from "vue-router";
+import { ref, onBeforeMount, onBeforeUnmount, nextTick } from "vue";
+import { useRoute } from "vue-router";
 import axios from "@/request/http.js";
 import { ElMessage } from "element-plus";
 const route = useRoute();
@@ -174,10 +171,9 @@ const defaultProps = {
 };
 
 const getOrgTree = (data) => {
-  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+  axios.get(`/v1/api/org/tree`).then((res) => {
     if (res.data.code == 200) {
       orgData.value = res.data.data || [];
-      console.log(route.query.id);
       if (route.query.id) {
         searchItem(orgData.value, route.query.id);
         data = selectNodeObj.value;

src/page/main/forewarning/indicator-config/edit/index.vue

@@ -29,7 +29,9 @@ const add_form = ref(null);
 const SaveSubmit = async () => {
   let res = await add_form.value.Submit();
   if (!res) return;
-  Save(res, { id, class_id });
+  Save(res, { id, class_id }, () => {
+    Cancle();
+  });
 };
 const Cancle = () => {
   router.go(-1);
@@ -43,7 +45,6 @@ const getInfoData = () => {
     })
     .then((res) => {
       if (res.data.code == 200) {
-        console.log(res.data.data);
         let res_d = res.data.data;
         infoData.value = {
           name: res_d.metric_name,

src/page/main/forewarning/indicator-config/modules/interface.js

@@ -2,7 +2,7 @@ import { ElMessage } from "element-plus";
 import axios from "@/request/http.js";
 const setParams = (res, { id, class_id }) => {
     let params = {
-        class_id,
+        class_id: +class_id,
         metric_name: res.name,
         expr: res.indicator_expression,
         alert_range: res.warningScopeRows.map((e) => {

src/page/main/forewarning/list/index.vue

@@ -155,26 +155,24 @@
       v-model="closeWarningDialog"
       width="400px"
       :before-close="cancelCloseWarningDialog">
-      <div style="padding-top: 20px">
-        <el-form ref="closeForm" :model="closeFormData" :rules="closeRules" label-width="80px" class="bg_form">
-          <el-form-item label="关闭备注" prop="close_notes">
-            <el-input
-              v-model="closeFormData.close_notes"
-              type="textarea"
-              :autosize="{ minRows: 2 }"
-              show-word-limit
-              maxlength="30"
-              resize="vertical"
-              placeholder="请输入内容"></el-input>
-          </el-form-item>
-          <el-form-item label="" class="no-el-label" prop="close_remind" style="margin-bottom: 0px">
-            <el-checkbox v-model="closeFormData.close_remind">
-              <div>三天内将不再自动推送该告警信息给处置人员，</div>
-              <div>可手动推送，但告警数据依然会出现</div>
-            </el-checkbox>
-          </el-form-item>
-        </el-form>
-      </div>
+      <el-form ref="closeForm" :model="closeFormData" :rules="closeRules" label-width="80px" class="bg_form">
+        <el-form-item label="关闭备注" prop="close_notes">
+          <el-input
+            v-model="closeFormData.close_notes"
+            type="textarea"
+            :autosize="{ minRows: 2 }"
+            show-word-limit
+            maxlength="30"
+            resize="vertical"
+            placeholder="请输入内容"></el-input>
+        </el-form-item>
+        <el-form-item label="" class="no-el-label" prop="close_remind" style="margin-bottom: 0px">
+          <el-checkbox v-model="closeFormData.close_remind">
+            <div>三天内将不再自动推送该告警信息给处置人员，</div>
+            <div>可手动推送，但告警数据依然会出现</div>
+          </el-checkbox>
+        </el-form-item>
+      </el-form>
       <template v-slot:footer>
         <div class="apaas_button">
           <el-button type="default" @click="cancelCloseWarningDialog">取消</el-button>