提交

.env.development

@@ -6,11 +6,11 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+#VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
-#  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
+  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

package.json

@@ -40,24 +40,24 @@
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
-    "core-js": "^3.34.0",
     "core.js": "^0.4.2",
     "dayjs": "^1.11.9",
     "echarts": "5.4.0",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
+    "gm-crypt": "0.0.2",
     "highlight.js": "10.7.3",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "moment": "^2.29.4",
     "node-polyfill-webpack-plugin": "^3.0.0",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "vue": "2.6.12",
-    "gm-crypt": "0.0.2",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
@@ -73,6 +73,7 @@
     "chalk": "4.1.0",
     "compression-webpack-plugin": "5.0.2",
     "connect": "3.6.6",
+    "core-js": "^3.34.0",
     "html-webpack-plugin": "^5.5.3",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",

src/store/modules/user.js

@@ -77,8 +77,8 @@ const user = {
     // 登录
     Login({ commit }, userInfo) {
       const username = userInfo.username.trim()
-      // const password = SM4Encrypt(userInfo.password)
-      const password = (userInfo.password)
+      const password = SM4Encrypt(userInfo.password)
+      // const password = (userInfo.password)
       const code = userInfo.code
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {

src/views/core/accessPlan/index.vue

@@ -122,7 +122,6 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['core:accessPlan:add']"
-                  v-if="check == true"
                   >新增任务
                 </el-button>
               </el-col>

src/views/resumptionEvaluate/evaluate/index.vue

@@ -31,7 +31,7 @@
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>
-              <el-form-item label="外包评价名称" prop="evaluateName">
+              <el-form-item label="外包评价名称1" prop="evaluateName">
                 <el-input
                   :maxlength="20"
                   v-model="queryParams.evaluateName"
@@ -176,6 +176,7 @@
                 <el-button
                   size="mini"
                   @click="publishHandler(row)"
+                  v-hasPermi="['core:evaluatePlan:add']"
                   type="text"
                   v-if="row.orgId == isEdit && row.status == 0"
                   :class="

src/views/system/dept/extend.vue

@@ -252,8 +252,8 @@
                   :value="dict.value"
                 ></el-option>
               </el-select>
-            </el-descriptions-item>
-
+            </el-descriptions-item> 
+    
             <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="是否配备保安人员">
               <el-radio-group v-model="askari">
                 <el-radio :label="1">是</el-radio>
@@ -509,6 +509,7 @@
 
   export default {
     dicts: [
+    "duty_options",
       "sys_org_type",
       "org_platform_brand",
       "org_platform_supplier_brand",
@@ -521,7 +522,6 @@
       "org_extend_detached_standard",
       "org_extend_is",
       "property_situation",
-      "duty_options",
     ],
     props: [],
     components: {