Merge branch 'master' of http://192.168.1.22:3000/frontend/admin-sjzx

src/views/pqs/supervise/retire/monitorQuitPopup.vue

@@ -107,7 +107,7 @@ const runFlagList = [
 const rules = {
     deviceId: [{ required: true, message: '终端不能为空', trigger: 'change' }],
     propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }],
-    devStatus: [{ required: true, message: '亲选择变更状态', trigger: 'blur' }]
+    devStatus: [{ required: true, message: '请选择变更状态', trigger: 'blur' }]
 }
 const resetForm = () => {
     if (formRef.value) {

vite.config.ts

@@ -25,8 +25,7 @@ export default defineConfig({
             '/api': {
                 // target: 'http://10.95.53.49:10215', //海南服务器ip
                 // target: 'http://10.118.135.128:10215', ///hsw
-                target: 'http://192.168.1.122:10215', ///hsw
-                // target: 'http://108c3dfb.r18.cpolar.top', ///hsw
+                target: 'http://192.168.1.125:10215', ///hsw
                 //  target: 'http://10.119.65.152:10215', //数据中心
                 changeOrigin: true,
                 rewrite: path => path.replace(/^\/api/, '') //路径重写，把'/api'替换为''