7.10暂存

src/App.vue

@@ -6,8 +6,6 @@
   </div>
 </template>
 <script>
-import { login } from "@/api/login";
-import { testApi } from "@/api/test";
 // import "@/assets/style/index.css";
 
 export default {
@@ -18,26 +16,7 @@ export default {
       return this.$store.state.settings.loading;
     },
   },
-  methods: {
-    // 调取后端api方法
-    addLog() {
-      const data = {
-        userName: "测试1",
-        password: "1111",
-      };
-      login(data).then((res) => {});
-    },
-    // 调取后端api方法
-    test(id) {
-      const data = {
-        userName: "测试2",
-        password: "1111",
-      };
-      testApi(data, id).then((res) => {
-        console.log(res);
-      });
-    },
-  },
+  methods: {},
 };
 </script>
 <style lang="scss">

src/components/HeaderCom.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="header">
     <div class="header-logo">
-<!-- 
+      <!-- 
       <img src="@/assets/logo.png" slot="reference" />
       <h2 class="conversion">中能智能</h2> -->
     </div>
@@ -77,7 +77,6 @@ export default {
   watch: {
     "$store.state.themes.theme": {
       handler(newTheme) {
-        // console.log(newTheme, "newTheme");
         this.currentTheme = newTheme;
       },
       immediate: true,

src/components/IconSelect/index.vue

@@ -60,7 +60,6 @@ export default {
       document.body.click(); // 隐藏 Popover
     },
     reset() {
-      console.log("reset");
       this.name = "";
       this.iconList = icons;
     },

src/router/index.js

@@ -70,7 +70,6 @@ export function resetRouter() {
   router.matcher = newRouter.matcher; // reset router
 }
 router.beforeEach((to, from, next) => {
-  console.log(to, "to");
   if (to.matched.length === 0) {
     return next("/login");
   } else {

src/store/auth.js

@@ -55,7 +55,7 @@ export default {
         // 清空原有的动态子路由
         homeRoute.children = originalChildren;
         const { authRouterList, anthBtnList } = getAuthRouterFn(resultRouter);
-        console.log();
+
         commit("SET_AUTHBTNLIST", anthBtnList);
         commit("SET_DYNAMIC_ROUTER", authRouterList);
         authRouterList.forEach((item) => {
@@ -65,7 +65,6 @@ export default {
         // 重新添加home路由
         router.addRoute(homeRoute);
       }
-      // console.log("/homeRoute", homeRoute, router.getRoutes());
       // 添加404页面路由
       router.addRoute({
         path: "/:pathMatch(.*)*",

src/store/breadStore.js

@@ -2,36 +2,34 @@ export default {
   namespaced: true, //子模块一定要开启命名空间
   state: {
     breadcrumbList: [],
-    currentUrl: ''
+    currentUrl: "",
   },
   mutations: {
     //面包屑
     ADD_BREAD(state, obj) {
-      // console.log(state, obj)
-      localStorage.setItem('breadcrumbList', JSON.stringify(obj))
-      const result = JSON.parse(localStorage.getItem('breadcrumbList')) || []
-      state.breadcrumbList = result
+      localStorage.setItem("breadcrumbList", JSON.stringify(obj));
+      const result = JSON.parse(localStorage.getItem("breadcrumbList")) || [];
+      state.breadcrumbList = result;
     },
     EDIT_BREAD(state, obj) {
-      console.log(state, obj)
-      localStorage.setItem('currentUrl', JSON.stringify(obj))
-      const result = JSON.parse(localStorage.getItem('currentUrl')) || []
-      state.currentUrl = result
-    }
+      localStorage.setItem("currentUrl", JSON.stringify(obj));
+      const result = JSON.parse(localStorage.getItem("currentUrl")) || [];
+      state.currentUrl = result;
+    },
   },
   actions: {
     getUserMessage(context, obj) {
       //obj为对象
       if (obj.code == 200) {
         //提交ADD_DATA
-        context.commit('ADD_BREAD', obj)
+        context.commit("ADD_BREAD", obj);
       } else {
-        console.log('error')
+        console.log("error");
       }
-    }
+    },
   },
   getters: {
     // state的计算属性，监听state的变化时对state里的数据进行加工
     //如果其他组件都需要相同的函数，就可以把函数写到这里面
-  }
-}
+  },
+};

src/utils/getMenu.js

@@ -29,7 +29,6 @@ export const checkListFn = (data) => {
 //角色菜单权限筛选
 export const getcheckListFn = (checkIdList, data) => {
   let list = [];
-  console.log(checkIdList, "checkIdList");
   function recursiveFind(node, ancestors = []) {
     if (checkIdList.includes(node.permissionId)) {
       // 将当前节点的 permissionId 加入到列表中

src/views/dataAdministration/index.vue

@@ -38,7 +38,13 @@
     </div>
     <div class="list-page">
       <div class="newly">
-        <el-button type="primary" @click="addData" size="small">新增</el-button>
+        <el-button
+          v-hasPermi="['dataManage:dataAdministration:add']"
+          type="primary"
+          @click="addData"
+          size="small"
+          >新增</el-button
+        >
       </div>
       <el-table
         class="center-align-table"
@@ -160,6 +166,7 @@
                 (scope.row.transferAddr !== null ||
                   scope.row.transferAddr !== '')
               "
+              v-hasPermi="['dataManage:dataAdministration:edit']"
               @click="handleEdit(scope.row)"
               type="text"
               size="small"
@@ -177,6 +184,7 @@
                 (scope.row.transferAddr === null ||
                   scope.row.transferAddr === '')
               "
+              v-hasPermi="['dataManage:dataAdministration:editState']"
               @click="editTransferState(scope.row, '转换')"
               type="text"
               size="small"
@@ -187,6 +195,7 @@
               @click="editTransferState(scope.row, '重新转换')"
               type="text"
               size="small"
+              v-hasPermi="['dataManage:dataAdministration:editState']"
               :disabled="scope.row.transferState == 0"
               >重新转换</el-button
             >
@@ -662,7 +671,6 @@ export default {
     },
     //转换\重新转换
     editTransferState(row, title) {
-      console.log(row, "row");
       this.editTransferStateForm.timeGranularity = row.timeGranularity;
       this.editTransferStateForm.dataTransferTypePath = row.transferAddr
         ? row.transferAddr
@@ -680,7 +688,6 @@ export default {
       this.newEditForm.batchCode = row.batchCode;
       this.newEditForm.batchName = row.batchName;
       this.newEditForm.dataTransferTypePathDtoList[0] = { ...row };
-      console.log(this.newEditForm.dataTransferTypePathDtoList[0], "编辑");
     },
     editCancel() {
       this.newform = {
@@ -712,7 +719,6 @@ export default {
               this.editCancel();
             })
             .catch((error) => {
-              console.log("shibai", error);
               this.loadingViewEdit = false;
             });
         } else {

src/views/home/Index.vue

@@ -39,12 +39,9 @@ export default {
     };
   },
   mounted() {},
-  created() {
-    console.log("MenuTag");
-  },
+  created() {},
   methods: {
     setLoding(state) {
-      console.log(state);
       this.loading = state;
     },
   },

src/views/performance/assetssDetail.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:25:45
- * @LastEditTime: 2024-07-01 15:04:16
+ * @LastEditTime: 2024-07-09 15:37:46
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/assetssDetail.vue
@@ -104,7 +104,7 @@
               width="100%"
               height="100%"
             ></iframe>
-            <img
+            <!-- <img
               v-if="getFileType(file.fileAddr) === 'image'"
               alt="加载图片"
               @load="imageLoad(index)"
@@ -113,8 +113,8 @@
                 src: file.fileAddr,
                 errorImageSrc: require('../../assets/img/loadingErrorFx.webp'),
               }"
-            />
-            <el-skeleton
+            /> -->
+            <!-- <el-skeleton
               v-if="loadings[index] && getFileType(file.fileAddr) === 'image'"
               animated
               style="width: 100%; height: 100%"
@@ -126,7 +126,7 @@
                   style="width: 100%; height: 100%"
                 />
               </template>
-            </el-skeleton>
+            </el-skeleton> -->
           </el-col>
         </el-row>
       </el-card>
@@ -157,7 +157,7 @@
               height="100%"
               @load="iframeLoad(index + generalFiles.length)"
             ></iframe>
-            <img
+            <!-- <img
               v-if="getFileType(file.fileAddr) === 'image'"
               alt="加载图片"
               @load="imageLoad(index + generalFiles.length)"
@@ -166,8 +166,8 @@
                 src: file.fileAddr,
                 errorImageSrc: require('../../assets/img/loadingErrorFx.webp'),
               }"
-            />
-            <el-skeleton
+            /> -->
+            <!-- <el-skeleton
               v-if="
                 loadings[index + generalFiles.length] &&
                 getFileType(file.fileAddr) === 'image'
@@ -182,7 +182,7 @@
                   style="width: 100%; height: 100%"
                 />
               </template>
-            </el-skeleton>
+            </el-skeleton> -->
           </el-col>
         </el-row>
       </el-card>
@@ -254,7 +254,6 @@ export default {
     async fileAddrFn(file) {
       try {
         const res = await axios.get(file);
-        console.log(res, file, "res成功");
         this.fileCheckResult = true;
         return true;
       } catch (e) {
@@ -357,7 +356,6 @@ export default {
     getFileType(url) {
       // 使用 URL 对象解析 URL
       // 获取路径名部分
-      console.log(url.split("/"), 'url.split("/")');
       let pathname = url.split("/").pop();
       // 截取路径名，去除加密乱码字符部分
       const index = pathname.indexOf(".html");

src/views/performance/components/EditAnalysis.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:14:23
- * @LastEditTime: 2024-07-01 15:56:26
+ * @LastEditTime: 2024-07-09 15:38:39
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/EditAnalysis.vue
@@ -291,7 +291,6 @@ export default {
       });
     },
     handleEngineCode(e) {
-      console.log(e);
       this.engineCode = e;
       this.getWindEngList();
     },
@@ -314,7 +313,6 @@ export default {
       this.loading = true;
       try {
         const response = await analysisDetail(formData);
-        console.log(response.data, "获取详情信息 编辑详情");
         if (response.data.length === 0 || response.data === null) {
           this.flage = true;
         } else {
@@ -401,11 +399,7 @@ export default {
       }
     },
     // 鼠标单击的事件
-    onClick(e, editor) {
-      console.log("Element clicked");
-      console.log(e);
-      console.log(editor);
-    },
+    onClick(e, editor) {},
     onSubmit() {
       this.getDetailInfo();
     },
@@ -433,7 +427,6 @@ export default {
             this.loading = false;
           }
         } else {
-          console.log("error submit!!");
           return false;
         }
       });

src/views/performance/components/abnormalDetail.vue

@@ -68,7 +68,17 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="address" label="创建时间" align="center">
+      <el-table-column prop="errDesc" label="异常信息" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.isEditing">
+            <el-input v-model="scope.row.errDesc"></el-input>
+          </div>
+          <div v-else>
+            {{ scope.row.errDesc }}
+          </div>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="address" label="创建时间" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.isEditing">
             {{ scope.row.createTime ? scope.row.createTime : "/" }}
@@ -77,7 +87,7 @@
             {{ scope.row.createTime ? scope.row.createTime : "/" }}
           </div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="address" label="更新时间" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.isEditing">
@@ -224,11 +234,12 @@ export default {
       if (this.setDataState === "add") {
         this.loading = true;
         try {
-          const response = await analysisErrAdd({
+          await analysisErrAdd({
             batchCode: this.batchCode,
             engineCode: this.tableData[0].engineCode,
             analysisTypeCode: this.tableData[0].analysisTypeCode,
             errCount: this.tableData[0].errCount,
+            errDesc: this.tableData[index].errDesc,
             handleErrCount: this.tableData[0].handleErrCount,
           });
           this.$set(this.tableData[index], "isEditing", false);
@@ -248,6 +259,7 @@ export default {
           await analysisErrEdit({
             id: this.tableData[index].id,
             errCount: this.tableData[index].errCount,
+            errDesc: this.tableData[index].errDesc,
             handleErrCount: this.tableData[index].handleErrCount,
           });
           this.$set(this.tableData[index], "isEditing", false);

src/views/performance/components/analysisEvent.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2024-07-04 10:37:21
+ * @LastEditTime: 2024-07-09 09:37:35
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
@@ -928,7 +928,6 @@ export default {
 
     onSubmit() {
       this.getAnalysis();
-      console.log("submit!");
     },
     resetForm() {
       this.picker = [];

src/views/performance/components/dialogCom.vue

@@ -52,7 +52,6 @@ export default {
     },
     rowInfo: {
       handler(newVal, oldVal) {
-        console.log(newVal, oldVal, "dialognewVal, oldVal");
         this.batchCode = newVal.batchCode;
       },
       deep: true,

src/views/performance/editAssets.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:26:31
- * @LastEditTime: 2024-06-14 12:56:38
+ * @LastEditTime: 2024-07-09 15:38:08
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/editAssets.vue
@@ -44,7 +44,6 @@ export default {
   },
   methods: {
     handleClick(tab, event) {
-      console.log(tab, event);
     },
   },
 };

src/views/system/menuMag/components/editDialog.vue

@@ -222,7 +222,6 @@ export default {
       }
 
       if (this.row && this.title === "编辑") {
-        console.log(this.row, this.row.piconUrl, "piconUrl");
         this.menuForm = {
           parentId: this.row.parentId,
           pname: this.row.permissionName,

src/views/system/menuMag/index.vue

@@ -36,7 +36,11 @@
     </div>
     <div class="list-page">
       <div class="newly">
-        <el-button type="primary" @click="newnuedialog" size="small"
+        <el-button
+          v-hasPermi="['system:menu:add']"
+          type="primary"
+          @click="newnuedialog"
+          size="small"
           >新增</el-button
         >
         <el-button type="primary" @click="toggleExpandAll" size="small">{{
@@ -88,10 +92,18 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button @click="compile(scope.row)" type="text" size="small"
+            <el-button
+              v-hasPermi="['system:menu:edit']"
+              @click="compile(scope.row)"
+              type="text"
+              size="small"
               >编辑</el-button
             >
-            <el-button @click="newcomer(scope.row)" type="text" size="small"
+            <el-button
+              v-hasPermi="['system:menu:add']"
+              @click="newcomer(scope.row)"
+              type="text"
+              size="small"
               >新增</el-button
             >
             <el-button
@@ -99,6 +111,7 @@
               @click="updateState(scope.row, 1)"
               type="text"
               size="small"
+              v-hasPermi="['system:menu:editState']"
               >启用</el-button
             >
             <el-button
@@ -107,6 +120,7 @@
               @click="updateState(scope.row, 0)"
               type="text"
               size="small"
+              v-hasPermi="['system:menu:editState']"
               >停用</el-button
             >
             <el-button
@@ -114,6 +128,7 @@
               @click="deleted(scope.row)"
               type="text"
               size="small"
+              v-hasPermi="['system:menu:delete']"
               :disabled="scope.row.permissionState == 1"
               >删除</el-button
             >
@@ -236,7 +251,6 @@ export default {
         .catch((_) => {});
     },
     selected(name) {
-      console.log(name);
       this.piconUrl = name;
     },
     handleClose() {

src/views/system/roleMag/components/dataAuth.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-06-11 09:36:36
- * @LastEditTime: 2024-06-12 10:26:37
+ * @LastEditTime: 2024-07-09 15:38:47
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /dashengmag/performance-test/src/views/system/roleMag/components/dataAuth.vue
@@ -79,7 +79,6 @@ export default {
       };
     },
     updateTreeCheckState(checkList) {
-      console.log("回显数据权限内容");
       if (this.$refs.tree) {
         this.$refs.tree.setCheckedKeys(checkDataAuthTreeFn(checkList));
       }

src/views/system/roleMag/components/menuTree.vue

@@ -49,9 +49,6 @@ export default {
     this.updateTreeCheckState(this.treeObj.checkList);
   },
   methods: {
-    getCheckedNodes() {
-      console.log(this.$refs.tree.getCheckedNodes());
-    },
     getMenuList() {
       getAllMenu().then((res) => {
         this.menuList = res.data;
@@ -62,7 +59,6 @@ export default {
         this.$refs.tree.getCheckedKeys(),
         this.menuList
       );
-      console.log(result, "reslut");
       return {
         permissionIds: [...new Set(result)].join(","),
         roleId: this.treeObj.roleId,

src/views/system/roleMag/index.vue

@@ -34,7 +34,11 @@
     </div>
     <div class="list-page">
       <div class="newly">
-        <el-button type="primary" @click="newnuedialog" size="small"
+        <el-button
+          v-hasPermi="['system:menu:add']"
+          type="primary"
+          @click="newnuedialog"
+          size="small"
           >新增</el-button
         >
       </div>
@@ -112,7 +116,11 @@
           width="200"
         >
           <template slot-scope="scope">
-            <el-button @click="compile(scope.row)" type="text" size="small"
+            <el-button
+              v-hasPermi="['system:role:edit']"
+              @click="compile(scope.row)"
+              type="text"
+              size="small"
               >编辑</el-button
             >
             <el-button
@@ -120,6 +128,7 @@
               @click="editAuth(scope.row)"
               type="text"
               size="small"
+              v-hasPermi="['system:role:authEdit']"
               >权限设置</el-button
             >
             <el-button
@@ -127,6 +136,7 @@
               @click="setState(1, scope.row.id)"
               type="text"
               size="small"
+              v-hasPermi="['system:role:editState']"
               >启用</el-button
             >
             <el-button
@@ -135,6 +145,7 @@
               @click="setState(0, scope.row.id)"
               type="text"
               size="small"
+              v-hasPermi="['system:role:editState']"
               >停用</el-button
             >
             <el-button
@@ -142,6 +153,7 @@
               @click="deleted(scope.row)"
               type="text"
               size="small"
+              v-hasPermi="['system:menu:delete']"
               :disabled="scope.row.roleAvailable == 1"
               >删除</el-button
             >

src/views/system/userMag/index.vue

@@ -39,7 +39,11 @@
     </div>
     <div class="list-page">
       <div class="newly">
-        <el-button type="primary" @click="newnuedialog" size="small"
+        <el-button
+          v-hasPermi="['system:users:add']"
+          type="primary"
+          @click="newnuedialog"
+          size="small"
           >新增</el-button
         >
       </div>
@@ -91,7 +95,11 @@
           width="200"
         >
           <template slot-scope="scope">
-            <el-button @click="compile(scope.row)" type="text" size="small"
+            <el-button
+              v-hasPermi="['system:users:edit']"
+              @click="compile(scope.row)"
+              type="text"
+              size="small"
               >编辑</el-button
             >
             <el-button
@@ -99,6 +107,7 @@
               @click="setState(1, scope.row.userId)"
               type="text"
               size="small"
+              v-hasPermi="['system:users:editState']"
               >启用</el-button
             >
             <el-button
@@ -107,6 +116,7 @@
               @click="setState(2, scope.row.userId)"
               type="text"
               size="small"
+              v-hasPermi="['system:users:editState']"
               >停用</el-button
             >
             <el-button
@@ -114,6 +124,7 @@
               @click="editPwd(scope.row)"
               type="text"
               size="small"
+              v-hasPermi="['system:users:editPassword']"
               >修改密码</el-button
             >
             <el-button
@@ -121,6 +132,7 @@
               @click="deleted(scope.row)"
               type="text"
               size="small"
+              v-hasPermi="['system:users:delete']"
               :disabled="scope.row.state == 1"
               >删除</el-button
             >